diff options
author | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
---|---|---|
committer | Peter Korsgaard <peter@korsgaard.com> | 2014-06-01 09:58:54 +0200 |
commit | 27a5414804f7b8ab41101aad219ebef02d364bde (patch) | |
tree | c9535dfed260314855b3ba1fe2c75652fdf60a1a /toolchain/toolchain-buildroot | |
parent | f6162290fb6800fecffb86eed42069aa0f813f87 (diff) | |
parent | fc90fa9417d8b99b5d1c77aaa9e4c9ac4c8c7c58 (diff) |
Merge branch 'next'
Conflicts:
package/gdb/Config.in.host
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'toolchain/toolchain-buildroot')
-rw-r--r-- | toolchain/toolchain-buildroot/Config.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/toolchain/toolchain-buildroot/Config.in b/toolchain/toolchain-buildroot/Config.in index 11404e8da..e27a4a996 100644 --- a/toolchain/toolchain-buildroot/Config.in +++ b/toolchain/toolchain-buildroot/Config.in @@ -45,7 +45,7 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC BR2_i386 || BR2_mips || BR2_mipsel || \ BR2_mips64 || BR2_mips64el || BR2_powerpc || \ BR2_sh || BR2_sh64 || BR2_sparc || \ - BR2_x86_64 || BR2_microblaze + BR2_x86_64 || BR2_microblaze || BR2_powerpc64 depends on BR2_USE_MMU depends on !BR2_PREFER_STATIC_LIB select BR2_TOOLCHAIN_USES_GLIBC @@ -59,11 +59,12 @@ config BR2_TOOLCHAIN_BUILDROOT_EGLIBC config BR2_TOOLCHAIN_BUILDROOT_GLIBC bool "glibc" - depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ - BR2_i386 || BR2_mips || BR2_mipsel || \ - BR2_mips64 || BR2_mips64el || BR2_powerpc || \ - BR2_sh || BR2_sh64 || BR2_sparc || \ - BR2_x86_64 || BR2_microblaze + depends on BR2_arm || BR2_armeb || BR2_aarch64 || \ + BR2_i386 || BR2_mips || BR2_mipsel || \ + BR2_mips64 || BR2_mips64el || BR2_powerpc || \ + BR2_powerpc64 || BR2_powerpc64le || BR2_sh || \ + BR2_sh64 || BR2_sparc || BR2_x86_64 || \ + BR2_microblaze depends on BR2_USE_MMU depends on !BR2_PREFER_STATIC_LIB depends on !BR2_powerpc_SPE |