diff options
Diffstat (limited to 'package')
| -rw-r--r-- | package/gcc/Config.in.host | 11 | ||||
| -rw-r--r-- | package/gcc/gcc-initial/gcc-initial.mk | 8 | ||||
| -rw-r--r-- | package/glibc/glibc.mk | 5 | ||||
| -rw-r--r-- | package/uclibc/Config.in | 1 | ||||
| -rw-r--r-- | package/uclibc/uclibc.mk | 5 |
5 files changed, 4 insertions, 26 deletions
diff --git a/package/gcc/Config.in.host b/package/gcc/Config.in.host index 32c668af4..1fd3a94f2 100644 --- a/package/gcc/Config.in.host +++ b/package/gcc/Config.in.host @@ -3,12 +3,6 @@ comment "GCC Options" config BR2_GCC_NEEDS_MPC bool -# Until gcc 4.7, a three stage build process was needed when using -# NPTL. This hidden option tells whether gcc is a version that -# requires this three stage build process. -config BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD - bool - choice prompt "GCC compiler Version" default BR2_GCC_VERSION_4_4_X if BR2_sparc_sparchfleon || BR2_sparc_sparchfleonv8 || BR2_sparc_sparcsfleon || BR2_sparc_sparcsfleonv8 @@ -22,13 +16,11 @@ choice config BR2_GCC_VERSION_4_2_2_AVR32_2_1_5 depends on BR2_avr32 bool "gcc 4.2.2-avr32-2.1.5" - select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD config BR2_GCC_VERSION_4_3_X depends on !BR2_arc && !BR2_avr32 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a8 && !BR2_cortex_a9 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_e300c2 && !BR2_powerpc_e300c3 && !BR2_powerpc_e500mc && !BR2_powerpc_464 && !BR2_powerpc_464fp && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4 depends on !BR2_ARM_EABIHF bool "gcc 4.3.x" - select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD config BR2_GCC_VERSION_4_4_X depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a5 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_x86_atom && !BR2_powerpc_476 && !BR2_powerpc_476fp && !BR2_fa526 && !BR2_pj4 @@ -37,7 +29,6 @@ choice depends on !BR2_ARM_EABIHF # VFPv4 support appeared in gcc 4.5 depends on !BR2_ARM_FPU_VFPV4 && !BR2_ARM_FPU_VFPV4D16 - select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD config BR2_GCC_VERSION_4_5_X depends on !BR2_arc && !BR2_avr32 && !BR2_cortex_a7 && !BR2_cortex_a15 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_fa526 && !BR2_pj4 @@ -45,13 +36,11 @@ choice # ARM EABIhf support appeared in gcc 4.6 depends on !BR2_ARM_EABIHF bool "gcc 4.5.x" - select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD config BR2_GCC_VERSION_4_6_X depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_cortex_a7 && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4 select BR2_GCC_NEEDS_MPC bool "gcc 4.6.x" - select BR2_GCC_VERSION_NEEDS_THREE_STAGE_BUILD config BR2_GCC_VERSION_4_7_X depends on !BR2_arc && !BR2_avr32 && !BR2_bfin && !BR2_sparc_sparchfleon && !BR2_sparc_sparchfleonv8 && !BR2_sparc_sparcsfleon && !BR2_sparc_sparcsfleonv8 && !BR2_pj4 diff --git a/package/gcc/gcc-initial/gcc-initial.mk b/package/gcc/gcc-initial/gcc-initial.mk index 83767ea50..0eb492fa4 100644 --- a/package/gcc/gcc-initial/gcc-initial.mk +++ b/package/gcc/gcc-initial/gcc-initial.mk @@ -29,7 +29,6 @@ HOST_GCC_INITIAL_CONF_OPT = \ --enable-languages=c \ --disable-shared \ --without-headers \ - --disable-threads \ --with-newlib \ --disable-largefile \ --disable-nls \ @@ -41,11 +40,4 @@ HOST_GCC_INITIAL_CONF_ENV = \ HOST_GCC_INITIAL_MAKE_OPT = all-gcc HOST_GCC_INITIAL_INSTALL_OPT = install-gcc -ifeq ($(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),) -ifeq ($(BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE),y) -HOST_GCC_INITIAL_MAKE_OPT += all-target-libgcc -HOST_GCC_INITIAL_INSTALL_OPT += install-target-libgcc -endif -endif - $(eval $(host-autotools-package)) diff --git a/package/glibc/glibc.mk b/package/glibc/glibc.mk index 68c4636c8..998bd0f3b 100644 --- a/package/glibc/glibc.mk +++ b/package/glibc/glibc.mk @@ -28,9 +28,8 @@ ifeq ($(BR2_TOOLCHAIN_BUILDROOT_EGLIBC),y) GLIBC_DEPENDENCIES += host-gawk endif -# Before (e)glibc is built, we must have the second stage -# cross-compiler, for some gcc versions -glibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate) +# Before (e)glibc is built, we must have the second stage cross-compiler +eglibc-build: host-gcc-intermediate GLIBC_SUBDIR = build diff --git a/package/uclibc/Config.in b/package/uclibc/Config.in index eeb3b83cb..acf736ada 100644 --- a/package/uclibc/Config.in +++ b/package/uclibc/Config.in @@ -115,7 +115,6 @@ choice config BR2_PTHREADS_NATIVE bool "Native POSIX Threading (NPTL)" select BR2_TOOLCHAIN_HAS_THREADS - select BR2_TOOLCHAIN_LIBC_NEEDS_THREE_STAGE_BUILD depends on !BR2_arc depends on !BR2_avr32 depends on !BR2_bfin diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index 3993d9bf6..20d3bb668 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -22,9 +22,8 @@ UCLIBC_INSTALL_STAGING = YES # cross-compiler and the kernel headers UCLIBC_DEPENDENCIES = host-gcc-initial linux-headers -# Before uClibc is built, we must have the second stage -# cross-compiler, for some gcc versions, and when NPTL is used. -uclibc-build: $(if $(BR2_TOOLCHAIN_NEEDS_THREE_STAGE_BUILD),host-gcc-intermediate) +# Before uClibc is built, we must have the second stage cross-compiler +uclibc-build: host-gcc-intermediate # specifying UCLIBC_CONFIG_FILE on the command-line overrides the .config # setting. |