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/Configs/Config.in | |
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/Configs/Config.in')
-rw-r--r-- | extra/Configs/Config.in | 4 |
1 files changed, 3 insertions, 1 deletions
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. |