From d3f383b1eeafa11b093d7a5626d375d07ed2c3d7 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Dec 2009 12:15:36 +0100 Subject: gcc: add avr32 special version * Add new gcc version 4.2.2-avr32-2.1.5 in Config.in * Select the Atmel mirror to download gcc with avr32 in their version name, in gcc-uclibc-*.mk * Do not apply patches if the patch directory is empty, in gcc-uclibc-*.mk Signed-off-by: Thomas Petazzoni --- toolchain/gcc/gcc-uclibc-3.x.mk | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'toolchain/gcc/gcc-uclibc-3.x.mk') diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index e73731348..bc3d423b5 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -22,13 +22,15 @@ ifeq ($(BR2_TOOLCHAIN_SOURCE),y) # without sysroot support. Sysroot toolchain is gcc-uclibc-4.x.mk ifneq ($(BR2_TOOLCHAIN_SYSROOT),y) -ifeq ($(GCC_SNAP_DATE),) -GCC_OFFICIAL_VER:=$(GCC_VERSION) -GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION) -#GCC_SITE:=ftp://ftp.ibiblio.org/pub/mirrors/gnu/ftp/gnu/gcc/gcc-$(GCC_OFFICIAL_VER) +ifneq ($(GCC_SNAP_DATE),) + GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION) + GCC_OFFICIAL_VER:=$(GCC_VERSION)-$(GCC_SNAP_DATE) +else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32) + GCC_SITE:=ftp://www.at91.com/pub/buildroot/ + GCC_OFFICIAL_VER:=$(GCC_VERSION) else -GCC_OFFICIAL_VER:=$(GCC_VERSION)-$(GCC_SNAP_DATE) -GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_OFFICIAL_VER) + GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION) + GCC_OFFICIAL_VER:=$(GCC_VERSION) endif @@ -142,7 +144,9 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) 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)),) toolchain/patch-kernel.sh $(GCC_DIR) $(GCC_PATCH_DIR) \*.patch +endif # Note: The soft float situation has improved considerably with gcc 3.4.x. # We can dispense with the custom spec files, as well as libfloat for the arm case. # However, we still need a patch for arm. There's a similar patch for gcc 3.3.x -- cgit v1.2.3 From 3f90a29baf8a57ff2ead2fd21f896850f0bc596f Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Dec 2009 12:02:02 +0100 Subject: gcc: remove support for external source toolchains Signed-off-by: Thomas Petazzoni --- toolchain/gcc/gcc-uclibc-3.x.mk | 10 ---------- toolchain/gcc/gcc-uclibc-4.x.mk | 10 ---------- 2 files changed, 20 deletions(-) (limited to 'toolchain/gcc/gcc-uclibc-3.x.mk') diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index bc3d423b5..c7ae9137b 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -33,18 +33,9 @@ else GCC_OFFICIAL_VER:=$(GCC_VERSION) endif - -# redefine if using an external prepatched gcc source -ifneq ($(BR2_TOOLCHAIN_BUILDROOT),y) -GCC_SITE:=$(VENDOR_SITE) -GCC_OFFICIAL_VER:=$(GCC_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GCC_RELEASE) -GCC_PATCH_DIR:=toolchain/gcc/ext_source/$(VENDOR_PATCH_DIR)/$(GCC_OFFICIAL_VERSION) -endif - GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2 GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_OFFICIAL_VER) -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) ifeq ($(GCC_SNAP_DATE),) GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) else @@ -54,7 +45,6 @@ else GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) endif endif -endif GCC_CAT:=$(BZCAT) GCC_STRIP_HOST_BINARIES:=true diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 14afb367e..b3ee26644 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -31,15 +31,6 @@ else GCC_OFFICIAL_VER:=$(GCC_VERSION) endif -# redefine if using an external prepatched gcc source -ifneq ($(BR2_TOOLCHAIN_BUILDROOT),y) -GCC_SITE:=$(VENDOR_SITE) -GCC_OFFICIAL_VERSION:=$(GCC_VERSION)$(VENDOR_SUFFIX)$(VENDOR_GCC_RELEASE) -GCC_PATCH_DIR:=toolchain/gcc/ext_source/$(VENDOR_PATCH_DIR)/$(GCC_OFFICIAL_VERSION) -endif #!BR2_TOOLCHAIN_BUILDROOT - -# define patch location -ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) # Normal toolchain ifeq ($(GCC_SNAP_DATE),) # Not a snapshot GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) else # Is a snapshot @@ -50,7 +41,6 @@ else # Normal patch to snapshot GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) endif # Snapshot patch endif # Not a snapshot -endif # BR2_TOOLCHAIN_BUILDROOT ifneq ($(filter xtensa%,$(ARCH)),) include target/xtensa/patch.in -- cgit v1.2.3 From 495e5bdca3146a5debfa98a90b7e1a4e9b2e5c09 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Dec 2009 12:04:11 +0100 Subject: gcc: remove GCC_OFFICIAL_VERSION and just use GCC_VERSION instead Signed-off-by: Thomas Petazzoni --- toolchain/gcc/gcc-uclibc-3.x.mk | 17 ++--------------- toolchain/gcc/gcc-uclibc-4.x.mk | 21 ++++----------------- 2 files changed, 6 insertions(+), 32 deletions(-) (limited to 'toolchain/gcc/gcc-uclibc-3.x.mk') diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index c7ae9137b..0af3f38e6 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -24,28 +24,15 @@ ifneq ($(BR2_TOOLCHAIN_SYSROOT),y) ifneq ($(GCC_SNAP_DATE),) GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION) - GCC_OFFICIAL_VER:=$(GCC_VERSION)-$(GCC_SNAP_DATE) else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32) GCC_SITE:=ftp://www.at91.com/pub/buildroot/ - GCC_OFFICIAL_VER:=$(GCC_VERSION) else GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION) - GCC_OFFICIAL_VER:=$(GCC_VERSION) endif -GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VER).tar.bz2 -GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_OFFICIAL_VER) - -ifeq ($(GCC_SNAP_DATE),) -GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) -else -ifneq ($(wildcard toolchain/gcc/$(GCC_OFFICIAL_VER)),) -GCC_PATCH_DIR:=toolchain/gcc/$(GCC_OFFICIAL_VER) -else +GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2 +GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION) GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) -endif -endif - GCC_CAT:=$(BZCAT) GCC_STRIP_HOST_BINARIES:=true diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index b3ee26644..b162b93bc 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -22,33 +22,20 @@ ifeq ($(BR2_TOOLCHAIN_SYSROOT),y) ifneq ($(GCC_SNAP_DATE),) GCC_SITE:=ftp://sources.redhat.com/pub/gcc/snapshots/$(GCC_VERSION) - GCC_OFFICIAL_VER:=$(GCC_VERSION)-$(GCC_SNAP_DATE) else ifeq ($(findstring avr32,$(GCC_VERSION)),avr32) GCC_SITE:=ftp://www.at91.com/pub/buildroot/ - GCC_OFFICIAL_VER:=$(GCC_VERSION) else GCC_SITE:=$(BR2_GNU_MIRROR)/gcc/gcc-$(GCC_VERSION) - GCC_OFFICIAL_VER:=$(GCC_VERSION) endif -ifeq ($(GCC_SNAP_DATE),) # Not a snapshot -GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) -else # Is a snapshot -ifneq ($(wildcard toolchain/gcc/$(GCC_OFFICIAL_VERSION)),) # Snapshot patch? -GCC_PATCH_DIR:=toolchain/gcc/$(GCC_OFFICIAL_VERSION) -else # Normal patch to snapshot -# Use the normal location, if the dedicated location does not exist -GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) -endif # Snapshot patch -endif # Not a snapshot - ifneq ($(filter xtensa%,$(ARCH)),) include target/xtensa/patch.in GCC_PATCH_EXTRA:=$(call XTENSA_PATCH,gcc,$(GCC_PATCH_DIR),. ..) endif -GCC_SOURCE:=gcc-$(GCC_OFFICIAL_VERSION).tar.bz2 -GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_OFFICIAL_VERSION) +GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2 +GCC_PATCH_DIR:=toolchain/gcc/$(GCC_VERSION) +GCC_DIR:=$(TOOLCHAIN_DIR)/gcc-$(GCC_VERSION) GCC_CAT:=$(BZCAT) GCC_STRIP_HOST_BINARIES:=nope GCC_SRC_DIR:=$(GCC_DIR) @@ -516,7 +503,7 @@ gcc_target-dirclean: rm -rf $(GCC_BUILD_DIR3) gcc-status: - @echo GCC_OFFICIAL_VERSION=$(GCC_OFFICIAL_VERSION) + @echo GCC_VERSION=$(GCC_VERSION) @echo GCC_PATCH_DIR=$(GCC_PATCH_DIR) @echo GCC_SITE=$(GCC_SITE) -- cgit v1.2.3 From bc994c533cdac1ab843a889c4afaae80234cc6b2 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Mon, 14 Dec 2009 12:10:12 +0100 Subject: Use BR2_TOOLCHAIN_BUILDROOT instead of BR2_TOOLCHAIN_SOURCE The BR2_TOOLCHAIN_SOURCE option is removed in a future commit. Signed-off-by: Thomas Petazzoni --- Makefile | 4 ++-- package/Makefile.in | 4 ++-- target/Config.in | 2 +- toolchain/Config.in.1 | 2 +- toolchain/Config.in.2 | 6 +++--- toolchain/gcc/gcc-uclibc-3.x.mk | 2 +- toolchain/uClibc/uclibc.mk | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) (limited to 'toolchain/gcc/gcc-uclibc-3.x.mk') diff --git a/Makefile b/Makefile index 5b71051c1..051b661fe 100644 --- a/Makefile +++ b/Makefile @@ -197,7 +197,7 @@ PREFERRED_LIB_FLAGS:=--enable-static --enable-shared # along with the packages to build for the target. # ############################################################## -ifeq ($(BR2_TOOLCHAIN_SOURCE),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) BASE_TARGETS:=uclibc-configured binutils cross_compiler uclibc-target-utils kernel-headers else BASE_TARGETS:=uclibc @@ -289,7 +289,7 @@ include .config.cmd # We also need the various per-package makefiles, which also add # each selected package to TARGETS if that package was selected # in the .config file. -ifeq ($(BR2_TOOLCHAIN_SOURCE),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) # avoid pulling in external toolchain which is broken for toplvl parallel builds # Explicit ordering: include toolchain/dependencies/dependencies.mk diff --git a/package/Makefile.in b/package/Makefile.in index 7c009bbe0..25dd6da81 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -36,7 +36,7 @@ endif ######################################################################### -ifeq ($(BR2_TOOLCHAIN_SOURCE),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) TARGET_CFLAGS=$(TARGET_OPTIMIZATION) $(TARGET_DEBUGGING) \ -I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include TARGET_LDFLAGS+=-L$(STAGING_DIR)/lib -L$(STAGING_DIR)/usr/lib @@ -105,7 +105,7 @@ XXXX=xxxx ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX) endif -ifeq ($(BR2_TOOLCHAIN_SOURCE),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) TOOLCHAIN_DIR=$(BASE_DIR)/toolchain # Quotes are needed for spaces et al in path components. diff --git a/target/Config.in b/target/Config.in index ab46dcb16..4cae66cf7 100644 --- a/target/Config.in +++ b/target/Config.in @@ -74,7 +74,7 @@ config BR2_KERNEL_LINUX_ADVANCED # The kernel with the same version as linux headers cannot be compiled # when using an external toolchain, because the linux headers are not # handled by Buildroot in this case. -if BR2_TOOLCHAIN_SOURCE +if BR2_TOOLCHAIN_BUILDROOT config BR2_KERNEL_LINUX bool "linux (Same version as linux headers)" diff --git a/toolchain/Config.in.1 b/toolchain/Config.in.1 index 83bc710b6..5c26858d0 100644 --- a/toolchain/Config.in.1 +++ b/toolchain/Config.in.1 @@ -1,6 +1,6 @@ # -if BR2_TOOLCHAIN_SOURCE +if BR2_TOOLCHAIN_BUILDROOT source "toolchain/kernel-headers/Config.in" source "toolchain/uClibc/Config.in" source "toolchain/binutils/Config.in" diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2 index 2f7de75b6..6317ff4fb 100644 --- a/toolchain/Config.in.2 +++ b/toolchain/Config.in.2 @@ -37,7 +37,7 @@ config BR2_ENABLE_LOCALE config BR2_ENABLE_LOCALE_PREGENERATED bool "Use pregenerated locale data?" - depends on BR2_ENABLE_LOCALE && BR2_TOOLCHAIN_SOURCE && BROKEN # tarball missing + depends on BR2_ENABLE_LOCALE && BR2_TOOLCHAIN_BUILDROOT && BROKEN # tarball missing help Instead of generating the locale data locally you can optionally download a pregenerated set of locales. @@ -142,7 +142,7 @@ config BR2_GCC_CROSS_CXX config BR2_INSTALL_LIBSTDCPP bool "Build/install c++ compiler and libstdc++?" - select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_SOURCE) + select BR2_LARGEFILE if (!BR2_GCC_SUPPORTS_SYSROOT && BR2_TOOLCHAIN_BUILDROOT) select BR2_GCC_CROSS_CXX help If you are building your own toolchain and want to build and install @@ -157,7 +157,7 @@ config BR2_TARGET_OPTIMIZATION help Optimizations to use when building for the target host. -if BR2_TOOLCHAIN_SOURCE +if BR2_TOOLCHAIN_BUILDROOT source "toolchain/elf2flt/Config.in" source "toolchain/mklibs/Config.in" source "toolchain/sstrip/Config.in" diff --git a/toolchain/gcc/gcc-uclibc-3.x.mk b/toolchain/gcc/gcc-uclibc-3.x.mk index 0af3f38e6..332af884a 100644 --- a/toolchain/gcc/gcc-uclibc-3.x.mk +++ b/toolchain/gcc/gcc-uclibc-3.x.mk @@ -17,7 +17,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -ifeq ($(BR2_TOOLCHAIN_SOURCE),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) # without sysroot support. Sysroot toolchain is gcc-uclibc-4.x.mk ifneq ($(BR2_TOOLCHAIN_SYSROOT),y) diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index 79d272fea..f742d4ef4 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -4,7 +4,7 @@ # ############################################################# -ifeq ($(BR2_TOOLCHAIN_SOURCE),y) +ifeq ($(BR2_TOOLCHAIN_BUILDROOT),y) # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. -- cgit v1.2.3