summaryrefslogtreecommitdiff
path: root/extra/Configs
diff options
context:
space:
mode:
authorCarmelo Amoroso <carmelo.amoroso@st.com>2011-04-06 15:13:59 +0200
committerCarmelo Amoroso <carmelo.amoroso@st.com>2011-04-06 15:13:59 +0200
commit3b3285b1b7c02d36c74a6ae265fdb02ca991c96b (patch)
tree0f3bf060794323ff690f6f4a86dc903c4570f540 /extra/Configs
parent289d19f45d7f8af9a4079938a3426aafdd2674ba (diff)
parent85f4b028d767fc390a7b866d2f58d58be489242d (diff)
Merge remote-tracking branch 'origin/master' into prelink
* origin/master: (137 commits) utils/ldd: Check for returned pointer from strrchr not the value it holds cris: add provide arch-specific vfork implementation lutimes.c, stubs.c: fix compiling lutimes, if __NR_utimensat is not defined bump version to 0.9.32-rc3-git release 0.9.32-rc3 memalign: include sys/param.h for MAX arm/bits/atomic.h: Include common/bit/atomic.h for thumb1 wctype.h: fix libc_hidden_proto for iswupper and add it for iswspace add libc_hidden_proto for wcs[n]casecmp_l really fix missing __libc_drand48_data Revert "missing prototype of __libc_drand48_data fixed" missing prototype of __libc_drand48_data fixed time.c, time.h: remove unused hidden strftime/strptime nanosleep.c: remove duplicated libc_hidden_proto ctype.c, ctype.h: remove commented parts that were banned for removal after 0.9.31 _wctype.c, wctype.h: remove unused isw* and wctype_l hidden functions time.c, wchar.h: remove unused hidden wcsftime str[n]casecmp.c: fix hidden usage remove unused hidden functions frv/memset.S: add missing libc_hidden_def ... Conflicts: ldso/ldso/ldso.c Signed-off-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Diffstat (limited to 'extra/Configs')
-rw-r--r--extra/Configs/Config.arm2
-rw-r--r--extra/Configs/Config.c6x29
-rw-r--r--extra/Configs/Config.in28
-rw-r--r--extra/Configs/Config.in.arch6
-rw-r--r--extra/Configs/Config.sh1
5 files changed, 54 insertions, 12 deletions
diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
index b060ace96..eb27a3391 100644
--- a/extra/Configs/Config.arm
+++ b/extra/Configs/Config.arm
@@ -14,7 +14,7 @@ config FORCE_OPTIONS_FOR_ARCH
choice
prompt "Target ABI"
- default CONFIG_ARM_OABI
+ default CONFIG_ARM_EABI
help
If you choose "EABI" here, functions and constants required by the
ARM EABI will be built into the library. You should choose "EABI"
diff --git a/extra/Configs/Config.c6x b/extra/Configs/Config.c6x
new file mode 100644
index 000000000..96adfb398
--- /dev/null
+++ b/extra/Configs/Config.c6x
@@ -0,0 +1,29 @@
+#
+# For a description of the syntax of this configuration file,
+# see extra/config/Kconfig-language.txt
+#
+
+config TARGET_ARCH
+ default "c6x"
+
+config FORCE_OPTIONS_FOR_ARCH
+ bool
+ default y
+ select ARCH_ANY_ENDIAN
+ select ARCH_HAS_NO_MMU
+
+choice
+ prompt "Target Processor Type"
+ default CONFIG_GENERIC_C6X
+
+config CONFIG_GENERIC_C6X
+ bool "Generic C6X DSP"
+
+config CONFIG_TMS320C64X
+ bool "TMS320C64X"
+
+config CONFIG_TMS320C64XPLUS
+ bool "TMS320C64X+"
+
+endchoice
+
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 35ce854dd..8cbe31847 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -114,6 +114,9 @@ config TARGET_x86_64
config TARGET_xtensa
bool "xtensa"
+config TARGET_c6x
+ bool "c6x"
+
endchoice
@@ -219,6 +222,10 @@ if TARGET_xtensa
source "extra/Configs/Config.xtensa"
endif
+if TARGET_c6x
+source "extra/Configs/Config.c6x"
+endif
+
config TARGET_SUBARCH
string
default "e500" if CONFIG_E500
@@ -685,6 +692,17 @@ config UCLIBC_SUSV4_LEGACY
WARNING! ABI incompatibility.
+config UCLIBC_STRICT_HEADERS
+ bool "Enable structures and constants for unsupported features"
+ default n
+ help
+ Enable structures and constants in headers that should not be used,
+ because the respective feature is disabled.
+
+ WARNING! enabling this option requires to patch many faulty apps,
+ since they make (wrongly) use of these structures/constants,
+ although the feature was disabled.
+
config UCLIBC_HAS_STUBS
bool "Provide stubs for unavailable functionality"
default n
@@ -693,15 +711,6 @@ config UCLIBC_HAS_STUBS
functions which are impossible to implement on the target
architecture. Otherwise, such functions are simply omitted.
- As of 2008-07, this option makes uClibc provide fork() stub
- on NOMMU targets. It always sets errno to ENOSYS and returns -1.
-
- This may be useful if you port a lot of software and cannot
- audit all of it and replace or disable fork() usage.
- With this option, a program which uses fork() will build
- successfully. Of course, it may be useless if fork()
- is essential for its operation.
-
config UCLIBC_HAS_SHADOW
bool "Shadow Password Support"
default y
@@ -1525,6 +1534,7 @@ config UCLIBC_HAS_GLIBC_CUSTOM_PRINTF
help
Answer Y to support glibc's register_printf_function() to allow an
application to add its own printf conversion specifiers.
+ parse_printf_format() is also enabled.
NOTE: Limits the number or registered specifiers to 10.
NOTE: Requires new conversion specifiers to be ASCII
diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch
index 8a02cb1a2..5f7a2b0c6 100644
--- a/extra/Configs/Config.in.arch
+++ b/extra/Configs/Config.in.arch
@@ -15,7 +15,11 @@ config UCLIBC_FORMAT_ELF
depends on ARCH_USE_MMU
config UCLIBC_FORMAT_FDPIC_ELF
bool "FDPIC ELF"
- depends on !ARCH_USE_MMU
+ depends on !ARCH_USE_MMU && (TARGET_bfin || TARGET_frv)
+ select DOPIC
+config UCLIBC_FORMAT_DSBT_ELF
+ bool "DBST ELF"
+ depends on !ARCH_USE_MMU && TARGET_c6x
select DOPIC
config UCLIBC_FORMAT_FLAT
bool "STATIC FLAT"
diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh
index 10e9d8b0c..6ce54c265 100644
--- a/extra/Configs/Config.sh
+++ b/extra/Configs/Config.sh
@@ -41,7 +41,6 @@ config CONFIG_SH3
bool "SH3"
config CONFIG_SH4
- select FORCE_SHAREABLE_TEXT_SEGMENTS
bool "SH4"
endchoice