diff options
| author | Eric Andersen <andersen@codepoet.org> | 2003-11-04 13:07:50 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2003-11-04 13:07:50 +0000 |
| commit | f8a3fa0247f4ee4e614df73aef0f8732c8ae5ab3 (patch) | |
| tree | 8a616a6013bc45c1e86b5ca6b347bd81393217e2 /extra/Configs | |
| parent | fe6015e8aac57bedd05407fc956727c993070adf (diff) | |
Rework the config system. Better utilize the Kconfig language
which should simplify enabling arbitrary architectures.
-Erik
Diffstat (limited to 'extra/Configs')
31 files changed, 273 insertions, 1277 deletions
diff --git a/extra/Configs/Config.alpha b/extra/Configs/Config.alpha index b8c9f2505..e810c6dd7 100644 --- a/extra/Configs/Config.alpha +++ b/extra/Configs/Config.alpha @@ -3,14 +3,15 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" - config HAVE_ELF bool + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU default y +config TARGET_ARCH + default "alpha" + config ARCH_CFLAGS string @@ -20,10 +21,3 @@ config ARCH_LDFLAGS config LIBGCC_CFLAGS string -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm index c7ec716e0..291aea4a8 100644 --- a/extra/Configs/Config.arm +++ b/extra/Configs/Config.arm @@ -3,14 +3,13 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" - config HAVE_ELF bool default y +config TARGET_ARCH + default "arm" + config ARCH_CFLAGS string @@ -41,60 +40,54 @@ choice If you don't know what to do, choose "Generic Arm". config CONFIG_GENERIC_ARM + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU bool "Generic Arm" config CONFIG_ARM610 + select ARCH_HAS_NO_MMU + select ARCH_HAS_NO_FPU bool "Arm 610" config CONFIG_ARM710 + select ARCH_HAS_NO_MMU + select ARCH_HAS_NO_FPU bool "Arm 710" config CONFIG_ARM720T + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU bool "Arm 720T" config CONFIG_ARM920T + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU bool "Arm 920T" config CONFIG_ARM922T + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU bool "Arm 922T" config CONFIG_ARM926T + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU bool "Arm 926T" config CONFIG_ARM_SA110 + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU bool "Intel StrongArm SA-110" config CONFIG_ARM_SA1100 + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU bool "Intel StrongArm SA-1100" config CONFIG_ARM_XSCALE + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU bool "Intel Xscale" endchoice -choice - prompt "Target Processor Endianness" - default ARCH_LITTLE_ENDIAN - help - This is the endianness you wish to build use. Choose either Big - Endian, or Little Endian. - -config ARCH_LITTLE_ENDIAN - bool "Little Endian" - -config ARCH_BIG_ENDIAN - bool "Big Endian" - -endchoice - -config ARCH_HAS_NO_MMU - bool - default y if CONFIG_ARM7TDMI - -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.arm.default b/extra/Configs/Config.arm.default deleted file mode 100644 index 0858dd557..000000000 --- a/extra/Configs/Config.arm.default +++ /dev/null @@ -1,63 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -CONFIG_GENERIC_ARM=y -# CONFIG_ARM7TDMI is not set -# CONFIG_STRONGARM is not set -# CONFIG_XSCALE is not set -UCLIBC_HAS_MMU=y -UCLIBC_HAS_FLOATS=y -HAS_FPU=y -# DO_C99_MATH is not set -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -C_SYMBOL_PREFIX="" - -# -# General Library Settings -# -DOPIC=y -HAVE_SHARED=y -BUILD_UCLIBC_LDSO=y -LDSO_LDD_SUPPORT=y -UCLIBC_HAS_THREADS=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -MALLOC_930716=y -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -# UCLIBC_HAS_RPC is not set - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib" -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc hacking options -# -# DODEBUG is not set -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set diff --git a/extra/Configs/Config.cris b/extra/Configs/Config.cris index 2a2b0939a..94d703ae1 100644 --- a/extra/Configs/Config.cris +++ b/extra/Configs/Config.cris @@ -3,14 +3,13 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" - config HAVE_ELF bool default y +config TARGET_ARCH + default "cris" + config ARCH_CFLAGS string @@ -32,14 +31,9 @@ choice - CRIS Generic support for Axis' CRIS architecture. config CONFIG_CRIS + select UCLIBC_HAS_MMU + select ARCH_HAS_NO_FPU bool "CRIS" endchoice -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.cris.default b/extra/Configs/Config.cris.default deleted file mode 100644 index 21e4645e4..000000000 --- a/extra/Configs/Config.cris.default +++ /dev/null @@ -1,112 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -CONFIG_CRIS=y -UCLIBC_HAS_MMU=y -UCLIBC_HAS_FLOATS=y -HAS_FPU=y -# DO_C99_MATH is not set -WARNINGS="-Wall" -KERNEL_SOURCE="$(AXIS_KERNEL_DIR)" -C_SYMBOL_PREFIX="" -HAVE_DOT_CONFIG=y - -# -# General Library Settings -# -DOPIC=y -HAVE_SHARED=y -BUILD_UCLIBC_LDSO=y -# LDSO_LDD_SUPPORT is not set -UCLIBC_CTOR_DTOR=y -# UCLIBC_PROFILING is not set -UCLIBC_HAS_THREADS=y -# PTHREADS_DEBUG_SUPPORT is not set -UCLIBC_HAS_LFS=y -# MALLOC is not set -MALLOC_930716=y -# MALLOC_GLIBC_COMPAT is not set -# UCLIBC_DYNAMIC_ATEXIT is not set -HAS_SHADOW=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y -# UCLIBC_HAS_TM_EXTENSIONS is not set -UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y -UCLIBC_TZ_FILE_PATH="/etc/TZ" - -# -# Networking Support -# -UCLIBC_HAS_IPV6=y -UCLIBC_HAS_RPC=y -# UCLIBC_HAS_FULL_RPC is not set - -# -# String and Stdio Support -# -UCLIBC_HAS_CTYPE_TABLES=y -UCLIBC_HAS_CTYPE_SIGNED=y -# UCLIBC_HAS_CTYPE_UNSAFE is not set -UCLIBC_HAS_CTYPE_CHECKED=y -# UCLIBC_HAS_CTYPE_ENFORCED is not set -# UCLIBC_HAS_WCHAR is not set -# UCLIBC_HAS_LOCALE is not set -# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set -# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set -# USE_OLD_VFPRINTF is not set -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set -# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set -# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set -UCLIBC_HAS_STDIO_BUFSIZ_8192=y -UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y -# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set -# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set -# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set -UCLIBC_HAS_PRINTF_M_SPEC=y -UCLIBC_HAS_ERRNO_MESSAGES=y -UCLIBC_HAS_SYS_ERRLIST=y -UCLIBC_HAS_SIGNUM_MESSAGES=y -UCLIBC_HAS_SYS_SIGLIST=y -UCLIBC_HAS_GNU_GETOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -# UCLIBC_HAS_WORDEXP is not set -# UCLIBC_HAS_FTW is not set -UCLIBC_HAS_GLOB=y - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PATH="/lib" -DEVEL_PREFIX="$(AXIS_TOP_DIR)/target/cris-axis-linux-gnuuclibc" -SYSTEM_DEVEL_PREFIX="$(TOPDIR)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/include" - -# -# uClibc development/debugging options -# -# DODEBUG is not set -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/extra/Configs/Config.e1 b/extra/Configs/Config.e1 index ddb0b50b7..06b5a9206 100644 --- a/extra/Configs/Config.e1 +++ b/extra/Configs/Config.e1 @@ -4,46 +4,27 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" +config HAVE_ELF + select ARCH_HAS_NO_MMU + select ARCH_HAS_NO_FPU + select ARCH_HAS_C_SYMBOL_PREFIX + bool + default n -menu "Target Architecture Features and Options" +config TARGET_ARCH + default "e1" config ARCH_E1 bool default y -config HAVE_ELF - bool - default n - config ARCH_CFLAGS string default "-I$(KERNEL_SOURCE)/include -mgnu-param" -# --bitwise-or - config ARCH_LDFLAGS string config LIBGCC_CFLAGS string -config HAVE_ELF - bool - default n - -config ARCH_HAS_NO_MMU - bool - default y - -config ARCH_HAS_C_SYMBOL_PREFIX - bool - default y - -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.e1.default b/extra/Configs/Config.e1.default deleted file mode 100644 index 44621262e..000000000 --- a/extra/Configs/Config.e1.default +++ /dev/null @@ -1,64 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -# HAVE_ELF is not set -ARCH_CFLAGS="-I$(KERNEL_SOURCE)/include -mgnu-param" -ARCH_HAS_NO_MMU=y -ARCH_HAS_C_SYMBOL_PREFIX=y -UCLIBC_HAS_FLOATS=y -# HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y -# DO_C99_MATH is not set -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -UCLIBC_UCLINUX_BROKEN_MUNMAP=y -EXCLUDE_BRK=y -C_SYMBOL_PREFIX="_" -HAVE_DOT_CONFIG=y - -# -# General Library Settings -# -# DOPIC is not set -# UCLIBC_CTOR_DTOR is not set -# UCLIBC_PROFILING is not set -# UCLIBC_HAS_THREADS is not set -# UCLIBC_HAS_LFS is not set -MALLOC=y -# MALLOC_930716 is not set -UCLIBC_DYNAMIC_ATEXIT=y -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -# ASSUME_DEVPTS is not set - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -# UCLIBC_HAS_RPC is not set - -# -# String and Stdio Support -# -UCLIBC_HAS_WCHAR=y -# UCLIBC_HAS_LOCALE is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc hacking options -# -DODEBUG=y -# DOASSERTS is not set -# UCLIBC_MALLOC_DEBUGGING is not set diff --git a/extra/Configs/Config.h8300 b/extra/Configs/Config.h8300 index 9bce0f063..6e869c0a7 100644 --- a/extra/Configs/Config.h8300 +++ b/extra/Configs/Config.h8300 @@ -3,9 +3,15 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" +config HAVE_ELF + bool + select ARCH_HAS_NO_MMU + select ARCH_HAS_NO_FPU + select ARCH_HAS_C_SYMBOL_PREFIX + default y -menu "Target Architecture Features and Options" +config TARGET_ARCH + default "h8300" choice prompt "Target Processor" @@ -21,10 +27,6 @@ config CONFIG_H8S endchoice -config HAVE_ELF - bool - default y - config ARCH_CFLAGS string @@ -34,18 +36,3 @@ config ARCH_LDFLAGS config LIBGCC_CFLAGS string -config ARCH_HAS_NO_MMU - bool - default y - -config ARCH_HAS_C_SYMBOL_PREFIX - bool - default y - -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.h8300.default b/extra/Configs/Config.h8300.default deleted file mode 100644 index bb1787809..000000000 --- a/extra/Configs/Config.h8300.default +++ /dev/null @@ -1,64 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -# CONFIG_H8300H is not set -CONFIG_H8S=y -HAVE_ELF=y -ARCH_HAS_NO_MMU=y -ARCH_HAS_C_SYMBOL_PREFIX=y -UCLIBC_HAS_FLOATS=y -# HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y -DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="$(ROOTDIR)/$(LINUXDIR)/." -UCLIBC_UCLINUX_BROKEN_MUNMAP=y -EXCLUDE_BRK=y -C_SYMBOL_PREFIX="_" -HAVE_DOT_CONFIG=y - -# -# General Library Settings -# -# DOPIC is not set -UCLIBC_CTOR_DTOR=y -# UCLIBC_HAS_THREADS is not set -UCLIBC_HAS_LFS=y -MALLOC=y -# MALLOC_930716 is not set -UCLIBC_DYNAMIC_ATEXIT=y -# HAS_SHADOW is not set -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc hacking options -# -# DODEBUG is not set -# DOASSERTS is not set -# UCLIBC_MALLOC_DEBUGGING is not set diff --git a/extra/Configs/Config.i386 b/extra/Configs/Config.i386 index d208fa95b..79e433a0f 100644 --- a/extra/Configs/Config.i386 +++ b/extra/Configs/Config.i386 @@ -3,14 +3,17 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" - config HAVE_ELF bool + select HAS_FPU + select ARCH_LITTLE_ENDIAN + select UCLIBC_HAS_MMU default y +config TARGET_ARCH + string + default "i386" + config ARCH_CFLAGS string @@ -21,7 +24,7 @@ config LIBGCC_CFLAGS string choice - prompt "Target Processor Type" + prompt "Target x86 Processor Family" default CONFIG_GENERIC_386 help This is the processor type of your CPU. This information is used for @@ -58,6 +61,7 @@ config CONFIG_GENERIC_386 bool "Generic 386" config CONFIG_386 + select ARCH_HAS_NO_FPU bool "386" config CONFIG_486 @@ -98,9 +102,3 @@ config CONFIG_CYRIXIII endchoice -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - diff --git a/extra/Configs/Config.i386.default b/extra/Configs/Config.i386.default deleted file mode 100644 index 87adee429..000000000 --- a/extra/Configs/Config.i386.default +++ /dev/null @@ -1,73 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -CONFIG_GENERIC_386=y -# CONFIG_386 is not set -# CONFIG_486 is not set -# CONFIG_586 is not set -# CONFIG_586MMX is not set -# CONFIG_686 is not set -# CONFIG_PENTIUMIII is not set -# CONFIG_PENTIUM4 is not set -# CONFIG_K6 is not set -# CONFIG_K7 is not set -# CONFIG_CRUSOE is not set -# CONFIG_WINCHIPC6 is not set -# CONFIG_WINCHIP2 is not set -# CONFIG_CYRIXIII is not set -UCLIBC_HAS_MMU=y -UCLIBC_HAS_FLOATS=y -HAS_FPU=y -# DO_C99_MATH is not set -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -C_SYMBOL_PREFIX="" - -# -# General Library Settings -# -DOPIC=y -HAVE_SHARED=y -BUILD_UCLIBC_LDSO=y -LDSO_LDD_SUPPORT=y -UCLIBC_HAS_THREADS=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -MALLOC_930716=y -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -# UCLIBC_HAS_RPC is not set - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib" -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc hacking options -# -# DODEBUG is not set -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set diff --git a/extra/Configs/Config.i960 b/extra/Configs/Config.i960 index cf3938ad8..3c30a1c85 100644 --- a/extra/Configs/Config.i960 +++ b/extra/Configs/Config.i960 @@ -3,12 +3,13 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" +config TARGET_ARCH + default "i960" config HAVE_ELF bool + select ARCH_HAS_NO_MMU + select ARCH_HAS_NO_FPU default n config ARCH_CFLAGS @@ -21,18 +22,7 @@ config ARCH_LDFLAGS config LIBGCC_CFLAGS string -config ARCH_HAS_NO_MMU - bool - default y - config ARCH_HAS_C_SYMBOL_PREFIX bool default y -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in index 82e633839..0dd73787e 100644 --- a/extra/Configs/Config.in +++ b/extra/Configs/Config.in @@ -2,13 +2,130 @@ # For a description of the syntax of this configuration file, # see extra/config/Kconfig-language.txt # -config HAVE_DOT_CONFIG - bool - default y +mainmenu "uClibc C Library Configuration" + + +choice + prompt "Target Architecture" + default TARGET_I386 + help + Stuff + +config TARGET_ALPHA + bool "alpha" + +config TARGET_ARM + bool "arm" + +config TARGET_CRIS + bool "cris" + +config TARGET_E1 + bool "e1" + +config TARGET_H8300 + bool "h8300" + +config TARGET_I386 + bool "i386" + +config TARGET_I960 + bool "i960" + +config TARGET_M68K + bool "m68k" + +config TARGET_MICROBLAZE + bool "microblaze" + +config TARGET_MIPS + bool "mips" + +config TARGET_POWERPC + bool "powerpc" + +config TARGET_SH + bool "SuperH" + +config TARGET_SPARC + bool "sparc" + +config TARGET_V850 + bool "v850" + +endchoice + + +menu "Target Architecture Features and Options" + +if TARGET_ALPHA +source "extra/Configs/Config.alpha" +endif +if TARGET_ARM +source "extra/Configs/Config.arm" +endif + +if TARGET_CRIS +source "extra/Configs/Config.cris" +endif + +if TARGET_E1 +source "extra/Configs/Config.e1" +endif + +if TARGET_H8300 +source "extra/Configs/Config.h8300" +endif + +if TARGET_I386 +source "extra/Configs/Config.i386" +endif + +if TARGET_I960 +source "extra/Configs/Config.i960" +endif + +if TARGET_M68K +source "extra/Configs/Config.m68k" +endif + +if TARGET_MICROBLAZE +source "extra/Configs/Config.microblaze" +endif + +if TARGET_MIPS +source "extra/Configs/Config.mips" +endif + +if TARGET_POWERPC +source "extra/Configs/Config.powerpc" +endif + +if TARGET_SH +source "extra/Configs/Config.sh" +endif + +if TARGET_SPARC +source "extra/Configs/Config.sparc" +endif + +if TARGET_V850 +source "extra/Configs/Config.v850" +endif + + + +source "extra/Configs/Config.in.arch" + +endmenu menu "General Library Settings" +config HAVE_NO_PIC + bool + default n + config DOPIC bool "Generate Position Independent Code (PIC)" default y @@ -818,7 +935,7 @@ endmenu menu "Library Installation Options" -config SHARED_LIB_LOADER_PATH +config SHARED_LIB_LOADER_PREFIX string "Shared library loader path" depends on BUILD_UCLIBC_LDSO default "$(DEVEL_PREFIX)/lib" @@ -827,6 +944,9 @@ config SHARED_LIB_LOADER_PATH shared library will be invoked. This value will be compiled into every binary compiled with uClibc. + For a typical target system this should be set to "/lib", such that + 'make install' will install /lib/ld-uClibc.so.0. + BIG FAT WARNING: If you do not have a shared library loader with the correct name sitting in the directory this points to, your binaries will not @@ -848,20 +968,25 @@ config SYSTEM_LDSO config RUNTIME_PREFIX string "uClibc runtime library directory" - default "/usr/$(TARGET_ARCH)-linux-uclibc" + default "/usr/$(TARGET_ARCH)-linux-uclibc/" help RUNTIME_PREFIX is the directory into which the uClibc runtime libraries will be installed. The result will look something like the following: $(RUNTIME_PREFIX)/ lib/ <contains all runtime libraries> + bin/ldd <the ldd utility program> + sbin/ldconfig <the ldconfig utility program> This value is used by the 'make install' Makefile target. Since this - directory is compiled into the uclibc cross compiler wrapper, you - have to recompile uClibc if you change this value... + directory is compiled into the shared library loader, you will need to + recompile uClibc if you change this value... + + For a typical target system this should be set to "/", such that + 'make install' will install /lib/libuClibc-<VERSION>.so config DEVEL_PREFIX string "uClibc development environment directory" - default "/usr/$(TARGET_ARCH)-linux-uclibc" + default "/usr/$(TARGET_ARCH)-linux-uclibc/usr/" help DEVEL_PREFIX is the directory into which the uClibc development environment will be installed. The result will look something @@ -869,29 +994,11 @@ config DEVEL_PREFIX $(DEVEL_PREFIX)/ lib/ <contains static libs> include/ <Where all the header files go> - This value is used by the 'make install' Makefile target. Since this - directory is compiled into the uclibc cross compiler wrapper, you - have to recompile uClibc if you change this value... - -config SYSTEM_DEVEL_PREFIX - string "uClibc development environment system directory" - default "$(DEVEL_PREFIX)" - help - SYSTEM_DEVEL_PREFIX is the directory prefix used when installing - bin/arch-uclibc-gcc, bin/arch-uclibc-ld, etc. This is only used by - the 'make install' target, and is not compiled into anything. This - defaults to $(DEVEL_PREFIX), but makers of .rpms and .debs may want - to set this to "/usr" instead. - -config DEVEL_TOOL_PREFIX - string "uClibc development environment tool directory" - default "$(DEVEL_PREFIX)/usr" - help - DEVEL_TOOL_PREFIX is the directory prefix used when installing - bin/gcc, bin/ld, etc. This is only used by the 'make install' - target, and is not compiled into anything. This defaults to - $(DEVEL_PREFIX)/usr, but makers of .rpms and .debs may want to - set this to something else. + This value is used by the 'make install' Makefile target when + installing a uClibc development environment. + + For a typical target system this should be set to "/usr", such that + 'make install' will install /usr/include/<header files>. endmenu diff --git a/extra/Configs/Config.in.arch b/extra/Configs/Config.in.arch index 21953e107..6b2011dee 100644 --- a/extra/Configs/Config.in.arch +++ b/extra/Configs/Config.in.arch @@ -3,6 +3,25 @@ # see extra/config/Kconfig-language.txt # +choice + prompt "Target Processor Endianness" + default ARCH_LITTLE_ENDIAN + help + This is the endianness you wish to build use. Choose either Big + Endian, or Little Endian. + +config ARCH_LITTLE_ENDIAN + bool "Little Endian" + +config ARCH_BIG_ENDIAN + bool "Big Endian" + +endchoice + +config ARCH_HAS_NO_MMU + bool + default n + config UCLIBC_HAS_MMU bool "Target CPU has a memory management unit (MMU)" default y @@ -27,6 +46,10 @@ config UCLIBC_HAS_FLOATS Answering N to this option can reduce the size of uClibc. Most people will answer Y. +config ARCH_HAS_NO_FPU + bool + default n + config HAS_FPU bool "Target CPU has a floating point unit (FPU)" depends on UCLIBC_HAS_FLOATS && !ARCH_HAS_NO_FPU @@ -93,3 +116,7 @@ config C_SYMBOL_PREFIX default "_" if ARCH_HAS_C_SYMBOL_PREFIX default "" if !ARCH_HAS_C_SYMBOL_PREFIX +config HAVE_DOT_CONFIG + bool + default y + diff --git a/extra/Configs/Config.m68k b/extra/Configs/Config.m68k index 77ba79408..23e5a19d8 100644 --- a/extra/Configs/Config.m68k +++ b/extra/Configs/Config.m68k @@ -3,12 +3,13 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" +config TARGET_ARCH + default "m68k" config HAVE_ELF bool + select ARCH_HAS_NO_MMU + select ARCH_HAS_NO_FPU default y config ARCH_CFLAGS @@ -25,14 +26,3 @@ config HAVE_ELF bool default y -config ARCH_HAS_NO_MMU - bool - default y - -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.m68k.default b/extra/Configs/Config.m68k.default deleted file mode 100644 index beb027976..000000000 --- a/extra/Configs/Config.m68k.default +++ /dev/null @@ -1,61 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -ARCH_HAS_NO_MMU=y -UCLIBC_HAS_FLOATS=y -# HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y -DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="$(ROOTDIR)/$(LINUXDIR)/." -UCLIBC_UCLINUX_BROKEN_MUNMAP=y -EXCLUDE_BRK=y -C_SYMBOL_PREFIX="" -HAVE_DOT_CONFIG=y - -# -# General Library Settings -# -# DOPIC is not set -UCLIBC_CTOR_DTOR=y -UCLIBC_HAS_THREADS=y -UCLIBC_HAS_LFS=y -MALLOC=y -# MALLOC_930716 is not set -UCLIBC_DYNAMIC_ATEXIT=y -# HAS_SHADOW is not set -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc hacking options -# -# DODEBUG is not set -# DOASSERTS is not set -# UCLIBC_MALLOC_DEBUGGING is not set diff --git a/extra/Configs/Config.microblaze b/extra/Configs/Config.microblaze index abcd9300e..957d39698 100644 --- a/extra/Configs/Config.microblaze +++ b/extra/Configs/Config.microblaze @@ -3,9 +3,16 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" +config TARGET_ARCH + default "microblaze" -menu "Target Architecture Features and Options" +config HAVE_ELF + bool + select ARCH_HAS_NO_MMU + select ARCH_HAS_NO_FPU + select ARCH_HAS_C_SYMBOL_PREFIX + select HAVE_NO_PIC + default y config ARCH_CFLAGS string @@ -16,34 +23,7 @@ config ARCH_LDFLAGS config LIBGCC_CFLAGS string -config HAVE_ELF - bool - default y - -config ARCH_HAS_NO_MMU - bool - default y - -config ARCH_HAS_NO_FPU - bool - default y - -config ARCH_HAS_C_SYMBOL_PREFIX - bool - default y - -config HAVE_NO_PIC - bool - default y - config CROSS string default "mb-" -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.microblaze.default b/extra/Configs/Config.microblaze.default deleted file mode 100644 index 4b8925375..000000000 --- a/extra/Configs/Config.microblaze.default +++ /dev/null @@ -1,59 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -ARCH_HAS_NO_MMU=y -ARCH_HAS_NO_FPU=y -ARCH_HAS_C_SYMBOL_PREFIX=y -HAVE_NO_PIC=y -CROSS="mb-" -UCLIBC_HAS_FLOATS=y -UCLIBC_HAS_SOFT_FLOAT=y -# DO_C99_MATH is not set -WARNINGS="-Wall" -KERNEL_SOURCE="/home/jwilliam/uClinux-dist/linux-2.4.x" -UCLIBC_UCLINUX_BROKEN_MUNMAP=y -EXCLUDE_BRK=y -C_SYMBOL_PREFIX="_" - -# -# General Library Settings -# -# UCLIBC_HAS_THREADS is not set -UCLIBC_HAS_LFS=y -MALLOC=y -# MALLOC_930716 is not set -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -# ASSUME_DEVPTS is not set - -# -# Networking Support -# -UCLIBC_HAS_IPV6=y -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -USE_OLD_VFPRINTF=y - -# -# Library Installation Options -# -DEVEL_PREFIX="/usr/local/tools/microblaze-elf-gcc" -SYSTEM_DEVEL_PREFIX="/usr/local" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)" - -# -# uClibc hacking options -# -DODEBUG=y -# DOASSERTS is not set diff --git a/extra/Configs/Config.mips b/extra/Configs/Config.mips index 390be1374..b61b1deea 100644 --- a/extra/Configs/Config.mips +++ b/extra/Configs/Config.mips @@ -3,9 +3,9 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" +config TARGET_ARCH + default "mips" if ARCH_BIG_ENDIAN + default "mipsel" if ARCH_LITTLE_ENDIAN config HAVE_ELF bool @@ -21,10 +21,3 @@ config ARCH_LDFLAGS config LIBGCC_CFLAGS string -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.mips.default b/extra/Configs/Config.mips.default deleted file mode 100644 index 6d429e4a0..000000000 --- a/extra/Configs/Config.mips.default +++ /dev/null @@ -1,61 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -ARCH_CFLAGS="-mno-split-addresses" -UCLIBC_HAS_MMU=y -UCLIBC_HAS_FLOATS=y -HAS_FPU=y -DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -C_SYMBOL_PREFIX="" - -# -# General Library Settings -# -DOPIC=y -HAVE_SHARED=y -BUILD_UCLIBC_LDSO=y -# LDSO_LDD_SUPPORT is not set -UCLIBC_HAS_THREADS=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -MALLOC_930716=y -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PATH="/lib" -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc hacking options -# -DODEBUG=y -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set diff --git a/extra/Configs/Config.mipsel b/extra/Configs/Config.mipsel deleted file mode 100644 index 390be1374..000000000 --- a/extra/Configs/Config.mipsel +++ /dev/null @@ -1,30 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see extra/config/Kconfig-language.txt -# - -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" - -config HAVE_ELF - bool - default y - -config ARCH_CFLAGS - string - default "-mno-split-addresses" - -config ARCH_LDFLAGS - string - -config LIBGCC_CFLAGS - string - -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.mipsel.default b/extra/Configs/Config.mipsel.default deleted file mode 100644 index 6d429e4a0..000000000 --- a/extra/Configs/Config.mipsel.default +++ /dev/null @@ -1,61 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -ARCH_CFLAGS="-mno-split-addresses" -UCLIBC_HAS_MMU=y -UCLIBC_HAS_FLOATS=y -HAS_FPU=y -DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -C_SYMBOL_PREFIX="" - -# -# General Library Settings -# -DOPIC=y -HAVE_SHARED=y -BUILD_UCLIBC_LDSO=y -# LDSO_LDD_SUPPORT is not set -UCLIBC_HAS_THREADS=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -MALLOC_930716=y -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PATH="/lib" -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc hacking options -# -DODEBUG=y -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set diff --git a/extra/Configs/Config.powerpc b/extra/Configs/Config.powerpc index b8c9f2505..79e3db730 100644 --- a/extra/Configs/Config.powerpc +++ b/extra/Configs/Config.powerpc @@ -3,12 +3,12 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" +config TARGET_ARCH + default "powerpc" config HAVE_ELF bool + select UCLIBC_HAS_MMU default y config ARCH_CFLAGS @@ -20,10 +20,3 @@ config ARCH_LDFLAGS config LIBGCC_CFLAGS string -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.powerpc.default b/extra/Configs/Config.powerpc.default deleted file mode 100644 index 5ee4982b5..000000000 --- a/extra/Configs/Config.powerpc.default +++ /dev/null @@ -1,59 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -UCLIBC_HAS_MMU=y -UCLIBC_HAS_FLOATS=y -HAS_FPU=y -# DO_C99_MATH is not set -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -C_SYMBOL_PREFIX="" - -# -# General Library Settings -# -DOPIC=y -HAVE_SHARED=y -BUILD_UCLIBC_LDSO=y -LDSO_LDD_SUPPORT=y -UCLIBC_HAS_THREADS=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -MALLOC_930716=y -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -# UCLIBC_HAS_RPC is not set - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib" -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc hacking options -# -# DODEBUG is not set -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set diff --git a/extra/Configs/Config.sh b/extra/Configs/Config.sh index bf4326c52..5a9eaf525 100644 --- a/extra/Configs/Config.sh +++ b/extra/Configs/Config.sh @@ -3,9 +3,11 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" +config TARGET_ARCH + default "sh2" if CONFIG_SH2 + default "sh3" if CONFIG_SH3 + default "sh4" if CONFIG_SH4 + default "sh64" if CONFIG_SH5 config HAVE_ELF bool @@ -41,46 +43,28 @@ choice - "SH2" Hitachi SH2 - "SH3" Hitachi SH3 - "SH4" Hitachi SH4 + - "SH5" SH-5 101, 103 config CONFIG_SH2 + select ARCH_HAS_NO_FPU + select ARCH_HAS_NO_MMU bool "SH2" config CONFIG_SH3 + select HAS_FPU + select UCLIBC_HAS_MMU bool "SH3" config CONFIG_SH4 + select HAS_FPU + select UCLIBC_HAS_MMU bool "SH4" -endchoice - -choice - prompt "Target Processor Endianness" - default ARCH_LITTLE_ENDIAN - help - This is the endianness you wish to build use. Choose either Big - Endian, or Little Endian. - -config ARCH_LITTLE_ENDIAN - bool "Little Endian" - -config ARCH_BIG_ENDIAN - bool "Big Endian" +config CONFIG_SH5 + select HAS_FPU + select UCLIBC_HAS_MMU + bool "SH5" endchoice -config ARCH_HAS_NO_MMU - bool - default y if CONFIG_SH2 - -config ARCH_HAS_NO_FPU - bool - default y if CONFIG_SH2 || CONFIG_SH3 - -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.sh.default b/extra/Configs/Config.sh.default deleted file mode 100644 index fc9ec12ca..000000000 --- a/extra/Configs/Config.sh.default +++ /dev/null @@ -1,65 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -HAVE_DOT_HIDDEN=y -# CONFIG_SH2 is not set -# CONFIG_SH3 is not set -CONFIG_SH4=y -ARCH_LITTLE_ENDIAN=y -# ARCH_BIG_ENDIAN is not set -UCLIBC_HAS_MMU=y -UCLIBC_HAS_FLOATS=y -HAS_FPU=y -# DO_C99_MATH is not set -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -C_SYMBOL_PREFIX="" - -# -# General Library Settings -# -DOPIC=y -HAVE_SHARED=y -BUILD_UCLIBC_LDSO=y -LDSO_LDD_SUPPORT=y -UCLIBC_HAS_THREADS=y -UCLIBC_HAS_LFS=y -# MALLOC is not set -MALLOC_930716=y -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -# UCLIBC_HAS_RPC is not set - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PATH="$(DEVEL_PREFIX)/lib" -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc hacking options -# -# DODEBUG is not set -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set diff --git a/extra/Configs/Config.sh64 b/extra/Configs/Config.sh64 deleted file mode 100644 index ab77aba66..000000000 --- a/extra/Configs/Config.sh64 +++ /dev/null @@ -1,61 +0,0 @@ -# -# For a description of the syntax of this configuration file, -# see extra/config/Kconfig-language.txt -# - -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" - -config HAVE_ELF - bool - default y - -config ARCH_CFLAGS - string - -config ARCH_LDFLAGS - string - -config LIBGCC_CFLAGS - string - -choice - prompt "Target Processor Type" - default CONFIG_SH5 - help - This is the processor type of your CPU. This information is used for - optimizing purposes, as well as to determine if your CPU has an MMU, - an FPU, etc. If you pick the wrong CPU type, there is no guarantee - that uClibc will work at all.... - - Here are the available choices: - - "SH5" SH-5 101, 103 - -config CONFIG_SH5 - bool "SH5" - -endchoice - -choice - prompt "Target Processor Endianness" - default ARCH_LITTLE_ENDIAN - help - This is the endianness you wish to build use. Choose either Big - Endian, or Little Endian. - -config ARCH_LITTLE_ENDIAN - bool "Little Endian" - -config ARCH_BIG_ENDIAN - bool "Big Endian" - -endchoice - -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.sh64.default b/extra/Configs/Config.sh64.default deleted file mode 100644 index 1e90f2182..000000000 --- a/extra/Configs/Config.sh64.default +++ /dev/null @@ -1,95 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -CONFIG_SH5=y -ARCH_LITTLE_ENDIAN=y -# ARCH_BIG_ENDIAN is not set -UCLIBC_HAS_MMU=y -UCLIBC_HAS_FLOATS=y -HAS_FPU=y -# DO_C99_MATH is not set -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -C_SYMBOL_PREFIX="" -HAVE_DOT_CONFIG=y - -# -# General Library Settings -# -# DOPIC is not set -UCLIBC_CTOR_DTOR=y -UCLIBC_PROFILING=y -# UCLIBC_HAS_THREADS is not set -UCLIBC_HAS_LFS=y -# MALLOC is not set -MALLOC_930716=y -UCLIBC_DYNAMIC_ATEXIT=y -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -ASSUME_DEVPTS=y -UCLIBC_HAS_TM_EXTENSIONS=y -UCLIBC_HAS_TZ_CACHING=y -UCLIBC_HAS_TZ_FILE=y -UCLIBC_HAS_TZ_FILE_READ_MANY=y -UCLIBC_TZ_FILE_PATH="/etc/TZ" - -# -# Networking Support -# -# UCLIBC_HAS_IPV6 is not set -# UCLIBC_HAS_RPC is not set - -# -# String and Stdio Support -# -UCLIBC_HAS_CTYPE_SIGNED=y -UCLIBC_HAS_CTYPE_UNSAFE=y -# UCLIBC_HAS_CTYPE_CHECKED is not set -# UCLIBC_HAS_CTYPE_ENFORCED is not set -# UCLIBC_HAS_WCHAR is not set -# UCLIBC_HAS_HEXADECIMAL_FLOATS is not set -# UCLIBC_HAS_GLIBC_CUSTOM_PRINTF is not set -# USE_OLD_VFPRINTF is not set -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -# UCLIBC_HAS_SCANF_GLIBC_A_FLAG is not set -# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set -UCLIBC_HAS_STDIO_BUFSIZ_256=y -# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_4096 is not set -# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set -UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set -# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set -UCLIBC_HAS_STDIO_GETC_MACRO=y -UCLIBC_HAS_STDIO_PUTC_MACRO=y -UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y -# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set -# UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE is not set -# UCLIBC_HAS_GLIBC_CUSTOM_STREAMS is not set -# UCLIBC_HAS_PRINTF_M_SPEC is not set -UCLIBC_HAS_ERRNO_MESSAGES=y -# UCLIBC_HAS_SYS_ERRLIST is not set -UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set - -# -# Library Installation Options -# -DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc" -SYSTEM_DEVEL_PREFIX="$(DEVEL_PREFIX)" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)/usr" - -# -# uClibc development/debugging options -# -# DODEBUG is not set -# DOASSERTS is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/extra/Configs/Config.sparc b/extra/Configs/Config.sparc index b8c9f2505..42748691a 100644 --- a/extra/Configs/Config.sparc +++ b/extra/Configs/Config.sparc @@ -3,9 +3,8 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" - -menu "Target Architecture Features and Options" +config TARGET_ARCH + default "sparc" config HAVE_ELF bool @@ -20,10 +19,3 @@ config ARCH_LDFLAGS config LIBGCC_CFLAGS string -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.v850 b/extra/Configs/Config.v850 index 8a54a8fae..11f48d088 100644 --- a/extra/Configs/Config.v850 +++ b/extra/Configs/Config.v850 @@ -3,9 +3,16 @@ # see extra/config/Kconfig-language.txt # -mainmenu "uClibc C Library Configuration" +config TARGET_ARCH + default "v850" -menu "Target Architecture Features and Options" +config HAVE_ELF + bool + select ARCH_HAS_NO_FPU + select ARCH_HAS_NO_MMU + select ARCH_HAS_C_SYMBOL_PREFIX + select HAVE_NO_PIC + default y config ARCH_CFLAGS string @@ -16,34 +23,7 @@ config ARCH_LDFLAGS config LIBGCC_CFLAGS string -config HAVE_ELF - bool - default y - -config ARCH_HAS_NO_MMU - bool - default y - -config ARCH_HAS_NO_FPU - bool - default y - -config ARCH_HAS_C_SYMBOL_PREFIX - bool - default y - -config HAVE_NO_PIC - bool - default y - config CROSS string default "v850e-elf-" -source "extra/Configs/Config.in.arch" - -endmenu - -source "extra/Configs/Config.in" - - diff --git a/extra/Configs/Config.v850.default b/extra/Configs/Config.v850.default deleted file mode 100644 index 2683635a6..000000000 --- a/extra/Configs/Config.v850.default +++ /dev/null @@ -1,59 +0,0 @@ -# -# Automatically generated make config: don't edit -# - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -ARCH_HAS_NO_MMU=y -ARCH_HAS_NO_FPU=y -ARCH_HAS_C_SYMBOL_PREFIX=y -HAVE_NO_PIC=y -CROSS="v850e-elf-" -UCLIBC_HAS_FLOATS=y -UCLIBC_HAS_SOFT_FLOAT=y -# DO_C99_MATH is not set -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -UCLIBC_UCLINUX_BROKEN_MUNMAP=y -EXCLUDE_BRK=y -C_SYMBOL_PREFIX="_" - -# -# General Library Settings -# -# UCLIBC_HAS_THREADS is not set -UCLIBC_HAS_LFS=y -MALLOC=y -# MALLOC_930716 is not set -HAS_SHADOW=y -UCLIBC_HAS_REGEX=y -UNIX98PTY_ONLY=y -# ASSUME_DEVPTS is not set - -# -# Networking Support -# -UCLIBC_HAS_IPV6=y -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y - -# -# String and Stdio Support -# -# UCLIBC_HAS_WCHAR is not set -# USE_OLD_VFPRINTF is not set - -# -# Library Installation Options -# -DEVEL_PREFIX="/usr/local/v850-uclibc" -SYSTEM_DEVEL_PREFIX="/usr/local" -DEVEL_TOOL_PREFIX="$(DEVEL_PREFIX)" - -# -# uClibc hacking options -# -DODEBUG=y -# DOASSERTS is not set |