aboutsummaryrefslogtreecommitdiff
path: root/toolchain
diff options
context:
space:
mode:
authorGravatar Peter Korsgaard <peter@korsgaard.com>2015-03-02 23:26:20 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2015-03-02 23:26:20 +0100
commit7403ea730d75ce0af51cb1bd5665674bb5bfae42 (patch)
treed93cc0b4a8878d90ab0bb79c76d75805ee1c2a9d /toolchain
parent1021766976319b40e64ca8dee12d21c758197801 (diff)
parente6803b9f91357773154daed13d6e83712d49476c (diff)
downloadbuildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.tar.gz
buildroot-7403ea730d75ce0af51cb1bd5665674bb5bfae42.tar.bz2
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'toolchain')
-rw-r--r--toolchain/Config.in1
-rw-r--r--toolchain/toolchain-buildroot/Config.in4
-rw-r--r--toolchain/toolchain-common.in5
-rw-r--r--toolchain/toolchain-external/Config.in4
-rw-r--r--toolchain/toolchain-external/toolchain-external.mk4
5 files changed, 13 insertions, 5 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in
index 54b5d173a7..b039ee2ff5 100644
--- a/toolchain/Config.in
+++ b/toolchain/Config.in
@@ -43,7 +43,6 @@ choice
config BR2_TOOLCHAIN_BUILDROOT
bool "Buildroot toolchain"
- depends on !BR2_nios2
select BR2_TOOLCHAIN_HAS_SHADOW_PASSWORDS
config BR2_TOOLCHAIN_EXTERNAL
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in
index 2955b2ed14..1b9f3a3aca 100644
--- a/toolchain/toolchain-buildroot/Config.in
+++ b/toolchain/toolchain-buildroot/Config.in
@@ -29,7 +29,7 @@ config BR2_TOOLCHAIN_BUILDROOT_UCLIBC
bool "uClibc"
select BR2_TOOLCHAIN_USES_UCLIBC
depends on BR2_arcle || BR2_arceb || BR2_arm || BR2_armeb || \
- BR2_avr32 || BR2_bfin || BR2_i386 || BR2_m68k || \
+ BR2_bfin || BR2_i386 || BR2_m68k || \
BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el || \
BR2_powerpc || BR2_sh || BR2_sparc || BR2_xtensa || \
BR2_x86_64
@@ -64,7 +64,7 @@ config BR2_TOOLCHAIN_BUILDROOT_GLIBC
BR2_mips64 || BR2_mips64el || BR2_powerpc || \
BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \
BR2_sh64 || BR2_sparc || BR2_x86_64 || \
- BR2_microblaze
+ BR2_microblaze || BR2_nios2
depends on BR2_USE_MMU
depends on !BR2_STATIC_LIBS
depends on !BR2_powerpc_SPE
diff --git a/toolchain/toolchain-common.in b/toolchain/toolchain-common.in
index 2ee2019ac1..304afe452c 100644
--- a/toolchain/toolchain-common.in
+++ b/toolchain/toolchain-common.in
@@ -221,10 +221,15 @@ config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
bool
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
+config BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
+ bool
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
+
# This order guarantees that the highest version is set, as kconfig
# stops affecting a value on the first matching default.
config BR2_TOOLCHAIN_HEADERS_AT_LEAST
string
+ default "3.19" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
default "3.18" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
default "3.17" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17
default "3.16" if BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_16
diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in
index 50daa66ba4..6ab483aff5 100644
--- a/toolchain/toolchain-external/Config.in
+++ b/toolchain/toolchain-external/Config.in
@@ -1038,6 +1038,10 @@ choice
m = ( LINUX_VERSION_CODE >> 8 ) & 0xFF
p = ( LINUX_VERSION_CODE >> 0 ) & 0xFF
+config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_19
+ bool "3.19.x"
+ select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_19
+
config BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_18
bool "3.18.x"
select BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_18
diff --git a/toolchain/toolchain-external/toolchain-external.mk b/toolchain/toolchain-external/toolchain-external.mk
index 1a9813e755..ab73f9a073 100644
--- a/toolchain/toolchain-external/toolchain-external.mk
+++ b/toolchain/toolchain-external/toolchain-external.mk
@@ -98,8 +98,8 @@ LIB_EXTERNAL_LIBS += $(call qstrip,$(BR2_TOOLCHAIN_EXTRA_EXTERNAL_LIBS))
# mangling the path to find the base directory of the sysroot.
#
# Note that we do not use the -print-sysroot option, because it is
-# only available since gcc 4.4.x, and we still support 4.2.x (for
-# AVR32) and 4.3.x.
+# only available since gcc 4.4.x, and we only recently dropped support
+# for 4.2.x and 4.3.x.
#
# When doing this, we don't pass any option to gcc that could select a
# multilib variant (such as -march) as we want the "main" sysroot,