Skip to content

Commit

Permalink
sync with openwrt, 2018.02
Browse files Browse the repository at this point in the history
  • Loading branch information
The-BB committed Feb 12, 2018
1 parent c5b31c8 commit e09cff0
Showing 1 changed file with 17 additions and 9 deletions.
26 changes: 17 additions & 9 deletions toolchain/Config.in
Expand Up @@ -96,17 +96,26 @@ menuconfig EXTERNAL_TOOLCHAIN
default "/opt/cross/powerpc-unknown-linux-gnu" if powerpc
default "/opt/cross/x86_64-unknown-linux-gnu" if x86_64

config TOOLCHAIN_LIBC
string
choice TOOLCHAIN_LIBC_TYPE
prompt "Toolchain libc" if DEVEL
depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
default "uclibc"
help
Specify the libc type used by the external toolchain. The given value
is passed as -m flag to all gcc and g++ invocations. This is mainly
intended for multilib toolchains which support glibc and uclibc at
the same time. If no value is specified, no -m flag is passed.

config EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC
bool "glibc"
select USE_GLIBC

endchoice

config TOOLCHAIN_LIBC
string
depends on EXTERNAL_TOOLCHAIN && !NATIVE_TOOLCHAIN
default "glibc" if EXTERNAL_TOOLCHAIN_LIBC_USE_GLIBC

config TOOLCHAIN_BIN_PATH
string
prompt "Toolchain program path" if DEVEL
Expand Down Expand Up @@ -222,7 +231,6 @@ choice
config LIBC_USE_GLIBC
bool "Use glibc"
select USE_GLIBC
depends on !arc

endchoice

Expand All @@ -242,12 +250,16 @@ config GDB
config USE_GLIBC
bool

config SSP_SUPPORT
default y if USE_MUSL || GCC_LIBSSP
bool

config USE_EXTERNAL_LIBC
bool
default y if EXTERNAL_TOOLCHAIN || NATIVE_TOOLCHAIN

source "toolchain/binutils/Config.version"
source "toolchain/gcc/Config.version"

source "toolchain/glibc/Config.version"

config LIBC
Expand All @@ -262,10 +274,6 @@ config TARGET_SUFFIX
string
default "gnueabi" if USE_GLIBC && (arm || armeb)
default "gnu" if USE_GLIBC && !(arm || armeb)
default "uclibcgnueabi" if USE_UCLIBC && (arm || armeb)
default "uclibc" if USE_UCLIBC && !(arm || armeb)
default "muslgnueabi" if USE_MUSL && (arm || armeb)
default "musl" if USE_MUSL && !(arm || armeb)

config MIPS64_ABI
depends on mips64 || mips64el
Expand Down

0 comments on commit e09cff0

Please sign in to comment.