diff options
| -rw-r--r-- | target/device/AMD/DBAu1500/Makefile.in | 27 | ||||
| -rw-r--r-- | target/device/AMD/DBAu1500/uClibc.config.mipsel | 184 | ||||
| -rw-r--r-- | target/device/x86/i386/Makefile.in | 25 | ||||
| -rw-r--r-- | target/device/x86/i386/uClibc.config.i586 | 196 | ||||
| -rw-r--r-- | toolchain/uClibc/Config.in | 17 | ||||
| -rw-r--r-- | toolchain/uClibc/fix_includes-uClibc-0.9.28.patch | 34 | ||||
| -rw-r--r-- | toolchain/uClibc/uClibc-0.9.28.config (renamed from toolchain/uClibc/uClibc.config) | 39 | ||||
| -rw-r--r-- | toolchain/uClibc/uClibc-0.9.29.config (renamed from target/device/AMD/DBAu1500/uClibc.config.mips) | 55 | ||||
| -rw-r--r-- | toolchain/uClibc/uclibc.mk | 50 |
9 files changed, 180 insertions, 447 deletions
diff --git a/target/device/AMD/DBAu1500/Makefile.in b/target/device/AMD/DBAu1500/Makefile.in index d49034c3c..36cbbd596 100644 --- a/target/device/AMD/DBAu1500/Makefile.in +++ b/target/device/AMD/DBAu1500/Makefile.in @@ -1,9 +1,34 @@ ALCHEMY_DBAU1500_PATH=target/device/AMD/DBAu1500 BR2_PACKAGE_BUSYBOX_CONFIG=$(ALCHEMY_DBAU1500_PATH)/busybox.config -UCLIBC_CONFIG_FILE=$(ALCHEMY_DBAU1500_PATH)/uClibc.config.$(ARCH) +UCLIBC_CONFIG_FILE=$(TOOL_BUILD_DIR)/uClibc.config.$(ARCH) TARGET_SKELETON=$(ALCHEMY_DBAU1500_PATH)/target_skeleton TARGET_DEVICE_TABLE=$(ALCHEMY_DBAU1500_PATH)/device_table.txt TARGETS+=linux + +uclibc_config_file_prep:: + cp toolchain/uClibc/uClibc-$(UCLIBC_VER).config $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_MIPS_ISA_1 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_MIPS_ISA_2 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_MIPS_ISA_3 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_MIPS_ISA_4 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "CONFIG_MIPS_ISA_MIPS32=y" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_MIPS_ISA_MIPS64 is not set" >> $(UCLIBC_CONFIG_FILE) +ifeq ($(strip $(BR2_mips)),y) + /bin/echo "# ARCH_LITTLE_ENDIAN is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "ARCH_BIG_ENDIAN=y" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# ARCH_WANTS_LITTLE_ENDIAN is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "ARCH_WANTS_BIG_ENDIAN=y" >> $(UCLIBC_CONFIG_FILE) +endif +ifeq ($(strip $(BR2_mipsel)),y) + /bin/echo "ARCH_LITTLE_ENDIAN=y" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# ARCH_BIG_ENDIAN is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "ARCH_WANTS_LITTLE_ENDIAN=y" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# ARCH_WANTS_BIG_ENDIAN is not set" >> $(UCLIBC_CONFIG_FILE) +endif + /bin/echo "CONFIG_MIPS_O32_ABI=y" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_MIPS_N32_ABI is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_MIPS_N64_ABI is not set" >> $(UCLIBC_CONFIG_FILE) + diff --git a/target/device/AMD/DBAu1500/uClibc.config.mipsel b/target/device/AMD/DBAu1500/uClibc.config.mipsel deleted file mode 100644 index 312355290..000000000 --- a/target/device/AMD/DBAu1500/uClibc.config.mipsel +++ /dev/null @@ -1,184 +0,0 @@ -# -# Automatically generated make config: don't edit -# -# TARGET_alpha is not set -# TARGET_arm is not set -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -# TARGET_i386 is not set -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -TARGET_mips=y -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set - -# -# Target Architecture Features and Options -# -HAVE_ELF=y -TARGET_ARCH="none" -# ARCH_LITTLE_ENDIAN is not set -# ARCH_BIG_ENDIAN is not set -# ARCH_WANTS_LITTLE_ENDIAN is not set -# ARCH_WANTS_BIG_ENDIAN is not set -# ARCH_HAS_NO_MMU is not set -UCLIBC_HAS_FLOATS=y -UCLIBC_HAS_FPU=y -DO_C99_MATH=y -WARNINGS="-Wall" -KERNEL_SOURCE="/usr/src/linux" -HAVE_DOT_CONFIG=y -# CONFIG_ARM_EABI is not set -# CONFIG_GENERIC_ARM is not set -# CONFIG_ARM610 is not set -# CONFIG_ARM710 is not set -# CONFIG_ARM7TDMI is not set -# CONFIG_ARM720T is not set -# CONFIG_ARM920T is not set -# CONFIG_ARM922T is not set -# CONFIG_ARM926T is not set -# CONFIG_ARM1136JF_S is not set -# CONFIG_ARM_SA110 is not set -# CONFIG_ARM_SA1100 is not set -# CONFIG_ARM_XSCALE is not set - -# -# General Library Settings -# -# HAVE_NO_PIC is not set -DOPIC=y -# HAVE_NO_SHARED is not set -# ARCH_HAS_NO_LDSO is not set -HAVE_SHARED=y -# FORCE_SHAREABLE_TEXT_SEGMENTS is not set -LDSO_LDD_SUPPORT=y -LDSO_CACHE_SUPPORT=y -# LDSO_PRELOAD_FILE_SUPPORT is not set -LDSO_BASE_FILENAME="ld.so" -# UCLIBC_STATIC_LDCONFIG is not set -# LDSO_RUNPATH is not set -UCLIBC_CTOR_DTOR=y -# HAS_NO_THREADS is not set -# UCLIBC_HAS_THREADS is not set -# PTHREADS_DEBUG_SUPPORT is not set -# UCLIBC_HAS_THREADS_NATIVE is not set -# LINUXTHREADS_OLD is not set -UCLIBC_HAS_LFS=y -# MALLOC is not set -# MALLOC_SIMPLE is not set -MALLOC_STANDARD=y -MALLOC_GLIBC_COMPAT=y -UCLIBC_DYNAMIC_ATEXIT=y -# COMPAT_ATEXIT is not set -# UCLIBC_SUSV3_LEGACY is not set -HAS_SHADOW=y -# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set -UCLIBC_HAS___PROGNAME=y -# UNIX98PTY_ONLY is not set -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=y -UCLIBC_HAS_RPC=y -UCLIBC_HAS_FULL_RPC=y -UCLIBC_HAS_REENTRANT_RPC=y - -# -# String and Stdio Support -# -UCLIBC_HAS_STRING_GENERIC_OPT=y -UCLIBC_HAS_STRING_ARCH_OPT=y -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=y -# UCLIBC_HAS_LOCALE is not set -UCLIBC_HAS_HEXADECIMAL_FLOATS=y -UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y -UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9 -UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y -# 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=y -# 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_SHUTDOWN_ON_ABORT=n -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=y -UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y -UCLIBC_HAS_PRINTF_M_SPEC=y -UCLIBC_HAS_ERRNO_MESSAGES=y -# UCLIBC_HAS_SYS_ERRLIST is not set -UCLIBC_HAS_SIGNUM_MESSAGES=y -# UCLIBC_HAS_SYS_SIGLIST is not set -UCLIBC_HAS_GNU_GETOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -UCLIBC_HAS_REGEX_OLD=y -# UCLIBC_HAS_WORDEXP is not set -UCLIBC_HAS_FTW=y -UCLIBC_HAS_GLOB=y -UCLIBC_HAS_GNU_GLOB=y - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PREFIX="/lib" -RUNTIME_PREFIX="/" -DEVEL_PREFIX="/usr/" - -# -# uClibc security related options -# -# UCLIBC_SECURITY is not set -UCLIBC_BUILD_PIE=n -UCLIBC_HAS_SSP=n -UCLIBC_BUILD_RELRO=y -UCLIBC_BUILD_NOW=y -UCLIBC_BUILD_NOEXECSTACK=y - -# -# uClibc development/debugging options -# -CROSS_COMPILER_PREFIX="" -# DODEBUG is not set -# DODEBUG_PT is not set -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -WARNINGS="-Wall" -# DOMULTI is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/target/device/x86/i386/Makefile.in b/target/device/x86/i386/Makefile.in index 323391171..7a0855466 100644 --- a/target/device/x86/i386/Makefile.in +++ b/target/device/x86/i386/Makefile.in @@ -1,10 +1,33 @@ X86_I386_PATH=target/device/x86/i386 BR2_PACKAGE_BUSYBOX_CONFIG=$(X86_I386_PATH)/busybox.config -UCLIBC_CONFIG_FILE=$(X86_I386_PATH)/uClibc.config.$(ARCH) +UCLIBC_CONFIG_FILE=$(TOOL_BUILD_DIR)/uClibc.config.$(ARCH) #TARGET_SKELETON=$(X86_I386_PATH)/skel.tar.gz #TARGET_SKEL_DIR=$(X86_I386_PATH)/target_skeleton #TARGET_DEVICE_TABLE=$(X86_I386_PATH)/device_table.txt TARGETS+=linux + +uclibc_config_file_prep:: + cp toolchain/uClibc/uClibc-$(UCLIBC_VER).config $(UCLIBC_CONFIG_FILE) + /bin/echo "ARCH_LITTLE_ENDIAN=y" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# ARCH_BIG_ENDIAN is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_GENERIC_386 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_386 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_486 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "CONFIG_586=y" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_586MMX is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_686 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_PENTIUMII is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_PENTIUMIII is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_PENTIUM4 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_K6 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_K7 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_ELAN is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_CRUSOE is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_WINCHIPC6 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_WINCHIP2 is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_CYRIXIII is not set" >> $(UCLIBC_CONFIG_FILE) + /bin/echo "# CONFIG_NEHEMIAH is not set" >> $(UCLIBC_CONFIG_FILE) + diff --git a/target/device/x86/i386/uClibc.config.i586 b/target/device/x86/i386/uClibc.config.i586 deleted file mode 100644 index 7381d5de8..000000000 --- a/target/device/x86/i386/uClibc.config.i586 +++ /dev/null @@ -1,196 +0,0 @@ -# -# Automatically generated make config: don't edit -# Wed Nov 29 11:06:12 2006 -# -# TARGET_alpha is not set -# TARGET_arm is not set -# TARGET_bfin is not set -# TARGET_cris is not set -# TARGET_e1 is not set -# TARGET_frv is not set -# TARGET_h8300 is not set -# TARGET_hppa is not set -TARGET_i386=y -# TARGET_i960 is not set -# TARGET_ia64 is not set -# TARGET_m68k is not set -# TARGET_microblaze is not set -# TARGET_mips is not set -# TARGET_nios is not set -# TARGET_nios2 is not set -# TARGET_powerpc is not set -# TARGET_sh is not set -# TARGET_sh64 is not set -# TARGET_sparc is not set -# TARGET_v850 is not set -# TARGET_vax is not set -# TARGET_x86_64 is not set - -# -# Target Architecture Features and Options -# -TARGET_ARCH="i386" -FORCE_OPTIONS_FOR_ARCH=y -# CONFIG_GENERIC_386 is not set -# CONFIG_386 is not set -# CONFIG_486 is not set -CONFIG_586=y -# CONFIG_586MMX is not set -# CONFIG_686 is not set -# CONFIG_PENTIUMII is not set -# CONFIG_PENTIUMIII is not set -# CONFIG_PENTIUM4 is not set -# CONFIG_K6 is not set -# CONFIG_K7 is not set -# CONFIG_ELAN is not set -# CONFIG_CRUSOE is not set -# CONFIG_WINCHIPC6 is not set -# CONFIG_WINCHIP2 is not set -# CONFIG_CYRIXIII is not set -# CONFIG_NEHEMIAH is not set -ARCH_LITTLE_ENDIAN=y - -# -# Using Little Endian -# -ARCH_HAS_MMU=y -ARCH_USE_MMU=y -UCLIBC_HAS_FLOATS=y -UCLIBC_HAS_FPU=y -DO_C99_MATH=y -KERNEL_SOURCE="/scratch/obj.x86_64/buildroot.mine/toolchain_build_i586/linux" -HAVE_DOT_CONFIG=y - -# -# General Library Settings -# -# HAVE_NO_PIC is not set -DOPIC=y -# HAVE_NO_SHARED is not set -# ARCH_HAS_NO_LDSO is not set -HAVE_SHARED=y -# FORCE_SHAREABLE_TEXT_SEGMENTS is not set -LDSO_LDD_SUPPORT=y -LDSO_CACHE_SUPPORT=y -LDSO_PRELOAD_FILE_SUPPORT=y -LDSO_BASE_FILENAME="ld.so" -UCLIBC_STATIC_LDCONFIG=y -LDSO_RUNPATH=y -UCLIBC_CTOR_DTOR=y -# HAS_NO_THREADS is not set -UCLIBC_HAS_THREADS=y -PTHREADS_DEBUG_SUPPORT=y -LINUXTHREADS_OLD=y -# UCLIBC_HAS_LFS is not set -# MALLOC is not set -# MALLOC_SIMPLE is not set -MALLOC_STANDARD=y -# MALLOC_GLIBC_COMPAT is not set -UCLIBC_DYNAMIC_ATEXIT=y -# COMPAT_ATEXIT is not set -# UCLIBC_SUSV3_LEGACY is not set -UCLIBC_SUSV3_LEGACY_MACROS=y -UCLIBC_HAS_SHADOW=y -UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y -UCLIBC_HAS___PROGNAME=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 -# UCLIBC_USE_NETLINK is not set - -# -# String and Stdio Support -# -# UCLIBC_HAS_STRING_GENERIC_OPT is not set -# UCLIBC_HAS_STRING_ARCH_OPT is not set -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=y -# 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=y -# 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_SHUTDOWN_ON_ABORT 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_EXCLUSIVE_MODE=y -# 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 -UCLIBC_HAS_GNU_GETSUBOPT=y - -# -# Big and Tall -# -UCLIBC_HAS_REGEX=y -UCLIBC_HAS_REGEX_OLD=y -UCLIBC_HAS_FNMATCH=y -UCLIBC_HAS_FNMATCH_OLD=y -UCLIBC_HAS_WORDEXP=y -# UCLIBC_HAS_FTW is not set -UCLIBC_HAS_GLOB=y -# UCLIBC_HAS_GNU_GLOB is not set - -# -# Library Installation Options -# -SHARED_LIB_LOADER_PREFIX="/lib" -RUNTIME_PREFIX="/" -DEVEL_PREFIX="/usr/" - -# -# Security options -# -# UCLIBC_BUILD_PIE is not set -UCLIBC_HAS_ARC4RANDOM=y -# HAVE_NO_SSP is not set -# UCLIBC_HAS_SSP is not set -UCLIBC_BUILD_RELRO=y -UCLIBC_BUILD_NOW=y -UCLIBC_BUILD_NOEXECSTACK=y - -# -# uClibc development/debugging options -# -CROSS_COMPILER_PREFIX="/scratch/obj.x86_64/buildroot.mine/build_i586/staging_dir/bin/i586-linux-uclibc-" -# DODEBUG is not set -# DODEBUG_PT is not set -DOSTRIP=y -# DOASSERTS is not set -# SUPPORT_LD_DEBUG is not set -# SUPPORT_LD_DEBUG_EARLY is not set -# UCLIBC_MALLOC_DEBUGGING is not set -WARNINGS="-Wall" -EXTRA_WARNINGS=y -# DOMULTI is not set -# UCLIBC_MJN3_ONLY is not set diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index 71b222fb5..c54c83b13 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -3,11 +3,20 @@ comment "uClibc Options" -config BR2_UCLIBC_VERSION_SNAPSHOT - bool "Use a daily snapshot of uClibc?" - default y +choice + prompt "uClibc C library Version" + default BR2_UCLIBC_VERSION_SNAPSHOT help - Would you like to use a daily snapshot? + Select the version of gcc you wish to use. + + config BR2_UCLIBC_VERSION_0_9_28 + bool "uClibc 0.9.28" + + config BR2_UCLIBC_VERSION_SNAPSHOT + bool "daily snapshot" + +endchoice + config BR2_USE_UCLIBC_SNAPSHOT string "Date (yyyymmdd) of snapshot or 'snapshot' for latest" diff --git a/toolchain/uClibc/fix_includes-uClibc-0.9.28.patch b/toolchain/uClibc/fix_includes-uClibc-0.9.28.patch new file mode 100644 index 000000000..c90269f87 --- /dev/null +++ b/toolchain/uClibc/fix_includes-uClibc-0.9.28.patch @@ -0,0 +1,34 @@ +--- uClibc-0.9.28/extra/scripts/fix_includes.sh.orig 2006-12-11 20:55:46.000000000 -0700 ++++ uClibc-0.9.28/extra/scripts/fix_includes.sh 2006-12-11 20:56:12.000000000 -0700 +@@ -96,16 +96,16 @@ + if [ -z "$VERSION" -o -z "$PATCHLEVEL" -o -z "$SUBLEVEL" ] + then + echo "Unable to determine version for kernel headers" +- echo -e "\tprovided in directory $KERNEL_SOURCE" ++ echo " provided in directory $KERNEL_SOURCE" + exit 1 + fi + + if [ "$MAKE_IS_SILENT" != "y" ]; then + echo "Current kernel version is $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION}" +-echo -e "\n" ++echo "" + echo "Using kernel headers from $VERSION.$PATCHLEVEL.$SUBLEVEL${EXTRAVERSION} for architecture '$TARGET_ARCH'" +-echo -e "\tprovided in directory $KERNEL_SOURCE" +-echo -e "\n" ++echo " provided in directory $KERNEL_SOURCE" ++echo "" + fi + + # Create a symlink to include/asm +--- uClibc-0.9.28/Makefile.orig 2006-12-11 21:06:42.000000000 -0700 ++++ uClibc-0.9.28/Makefile 2006-12-11 21:06:53.000000000 -0700 +@@ -158,7 +158,7 @@ + $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)lib + $(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include + -$(INSTALL) -m 644 lib/*.[ao] $(PREFIX)$(DEVEL_PREFIX)lib/ +- if [ "$(KERNEL_SOURCE)" == "$(DEVEL_PREFIX)" ] ; then \ ++ if [ "$(KERNEL_SOURCE)" = "$(DEVEL_PREFIX)" ] ; then \ + extra_exclude="--exclude include/linux --exclude include/asm'*'" ; \ + else \ + extra_exclude="" ; \ diff --git a/toolchain/uClibc/uClibc.config b/toolchain/uClibc/uClibc-0.9.28.config index e29710135..bbd7e88b1 100644 --- a/toolchain/uClibc/uClibc.config +++ b/toolchain/uClibc/uClibc-0.9.28.config @@ -32,9 +32,10 @@ HAVE_ELF=y TARGET_ARCH="none" # ARCH_LITTLE_ENDIAN is not set # ARCH_BIG_ENDIAN is not set -# ARCH_WANTS_LITTLE_ENDIAN is not set -# ARCH_WANTS_BIG_ENDIAN is not set +# ARCH_SUPPORTS_LITTLE_ENDIAN is not set +# ARCH_SUPPORTS_BIG_ENDIAN is not set # ARCH_HAS_NO_MMU is not set +ARCH_HAS_MMU=y UCLIBC_HAS_FLOATS=y UCLIBC_HAS_FPU=y DO_C99_MATH=y @@ -54,6 +55,12 @@ HAVE_DOT_CONFIG=y # CONFIG_ARM_SA110 is not set # CONFIG_ARM_SA1100 is not set # CONFIG_ARM_XSCALE is not set +# CONFIG_MIPS_ISA_1 is not set +# CONFIG_MIPS_ISA_2 is not set +# CONFIG_MIPS_ISA_3 is not set +# CONFIG_MIPS_ISA_4 is not set +# CONFIG_MIPS_ISA_MIPS32 is not set +# CONFIG_MIPS_ISA_MIPS64 is not set # # General Library Settings @@ -61,32 +68,28 @@ HAVE_DOT_CONFIG=y # HAVE_NO_PIC is not set DOPIC=y # HAVE_NO_SHARED is not set -# ARCH_HAS_NO_LDSO is not set HAVE_SHARED=y +# ARCH_HAS_NO_LDSO is not set +BUILD_UCLIBC_LDSO=y # FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" -# UCLIBC_STATIC_LDCONFIG is not set # LDSO_RUNPATH is not set +# DL_FINI_CRT_COMPAT is not set UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set -# UCLIBC_HAS_THREADS is not set -# PTHREADS_DEBUG_SUPPORT is not set -# UCLIBC_HAS_THREADS_NATIVE is not set -# LINUXTHREADS_OLD is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y UCLIBC_HAS_LFS=y +# UCLIBC_STATIC_LDCONFIG is not set # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y -# COMPAT_ATEXIT is not set -# UCLIBC_SUSV3_LEGACY is not set HAS_SHADOW=y -# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set -UCLIBC_HAS___PROGNAME=y # UNIX98PTY_ONLY is not set ASSUME_DEVPTS=y UCLIBC_HAS_TM_EXTENSIONS=y @@ -101,7 +104,6 @@ UCLIBC_TZ_FILE_PATH="/etc/TZ" UCLIBC_HAS_IPV6=y UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y -UCLIBC_HAS_REENTRANT_RPC=y # # String and Stdio Support @@ -129,7 +131,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_4096=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_SHUTDOWN_ON_ABORT=n +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set UCLIBC_HAS_STDIO_GETC_MACRO=y UCLIBC_HAS_STDIO_PUTC_MACRO=y UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y @@ -147,11 +149,9 @@ UCLIBC_HAS_GNU_GETOPT=y # Big and Tall # UCLIBC_HAS_REGEX=y -UCLIBC_HAS_REGEX_OLD=y # UCLIBC_HAS_WORDEXP is not set UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y -UCLIBC_HAS_GNU_GLOB=y # # Library Installation Options @@ -164,11 +164,6 @@ DEVEL_PREFIX="/usr/" # uClibc security related options # # UCLIBC_SECURITY is not set -UCLIBC_BUILD_PIE=n -UCLIBC_HAS_SSP=n -UCLIBC_BUILD_RELRO=y -UCLIBC_BUILD_NOW=y -UCLIBC_BUILD_NOEXECSTACK=y # # uClibc development/debugging options @@ -180,5 +175,5 @@ CROSS_COMPILER_PREFIX="" # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set WARNINGS="-Wall" -# DOMULTI is not set # UCLIBC_MJN3_ONLY is not set + diff --git a/target/device/AMD/DBAu1500/uClibc.config.mips b/toolchain/uClibc/uClibc-0.9.29.config index 1e60c83a4..18f37fca8 100644 --- a/target/device/AMD/DBAu1500/uClibc.config.mips +++ b/toolchain/uClibc/uClibc-0.9.29.config @@ -1,6 +1,5 @@ # # Automatically generated make config: don't edit -# Mon Oct 2 08:55:19 2006 # # TARGET_alpha is not set # TARGET_arm is not set @@ -15,7 +14,7 @@ # TARGET_ia64 is not set # TARGET_m68k is not set # TARGET_microblaze is not set -TARGET_mips=y +# TARGET_mips is not set # TARGET_nios is not set # TARGET_nios2 is not set # TARGET_powerpc is not set @@ -29,27 +28,23 @@ TARGET_mips=y # # Target Architecture Features and Options # -TARGET_ARCH="mips" +TARGET_ARCH="none" FORCE_OPTIONS_FOR_ARCH=y -ARCH_CFLAGS="-mno-split-addresses" -# CONFIG_MIPS_ISA_1 is not set -# CONFIG_MIPS_ISA_2 is not set -# CONFIG_MIPS_ISA_3 is not set -# CONFIG_MIPS_ISA_4 is not set -CONFIG_MIPS_ISA_MIPS32=y -# CONFIG_MIPS_ISA_MIPS64 is not set -ARCH_ANY_ENDIAN=y -ARCH_BIG_ENDIAN=y -ARCH_WANTS_BIG_ENDIAN=y # ARCH_LITTLE_ENDIAN is not set +# ARCH_BIG_ENDIAN is not set # ARCH_WANTS_LITTLE_ENDIAN is not set +# ARCH_WANTS_BIG_ENDIAN is not set + +# +# Using Little Endian +# ARCH_HAS_MMU=y ARCH_USE_MMU=y UCLIBC_HAS_FLOATS=y -# UCLIBC_HAS_FPU is not set -UCLIBC_HAS_SOFT_FLOAT=y +UCLIBC_HAS_FPU=y DO_C99_MATH=y KERNEL_SOURCE="/usr/src/linux" +KERNEL_HEADERS="/usr/src/linux/include" HAVE_DOT_CONFIG=y # @@ -69,10 +64,9 @@ LDSO_BASE_FILENAME="ld.so" # LDSO_RUNPATH is not set UCLIBC_CTOR_DTOR=y # HAS_NO_THREADS is not set -# UCLIBC_HAS_THREADS is not set -# PTHREADS_DEBUG_SUPPORT is not set -# UCLIBC_HAS_THREADS_NATIVE is not set -# LINUXTHREADS_OLD is not set +UCLIBC_HAS_THREADS=y +PTHREADS_DEBUG_SUPPORT=y +LINUXTHREADS_OLD=y UCLIBC_HAS_LFS=y # MALLOC is not set # MALLOC_SIMPLE is not set @@ -81,7 +75,8 @@ MALLOC_GLIBC_COMPAT=y UCLIBC_DYNAMIC_ATEXIT=y # COMPAT_ATEXIT is not set # UCLIBC_SUSV3_LEGACY is not set -HAS_SHADOW=y +UCLIBC_SUSV3_LEGACY_MACROS=y +UCLIBC_HAS_SHADOW=y # UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set UCLIBC_HAS___PROGNAME=y # UNIX98PTY_ONLY is not set @@ -99,6 +94,7 @@ UCLIBC_HAS_IPV6=y UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y UCLIBC_HAS_REENTRANT_RPC=y +# UCLIBC_USE_NETLINK is not set # # String and Stdio Support @@ -126,7 +122,7 @@ UCLIBC_HAS_STDIO_BUFSIZ_4096=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_SHUTDOWN_ON_ABORT=n +# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set UCLIBC_HAS_STDIO_GETC_MACRO=y UCLIBC_HAS_STDIO_PUTC_MACRO=y UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y @@ -139,12 +135,15 @@ UCLIBC_HAS_ERRNO_MESSAGES=y UCLIBC_HAS_SIGNUM_MESSAGES=y # UCLIBC_HAS_SYS_SIGLIST is not set UCLIBC_HAS_GNU_GETOPT=y +UCLIBC_HAS_GNU_GETSUBOPT=y # # Big and Tall # UCLIBC_HAS_REGEX=y UCLIBC_HAS_REGEX_OLD=y +UCLIBC_HAS_FNMATCH=y +UCLIBC_HAS_FNMATCH_OLD=y # UCLIBC_HAS_WORDEXP is not set UCLIBC_HAS_FTW=y UCLIBC_HAS_GLOB=y @@ -158,14 +157,15 @@ RUNTIME_PREFIX="/" DEVEL_PREFIX="/usr/" # -# uClibc security related options +# Security options # -# UCLIBC_SECURITY is not set -UCLIBC_BUILD_PIE=n -UCLIBC_HAS_SSP=n +# UCLIBC_BUILD_PIE is not set +# UCLIBC_HAS_ARC4RANDOM is not set +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set UCLIBC_BUILD_RELRO=y UCLIBC_BUILD_NOW=y -UCLIBC_BUILD_NOEXECSTACK=y +# UCLIBC_BUILD_NOEXECSTACK is not set # # uClibc development/debugging options @@ -173,9 +173,12 @@ UCLIBC_BUILD_NOEXECSTACK=y CROSS_COMPILER_PREFIX="" # DODEBUG is not set # DODEBUG_PT is not set +DOSTRIP=y # DOASSERTS is not set # SUPPORT_LD_DEBUG is not set # SUPPORT_LD_DEBUG_EARLY is not set +# UCLIBC_MALLOC_DEBUGGING is not set WARNINGS="-Wall" +# EXTRA_WARNINGS is not set # DOMULTI is not set # UCLIBC_MJN3_ONLY is not set diff --git a/toolchain/uClibc/uclibc.mk b/toolchain/uClibc/uclibc.mk index b0f17e274..9f192dc6d 100644 --- a/toolchain/uClibc/uclibc.mk +++ b/toolchain/uClibc/uclibc.mk @@ -4,21 +4,24 @@ # ############################################################# -ifndef UCLIBC_CONFIG_FILE -UCLIBC_CONFIG_FILE=toolchain/uClibc/uClibc.config -endif ifeq ($(BR2_UCLIBC_VERSION_SNAPSHOT),y) # Be aware that this changes daily.... +UCLIBC_VER:=0.9.29 UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc -UCLIBC_SOURCE:=uClibc-$(strip $(subst ",, $(BR2_USE_UCLIBC_SNAPSHOT))).tar.bz2 -#")) +UCLIBC_SOURCE:=uClibc-snapshot.tar.bz2 UCLIBC_SITE:=http://www.uclibc.org/downloads/snapshots +ifndef UCLIBC_CONFIG_FILE +UCLIBC_CONFIG_FILE=toolchain/uClibc/uClibc-0.9.29.config +endif else UCLIBC_VER:=0.9.28 UCLIBC_DIR:=$(TOOL_BUILD_DIR)/uClibc-$(UCLIBC_VER) UCLIBC_SOURCE:=uClibc-$(UCLIBC_VER).tar.bz2 UCLIBC_SITE:=http://www.uclibc.org/downloads +ifndef UCLIBC_CONFIG_FILE +UCLIBC_CONFIG_FILE=toolchain/uClibc/uClibc-0.9.28.config +endif endif UCLIBC_CAT:=$(BZCAT) @@ -61,16 +64,20 @@ uclibc-unpacked: $(UCLIBC_DIR)/.unpacked $(UCLIBC_DIR)/.unpacked: $(DL_DIR)/$(UCLIBC_SOURCE) mkdir -p $(TOOL_BUILD_DIR) $(UCLIBC_CAT) $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) - - toolchain/patch-kernel.sh $(UCLIBC_DIR) toolchain/uClibc/ \*.patch + toolchain/patch-kernel.sh $(UCLIBC_DIR) toolchain/uClibc/ \*$(UCLIBC_VER)\*.patch touch $(UCLIBC_DIR)/.unpacked -uclibc-configured: dependencies kernel-headers $(UCLIBC_DIR)/.configured -$(UCLIBC_DIR)/.prepared: $(UCLIBC_DIR)/.unpacked +# nothing to do -- some targets may wish to provide their own +# and then use sed to hack up the default uClibc config... +uclibc_config_file_prep:: + +$(UCLIBC_DIR)/.prepared: $(UCLIBC_DIR)/.unpacked uclibc_config_file_prep cp $(UCLIBC_CONFIG_FILE) $(UCLIBC_DIR)/.config $(SED) 's,^CROSS_COMPILER_PREFIX=.*,CROSS_COMPILER_PREFIX="$(TARGET_CROSS)",g' \ -e 's,# TARGET_$(UCLIBC_TARGET_ARCH) is not set,TARGET_$(UCLIBC_TARGET_ARCH)=y,g' \ -e 's,^TARGET_ARCH="none",TARGET_ARCH=\"$(UCLIBC_TARGET_ARCH)\",g' \ -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_HEADERS_DIR)\",g' \ + -e 's,^KERNEL_HEADERS=.*,KERNEL_HEADERS=\"$(LINUX_HEADERS_DIR)/include\",g' \ -e 's,^RUNTIME_PREFIX=.*,RUNTIME_PREFIX=\"/\",g' \ -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"/usr/\",g' \ -e 's,^SHARED_LIB_LOADER_PREFIX=.*,SHARED_LIB_LOADER_PREFIX=\"/lib\",g' \ @@ -123,15 +130,26 @@ endif mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/include mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/usr/lib mkdir -p $(TOOL_BUILD_DIR)/uClibc_dev/lib + $(MAKE1) -C $(UCLIBC_DIR) \ + PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ + DEVEL_PREFIX=/usr/ \ + RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ + HOSTCC="$(HOSTCC)" \ + oldconfig touch $(UCLIBC_DIR)/.prepared -$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.prepared - $(MAKE1) -C $(UCLIBC_DIR) \ +$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.prepared kernel-headers + set -x && $(MAKE1) -C $(UCLIBC_DIR) \ PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ DEVEL_PREFIX=/usr/ \ RUNTIME_PREFIX=$(TOOL_BUILD_DIR)/uClibc_dev/ \ HOSTCC="$(HOSTCC)" \ - pregen install_dev && \ + pregen install_dev + # Install the kernel headers to the first stage gcc include dir if necessary + if [ ! -f $(STAGING_DIR)/include/linux/version.h ] ; then \ + cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(TOOL_BUILD_DIR)/uClibc_dev/usr/include/ ; \ + fi; touch $(UCLIBC_DIR)/.configured $(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured $(LIBFLOAT_TARGET) @@ -153,12 +171,17 @@ uclibc-menuconfig: $(UCLIBC_DIR)/.prepared touch $(UCLIBC_DIR)/.configured -$(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a +$(STAGING_DIR)/lib/libc.a: kernel-headers $(UCLIBC_DIR)/lib/libc.a $(MAKE1) -C $(UCLIBC_DIR) \ PREFIX= \ DEVEL_PREFIX=$(STAGING_DIR)/ \ RUNTIME_PREFIX=$(STAGING_DIR)/ \ install_runtime install_dev + # Install the kernel headers to the staging dir if necessary + if [ ! -f $(STAGING_DIR)/include/linux/version.h ] ; then \ + cp -pLR $(LINUX_HEADERS_DIR)/include/asm $(STAGING_DIR)/include/ ; \ + cp -pLR $(LINUX_HEADERS_DIR)/include/linux $(STAGING_DIR)/include/ ; \ + fi; # Build the host utils. Need to add an install target... $(MAKE1) -C $(UCLIBC_DIR)/utils \ PREFIX=$(STAGING_DIR) \ @@ -188,7 +211,8 @@ endif UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0 endif -uclibc-configured: $(UCLIBC_DIR)/.configured +uclibc-configured: dependencies $(UCLIBC_DIR)/.configured + uclibc: $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc $(STAGING_DIR)/lib/libc.a \ $(UCLIBC_TARGETS) |