Browse Source

Yet more messing with selecting sane default configs

Eric Andersen 21 years ago
parent
commit
1e4f229f0e

+ 3 - 1
extra/Configs/Config.alpha

@@ -4,11 +4,13 @@
 #
 #
 
 
 config HAVE_ELF
 config HAVE_ELF
-	bool
 	select UCLIBC_HAS_MMU
 	select UCLIBC_HAS_MMU
 	select ARCH_HAS_NO_FPU
 	select ARCH_HAS_NO_FPU
 	select ARCH_LITTLE_ENDIAN
 	select ARCH_LITTLE_ENDIAN
+	select HAVE_NO_SHARED
 	select ARCH_HAS_NO_LDSO
 	select ARCH_HAS_NO_LDSO
+	select HAS_NO_THREADS
+	bool
 	default y
 	default y
 
 
 config TARGET_ARCH
 config TARGET_ARCH

+ 1 - 0
extra/Configs/Config.e1

@@ -8,6 +8,7 @@ config HAVE_ELF
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_FPU
 	select ARCH_HAS_NO_FPU
 	select ARCH_HAS_C_SYMBOL_PREFIX
 	select ARCH_HAS_C_SYMBOL_PREFIX
+	select HAVE_NO_SHARED
 	select ARCH_HAS_NO_LDSO
 	select ARCH_HAS_NO_LDSO
 	bool
 	bool
 	default n
 	default n

+ 1 - 0
extra/Configs/Config.h8300

@@ -8,6 +8,7 @@ config HAVE_ELF
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_FPU
 	select ARCH_HAS_NO_FPU
 	select ARCH_HAS_C_SYMBOL_PREFIX
 	select ARCH_HAS_C_SYMBOL_PREFIX
+	select HAVE_NO_SHARED
 	select ARCH_HAS_NO_LDSO
 	select ARCH_HAS_NO_LDSO
 	default y
 	default y
 
 

+ 2 - 0
extra/Configs/Config.i960

@@ -10,7 +10,9 @@ config HAVE_ELF
 	bool
 	bool
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_FPU
 	select ARCH_HAS_NO_FPU
+	select HAVE_NO_SHARED
 	select ARCH_HAS_NO_LDSO
 	select ARCH_HAS_NO_LDSO
+	select HAS_NO_THREADS
 	default n
 	default n
 
 
 config ARCH_CFLAGS
 config ARCH_CFLAGS

+ 10 - 1
extra/Configs/Config.in

@@ -135,9 +135,13 @@ config DOPIC
 	  answer Y here.  If you only want to build uClibc as a static library,
 	  answer Y here.  If you only want to build uClibc as a static library,
 	  then answer N.
 	  then answer N.
 
 
+config HAVE_NO_SHARED
+	bool
+	default n
+
 config HAVE_SHARED
 config HAVE_SHARED
 	bool "Enable support for shared libraries"
 	bool "Enable support for shared libraries"
-	depends on DOPIC
+	depends on DOPIC && !HAVE_NO_SHARED
 	default y
 	default y
 	help
 	help
 	  If you wish to build uClibc with support for shared libraries then
 	  If you wish to build uClibc with support for shared libraries then
@@ -238,8 +242,13 @@ config UCLIBC_PROFILING
 	  size and performance penalty to profiling your applications this way,
 	  size and performance penalty to profiling your applications this way,
 	  so most people should answer N.
 	  so most people should answer N.
 
 
+config HAS_NO_THREADS
+	bool
+	default n
+
 config UCLIBC_HAS_THREADS
 config UCLIBC_HAS_THREADS
 	bool "POSIX Threading Support"
 	bool "POSIX Threading Support"
+	depends on !HAS_NO_THREADS
 	default y
 	default y
 	help
 	help
 	  If you want to compile uClibc with pthread support, then answer Y.  
 	  If you want to compile uClibc with pthread support, then answer Y.  

+ 1 - 0
extra/Configs/Config.m68k

@@ -11,6 +11,7 @@ config HAVE_ELF
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_FPU
 	select ARCH_HAS_NO_FPU
 	select ARCH_BIG_ENDIAN
 	select ARCH_BIG_ENDIAN
+	select HAVE_NO_SHARED
 	select ARCH_HAS_NO_LDSO
 	select ARCH_HAS_NO_LDSO
 	default y
 	default y
 
 

+ 1 - 0
extra/Configs/Config.microblaze

@@ -11,6 +11,7 @@ config HAVE_ELF
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_FPU
 	select ARCH_HAS_NO_FPU
 	select ARCH_HAS_C_SYMBOL_PREFIX
 	select ARCH_HAS_C_SYMBOL_PREFIX
+	select HAVE_NO_SHARED
 	select ARCH_HAS_NO_LDSO
 	select ARCH_HAS_NO_LDSO
 	default y
 	default y
 
 

+ 1 - 0
extra/Configs/Config.sparc

@@ -9,6 +9,7 @@ config TARGET_ARCH
 config HAVE_ELF
 config HAVE_ELF
 	bool
 	bool
 	select ARCH_BIG_ENDIAN
 	select ARCH_BIG_ENDIAN
+	select HAVE_NO_SHARED
 	select ARCH_HAS_NO_LDSO
 	select ARCH_HAS_NO_LDSO
 	default y
 	default y
 
 

+ 1 - 0
extra/Configs/Config.v850

@@ -12,6 +12,7 @@ config HAVE_ELF
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_NO_MMU
 	select ARCH_HAS_C_SYMBOL_PREFIX
 	select ARCH_HAS_C_SYMBOL_PREFIX
 	select HAVE_NO_PIC
 	select HAVE_NO_PIC
+	select HAVE_NO_SHARED
 	select ARCH_HAS_NO_LDSO
 	select ARCH_HAS_NO_LDSO
 	default y
 	default y