From 669d07bdd47ac6789886729fa635db55dd352ae2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 4 Sep 2012 04:04:06 +0000 Subject: Remove the Xtensa architecture As stated in commit 555c2585bf28c3ef71f6d2dcdd983d17a19892af, the Xtensa architecture has been introduced in 2009 and never changed since its initial introduction. It requires some special handling that is a bit annoying, and despite our call to the initial developers, and the announcement of the deprecation of the architecture during the 2012.05, nothing has happened. Therefore, drop support for this architecture. Signed-off-by: Thomas Petazzoni Acked-by: me Signed-off-by: Peter Korsgaard --- toolchain/gcc/gcc-uclibc-4.x.mk | 7 +------ toolchain/gdb/gdb.mk | 7 +------ toolchain/toolchain-common.in | 2 +- toolchain/uClibc/uclibc.mk | 1 - 4 files changed, 3 insertions(+), 14 deletions(-) (limited to 'toolchain') diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index e29d797cc..1a075cc00 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -33,11 +33,6 @@ else GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION) endif -ifneq ($(filter xtensa%,$(ARCH)),) -include target/xtensa/patch.in -GCC_PATCH_EXTRA:=$(call XTENSA_PATCH,gcc,$(GCC_PATCH_DIR),. ..) -endif - GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2 GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION) @@ -262,7 +257,7 @@ gcc-patched: $(GCC_DIR)/.patched $(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked # Apply any files named gcc-*.patch from the source directory to gcc ifneq ($(wildcard $(GCC_PATCH_DIR)),) - support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch $(GCC_PATCH_EXTRA) + support/scripts/apply-patches.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch endif ifeq ($(ARCH)-$(BR2_GCC_SHARED_LIBGCC),powerpc-y) diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index f5af4541a..6b029a8c6 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -16,11 +16,6 @@ else GDB_PATCH_DIR:=toolchain/gdb/$(GDB_VERSION) endif -ifneq ($(filter xtensa%,$(ARCH)),) -include target/xtensa/patch.in -GDB_PATCH_EXTRA:=$(call XTENSA_PATCH,gdb,$(GDB_PATCH_DIR),. ..) -endif - GDB_DIR:=$(TOOLCHAIN_DIR)/gdb-$(GDB_VERSION) $(DL_DIR)/$(GDB_SOURCE): @@ -31,7 +26,7 @@ $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE) mkdir -p $(GDB_DIR) $(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) - ifneq ($(wildcard $(GDB_PATCH_DIR)),) - support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch $(GDB_PATCH_EXTRA) + support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch endif $(call CONFIG_UPDATE,$(@D)) touch $@ diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in index 6e0d1598f..10950ba29 100644 --- a/toolchain/toolchain-common.in +++ b/toolchain/toolchain-common.in @@ -93,7 +93,7 @@ config BR2_NEEDS_GETTEXT_IF_LOCALE default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE) config BR2_USE_MMU - bool "Enable MMU support" if BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_sh || BR2_xtensa + bool "Enable MMU support" if BR2_arm || BR2_armeb || BR2_mips || BR2_mipsel || BR2_sh default y if !BR2_bfin help If your target has a MMU, you should say Y here. If you diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 20cc820ae..d1cd71812 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -38,7 +38,6 @@ UCLIBC_TARGET_ARCH:=$(shell $(SHELL) -c "echo $(ARCH) | sed \ -e 's/sh[234].*/sh/' \ -e 's/mips.*/mips/' \ -e 's/cris.*/cris/' \ - -e 's/xtensa.*/xtensa/' \ ") UCLIBC_TARGET_ENDIAN:=$(call qstrip,$(BR2_ENDIAN)) -- cgit v1.2.3