diff options
| author | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
|---|---|---|
| committer | Carmelo Amoroso <carmelo.amoroso@st.com> | 2010-11-28 21:09:47 +0100 |
| commit | 57f6cce72c889f2e7b342e87a565a064320a6ee2 (patch) | |
| tree | 5466406472918d3adb63398f5fb9ea1511a5e73f /extra | |
| parent | 4ec89b87bc0eea8d9ca6b50564d12eeb3b1b0119 (diff) | |
| parent | 5dea871ac73ef4608022c058b50adc946917f9b9 (diff) | |
Merge commit 'origin/master' into prelink
Conflicts:
ldso/include/dl-hash.h
Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/Configs/Config.i386 | 2 | ||||
| -rw-r--r-- | extra/Configs/Config.in | 4 | ||||
| -rw-r--r-- | extra/Configs/Config.sparc | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386 index 850ab8ea8..288aa5ebe 100644 --- a/extra/Configs/Config.i386 +++ b/extra/Configs/Config.i386 @@ -15,7 +15,7 @@ config FORCE_OPTIONS_FOR_ARCH choice prompt "Target x86 Processor Family" - default CONFIG_GENERIC_386 + default CONFIG_486 help This is the processor type of your CPU. This information is used for optimizing purposes. To build a library that will run on all x86 CPU diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 801669a17..35ce854dd 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -79,7 +79,7 @@ config TARGET_m68k bool "m68k" config TARGET_microblaze - bool "microblaze (BROKEN)" + bool "microblaze" config TARGET_mips bool "mips" @@ -482,6 +482,8 @@ config UCLIBC_HAS_THREADS_NATIVE select UCLIBC_HAS_STDIO_FUTEXES # NPTL local: select EXTRA_WARNINGS + # i386 has no lowlevellock support (yet) as opposed to i486 onward + depends on !CONFIG_386 help If you want to compile uClibc with NPTL support, then answer Y. diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc index abb4d7874..dd8949039 100644 --- a/extra/Configs/Config.sparc +++ b/extra/Configs/Config.sparc @@ -23,7 +23,6 @@ choice SPARC v7 will give you only static support. config CONFIG_SPARC_V7 - select ARCH_HAS_NO_SHARED bool "SPARC v7" config CONFIG_SPARC_V8 |