diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-04-07 17:24:32 +0200 |
commit | b708ee58f7bef7b479f5b6999a8e976d332691b6 (patch) | |
tree | 4b13e9706173c676a0278ca1f565bc54b41943a2 /toolchain/Config.in | |
parent | f3cc98651b738ac7f2dc56ea772afa9f874b9d3b (diff) | |
parent | 7c1f6387d20faf69453a59de6c34227f9f2b833c (diff) |
resolve merge
Diffstat (limited to 'toolchain/Config.in')
-rw-r--r-- | toolchain/Config.in | 27 |
1 files changed, 19 insertions, 8 deletions
diff --git a/toolchain/Config.in b/toolchain/Config.in index 54016212a..7eb9cdda7 100644 --- a/toolchain/Config.in +++ b/toolchain/Config.in @@ -10,26 +10,37 @@ config ADK_TOOLCHAIN_GCC_CXX boolean default y -config ADK_TOOLCHAIN_GCC_SSP - prompt "Enable Stack Smashing Protection in GCC" +config ADK_TOOLCHAIN_SSP + prompt "Enable Stack Smashing Protection" boolean default y -config ADK_TOOLCHAIN_GCC_USE_SSP +config ADK_TOOLCHAIN_USE_SSP prompt "Use SSP for all packages" boolean - depends on ADK_TOOLCHAIN_GCC_SSP + depends on ADK_TOOLCHAIN_SSP default n -config ADK_TOOLCHAIN_GCC_LTO - prompt "Enable Link Time Optimization in GCC" +config ADK_TOOLCHAIN_LTO + prompt "Enable Link Time Optimization" boolean default y -config ADK_TOOLCHAIN_GCC_USE_LTO +config ADK_TOOLCHAIN_USE_LTO prompt "Use Link Time Optimization for all packages" boolean - depends on ADK_TOOLCHAIN_GCC_LTO + depends on ADK_TOOLCHAIN_LTO + default n + +config ADK_TOOLCHAIN_GOLD + prompt "Enable GOLD as linker" + boolean + default y + +config ADK_TOOLCHAIN_USE_GOLD + prompt "Use GOLD as linker for all packages" + boolean + depends on ADK_TOOLCHAIN_GOLD default n endmenu |