summaryrefslogtreecommitdiff
path: root/extra/Configs
diff options
context:
space:
mode:
Diffstat (limited to 'extra/Configs')
-rw-r--r--extra/Configs/Config.arc17
-rw-r--r--extra/Configs/Config.arm8
-rw-r--r--extra/Configs/Config.in114
-rw-r--r--extra/Configs/defconfigs/arc/defconfig4
4 files changed, 95 insertions, 48 deletions
diff --git a/extra/Configs/Config.arc b/extra/Configs/Config.arc
index 40ff114cf..dc32ba4fb 100644
--- a/extra/Configs/Config.arc
+++ b/extra/Configs/Config.arc
@@ -21,3 +21,20 @@ config CONFIG_ARC_CPU_700
ARCompact ISA based ARC CPU
endchoice
+
+choice
+ prompt "MMU Page Size"
+ default CONFIG_ARC_PAGE_SIZE_8K
+
+config CONFIG_ARC_PAGE_SIZE_8K
+ bool "8KB"
+ help
+ Choose between 4k, 8k (default) or 16k
+
+config CONFIG_ARC_PAGE_SIZE_16K
+ bool "16KB"
+
+config CONFIG_ARC_PAGE_SIZE_4K
+ bool "4KB"
+
+endchoice
diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
index a16c9197a..00cf98281 100644
--- a/extra/Configs/Config.arm
+++ b/extra/Configs/Config.arm
@@ -28,6 +28,7 @@ config CONFIG_ARM_EABI
config COMPILE_IN_THUMB_MODE
bool "Build using Thumb mode"
select USE_BX
+ select USE_LDREXSTREX
help
Say 'y' here to force building uClibc in thumb mode.
Say 'n' to use your compiler's default mode.
@@ -38,3 +39,10 @@ config USE_BX
Say 'y' to use BX to return from functions on your thumb-aware
processor. Say 'y' if you need to use interworking. Say 'n' if not.
It is safe to say 'y' even if you're not doing interworking.
+
+config USE_LDREXSTREX
+ bool "Use load-store exclusive ASM ops (not supported in SmartFusion)"
+ depends on COMPILE_IN_THUMB_MODE
+ default n
+ help
+ Say 'y' to use LDREX/STREX ASM ops.
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 8e603b2ad..c1a2d5ac9 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -45,8 +45,8 @@ choice
help
The architecture of your target.
-config TARGET_alpha
- bool "alpha"
+#config TARGET_alpha
+# bool "alpha"
config TARGET_arc
bool "arc"
@@ -60,38 +60,40 @@ config TARGET_avr32
config TARGET_bfin
bool "bfin"
+# someone could sync this tree:
+# http://linux-c6x.org/git/?p=uClibc.git;a=summary
config TARGET_c6x
bool "c6x"
config TARGET_cris
bool "cris"
-config TARGET_e1
- bool "e1 (BROKEN)"
+#config TARGET_e1
+# bool "e1 (BROKEN)"
-config TARGET_frv
- bool "frv (BROKEN)"
+#config TARGET_frv
+# bool "frv (BROKEN)"
-config TARGET_h8300
- bool "h8300 (BROKEN)"
+#config TARGET_h8300
+# bool "h8300 (BROKEN)"
-config TARGET_hppa
- bool "hppa"
+#config TARGET_hppa
+# bool "hppa"
config TARGET_i386
bool "i386"
-config TARGET_i960
- bool "i960 (BROKEN)"
+#config TARGET_i960
+# bool "i960 (BROKEN)"
-config TARGET_ia64
- bool "ia64"
+#config TARGET_ia64
+# bool "ia64"
config TARGET_m68k
bool "m68k"
-config TARGET_metag
- bool "metag"
+#config TARGET_metag
+# bool "metag"
config TARGET_microblaze
bool "microblaze"
@@ -99,8 +101,8 @@ config TARGET_microblaze
config TARGET_mips
bool "mips"
-config TARGET_nios
- bool "nios"
+#config TARGET_nios
+# bool "nios"
config TARGET_nios2
bool "nios2"
@@ -111,17 +113,17 @@ config TARGET_powerpc
config TARGET_sh
bool "superh"
-config TARGET_sh64
- bool "sh64"
+#config TARGET_sh64
+# bool "sh64"
config TARGET_sparc
bool "sparc"
-config TARGET_v850
- bool "v850 (BROKEN)"
+#config TARGET_v850
+# bool "v850 (BROKEN)"
-config TARGET_vax
- bool "vax"
+#config TARGET_vax
+# bool "vax"
config TARGET_x86_64
bool "x86_64"
@@ -418,6 +420,15 @@ config LDSO_RUNPATH
Usage of RUNPATH tags is not too common, so disabling this feature
should be safe for most people.
+config LDSO_RUNPATH_OF_EXECUTABLE
+ bool "Use executables RPATH/RUNPATH when searching for libraries."
+ depends on LDSO_RUNPATH
+ default n
+ help
+ Use the executables RPATH/RUNPATH to find to find libraries even
+ though this behavour is not standard. Setting this option causes
+ the uclibc dynamic linker behavour to match the glibc dynamic linker.
+
config LDSO_SAFE_RUNPATH
bool "Allow only RUNPATH beginning with /"
depends on LDSO_RUNPATH
@@ -462,7 +473,7 @@ config LDSO_NO_CLEANUP
Unless you know you need this, you should answer N.
config UCLIBC_CTOR_DTOR
- bool "Support global constructors and destructors"
+ boolean
default y
help
If you wish to build uClibc with support for global constructor
@@ -512,6 +523,15 @@ config LINUXTHREADS_OLD
bool "older (stable) version of linuxthreads"
# linuxthreads and linuxthreads.old need nanosleep()
select UCLIBC_HAS_REALTIME
+ depends on !TARGET_arc && \
+ !TARGET_i386 && \
+ !TARGET_metag && \
+ !TARGET_mips && \
+ !TARGET_powerpc && \
+ !TARGET_sh && \
+ !TARGET_sparc && \
+ !TARGET_x86_64 && \
+ !TARGET_xtensa
help
There are two versions of linuxthreads. The older (stable) version
has been in uClibc for quite a long time but hasn't seen too many
@@ -521,6 +541,16 @@ config LINUXTHREADS_OLD
config LINUXTHREADS_NEW
bool "slightly newer version of linuxthreads"
depends on ARCH_HAS_DEPRECATED_SYSCALLS
+ depends on !TARGET_arc && \
+ !TARGET_arm && \
+ !TARGET_i386 && \
+ !TARGET_metag && \
+ !TARGET_mips && \
+ !TARGET_powerpc && \
+ !TARGET_sh && \
+ !TARGET_sparc && \
+ !TARGET_x86_64 && \
+ !TARGET_xtensa
help
The new version has not been tested much, and lacks ports for arches
which glibc does not support (like bfin/frv/etc...), but is based on
@@ -533,24 +563,21 @@ config UCLIBC_HAS_THREADS_NATIVE
select UCLIBC_HAS_STDIO_FUTEXES
select UCLIBC_HAS_REALTIME
# i386 has no lowlevellock support (yet) as opposed to i486 onward
- depends on !CONFIG_386
+ depends on !CONFIG_386 && \
+ !TARGET_alpha && \
+ !TARGET_avr32 && \
+ !TARGET_bfin && \
+ !TARGET_c6x && \
+ !TARGET_cris && \
+ !TARGET_hppa && \
+ !TARGET_ia64 && \
+ !TARGET_m68k && \
+ !TARGET_microblaze && \
+ !TARGET_nios2 && \
+ !TARGET_vax
help
If you want to compile uClibc with NPTL support, then answer Y.
- IMPORTANT NOTE! NPTL requires a Linux 2.6 kernel, binutils
- at least version 2.16 and GCC with at least version 4.1.0. NPTL
- will not work with older versions of any above sources. If you
- ignore any of these guidelines, you do so at your own risk. Do
- not ask for help on any of the development mailing lists.
-
- !!!! WARNING !!!! BIG FAT WARNING !!!! REALLY BIG FAT WARNING !!!!
-
- This is experimental code and at times it may not even build and
- even if it does it might decide to do random damage. This code is
- potentially hazardous to your health and sanity. It will remain
- that way until further notice at which point this notice will
- disappear. Thank you for your support and for not smoking.
-
endchoice
config UCLIBC_HAS_THREADS
@@ -2464,11 +2491,4 @@ config DOMULTI
If unsure, keep the default of N.
-config UCLIBC_MJN3_ONLY
- bool "Manuel's hidden warnings"
- help
- Answer Y here to see all Manuel's personal notes, warnings, and todos.
-
- Most people will answer N.
-
endmenu
diff --git a/extra/Configs/defconfigs/arc/defconfig b/extra/Configs/defconfigs/arc/defconfig
index 840c59f0e..2dca4f9b3 100644
--- a/extra/Configs/defconfigs/arc/defconfig
+++ b/extra/Configs/defconfigs/arc/defconfig
@@ -6,12 +6,13 @@ KERNEL_HEADERS="%KERNEL_HEADERS%"
# LDSO_CACHE_SUPPORT is not set
LDSO_RUNPATH=y
# LDSO_SAFE_RUNPATH is not set
-UCLIBC_HAS_THREADS_NATIVE=y
+LINUXTHREADS_OLD=y
PTHREADS_DEBUG_SUPPORT=y
UCLIBC_HAS_OBSTACK=y
UCLIBC_SUSV2_LEGACY=y
UCLIBC_SUSV3_LEGACY=y
UCLIBC_SUSV4_LEGACY=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
UCLIBC_HAS_OBSOLETE_BSD_SIGNAL=y
UCLIBC_SV4_DEPRECATED=y
UCLIBC_HAS_RPC=y
@@ -19,6 +20,7 @@ UCLIBC_HAS_FULL_RPC=y
UCLIBC_HAS_RESOLVER_SUPPORT=y
UCLIBC_HAS_LIBRESOLV_STUB=y
UCLIBC_HAS_LOCALE=y
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
UCLIBC_HAS_NFTW=y
UCLIBC_HAS_FTW=y
RUNTIME_PREFIX="%RUNTIME_PREFIX%"