diff options
| author |   Dmitry Pankratov <dp@ubiquitech.com> | 2016-06-18 14:02:15 (GMT) |
|---|---|---|
| committer | Dmitry Pankratov <dp@ubiquitech.com> | 2016-06-18 14:02:15 (GMT) |
| commit | 91b8280e8c9458e81fc94d1f9983f2a642ebb7a8 (patch) | |
| tree | 9279482c6f4e8a28420c2f1adf19dcb084dc9f04 /config | |
| parent | f6d8dc44111c6e96706eed8b0ae0483e2fb63856 (diff) | |
| parent | 6e7c61650a39a67ee02ed58c11d64c94c436bb33 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'config')
| -rw-r--r-- | config/arch/sh.in | 1 | ||||
| -rw-r--r-- | config/cc/gcc.in.2 | 10 | ||||
| -rw-r--r-- | config/libc/glibc.in | 7 | ||||
| -rw-r--r-- | config/libc/musl.in | 1 |
4 files changed, 18 insertions, 1 deletions
diff --git a/config/arch/sh.in b/config/arch/sh.in index 68d3120..60de313 100644 --- a/config/arch/sh.in +++ b/config/arch/sh.in @@ -5,6 +5,7 @@ ## select ARCH_USE_MMU ## select ARCH_SUPPORTS_BOTH_ENDIAN ## select ARCH_DEFAULT_LE +## select ARCH_REQUIRES_MULTILIB ## ## help The Super-H architecture, as defined by: ## help http://www.renesas.com/fmwk.jsp?cnt=superh_family_landing.jsp&fp=/products/mpumcu/superh_family/ diff --git a/config/cc/gcc.in.2 b/config/cc/gcc.in.2 index 17b41cc..c200d22 100644 --- a/config/cc/gcc.in.2 +++ b/config/cc/gcc.in.2 @@ -37,6 +37,16 @@ config CC_GCC_EXTRA_CONFIG_ARRAY if they are properly quoted (or escaped, but prefer quotes). Eg.: --with-foo="1st arg with 4 spaces" --with-bar=2nd-arg-without-space +config CC_GCC_MULTILIB_LIST + string + prompt "List of multilib variants" + depends on MULTILIB + help + Architecture-specific option of expanding or restricting the list of + the multilib variants to be built. Refer to GCC installation manual + for the format of this option for a particular architecture. + Leave empty to use the default list for this architecture. + config CC_GCC_TARGET_FINAL bool prompt "Use the default targets all and install for the final compiler" diff --git a/config/libc/glibc.in b/config/libc/glibc.in index fc7c85b..96879cc 100644 --- a/config/libc/glibc.in +++ b/config/libc/glibc.in @@ -74,7 +74,7 @@ choice config LIBC_GLIBC_V_2_23 bool prompt "2.23" - select LIBC_GLIBC_2_20_or_later + select LIBC_GLIBC_2_23_or_later config LIBC_GLIBC_V_2_22 bool @@ -109,6 +109,11 @@ endchoice endif # ! LIBC_GLIBC_CUSTOM +# Checked by SPARC build: SPARCv8 is dropped in 2.23. +config LIBC_GLIBC_2_23_or_later + select LIBC_GLIBC_2_20_or_later + bool + # DeMark 2.20 as no longer needs to set NPTL as an addon. # It is no longer possible to build glibc without pthread! config LIBC_GLIBC_2_20_or_later diff --git a/config/libc/musl.in b/config/libc/musl.in index 00d98ea..ff84448 100644 --- a/config/libc/musl.in +++ b/config/libc/musl.in @@ -1,6 +1,7 @@ # musl options ## depends on ! WINDOWS && ! BARE_METAL +## depends on EXPERIMENTAL ## ## select LIBC_SUPPORT_THREADS_NATIVE ## select CC_CORE_PASSES_NEEDED |