diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | config/debug.in | 7 | ||||
| -rw-r--r-- | kconfig/Makefile | 19 | ||||
| -rw-r--r-- | patches/uClibc/0.9.29/500-headers-no-cross-gcc.patch | 13 | ||||
| -rw-r--r-- | samples/armeb-unknown-linux-uclibc/crosstool.config | 32 | ||||
| -rw-r--r-- | samples/armeb-unknown-linux-uclibc/uClibc-0.9.29.config (renamed from samples/armeb-unknown-linux-uclibc/uClibc-0.9.28.3.config) | 77 | ||||
| -rw-r--r-- | scripts/build/debug/gdb.sh | 4 | ||||
| -rw-r--r-- | scripts/functions | 2 |
8 files changed, 115 insertions, 41 deletions
@@ -33,7 +33,7 @@ include $(CT_TOP_DIR)/tools/Makefile help:: @echo 'Execute "make" or "make all" to build all targets marked with [*]' -.config: $(shell find $(CT_TOP_DIR)/config -type f -name '*.in') +.config: $(CONFIG_FILES) $(CT_TOP_DIR)/config/debug.in @make oldconfig # Actual build diff --git a/config/debug.in b/config/debug.in deleted file mode 100644 index 6b82a8b..0000000 --- a/config/debug.in +++ /dev/null @@ -1,7 +0,0 @@ -# Debug facilities menu - -menu "Debug facilities" - -source config/debug/gdb.in - -endmenu diff --git a/kconfig/Makefile b/kconfig/Makefile index 7b87a50..71737f7 100644 --- a/kconfig/Makefile +++ b/kconfig/Makefile @@ -16,16 +16,28 @@ ifneq ($(KBUILD_NO_NLS),) CFLAGS += -DKBUILD_NO_NLS endif +# Build a list of all config files +CONFIG_FILES = $(filter-out %debug.in,$(shell find $(CT_TOP_DIR)/config -type f -name '*.in')) + # Derive the project version from, well, the project version: export PROJECTVERSION=$(CT_VERSION) -menuconfig: $(obj)/mconf +$(CT_TOP_DIR)/config/debug.in: $(CONFIG_FILES) + @echo "# Debug facilities menu" >$@ + @echo "# Generated file, do not edit!!!" >>$@ + @echo "menu \"Debug facilities\"" >>$@ + @for f in $(patsubst $(CT_TOP_DIR)/%,%,$(wildcard $(CT_TOP_DIR)/config/debug/*.in)); do \ + echo "source $${f}"; \ + done >>$@ + @echo "endmenu" >>$@ + +menuconfig: $(obj)/mconf $(CT_TOP_DIR)/config/debug.in @$< $(KCONFIG_TOP) -config: $(obj)/conf +config: $(obj)/conf $(CT_TOP_DIR)/config/debug.in @$< $(KCONFIG_TOP) -oldconfig: $(obj)/conf +oldconfig: $(obj)/conf $(CT_TOP_DIR)/config/debug.in @$< -s $(KCONFIG_TOP) # Help text used by make help @@ -54,3 +66,4 @@ kconfig/conf: $(SHIPPED) kconfig/conf.c clean:: @rm -f $(wildcard kconfig/*zconf*.c) kconfig/{conf,mconf} + @rm -f "$(CT_TOP_DIR)/config/debug.in" diff --git a/patches/uClibc/0.9.29/500-headers-no-cross-gcc.patch b/patches/uClibc/0.9.29/500-headers-no-cross-gcc.patch new file mode 100644 index 0000000..bfad3df --- /dev/null +++ b/patches/uClibc/0.9.29/500-headers-no-cross-gcc.patch @@ -0,0 +1,13 @@ +Index: uClibc/Makefile.in +=================================================================== +--- uClibc/Makefile.in (revision 18643) ++++ uClibc/Makefile.in (working copy) +@@ -96,7 +96,7 @@ + cd $(top_builddir); \ + tmp=`mktemp include/bits/sysnum.h.XXXXXX 2>/dev/null`; \ + [ -z "$$tmp" ] && tmp='include/bits/sysnum.h.new'; \ +- KERNEL_HEADERS="${KERNEL_HEADERS}" top_builddir=. CC="$(CC) $(CPU_CFLAGS)" $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \ ++ KERNEL_HEADERS="${KERNEL_HEADERS}" top_builddir=. CC=$(HOSTCC) $(SHELL) extra/scripts/gen_bits_syscall_h.sh > $$tmp; \ + if cmp include/bits/sysnum.h $$tmp >/dev/null 2>&1; then \ + $(RM) $$tmp; \ + else \ diff --git a/samples/armeb-unknown-linux-uclibc/crosstool.config b/samples/armeb-unknown-linux-uclibc/crosstool.config index c052226..0b448d3 100644 --- a/samples/armeb-unknown-linux-uclibc/crosstool.config +++ b/samples/armeb-unknown-linux-uclibc/crosstool.config @@ -1,13 +1,13 @@ # # Automatically generated make config: don't edit -# crosstool-NG version: 0.0.2-svn -# Thu May 10 23:29:27 2007 +# crosstool-NG version: 0.0.3-svn +# Thu May 17 20:02:42 2007 # # # Paths and misc options # -# CT_EXPERIMENTAL is not set +CT_EXPERIMENTAL=y # CT_OBSOLETE is not set CT_PARALLEL_JOBS=1 CT_LOAD=0 @@ -47,7 +47,6 @@ CT_LOG_EXTRA=y CT_LOG_LEVEL_MAX="EXTRA" # CT_LOG_SEE_TOOLS_WARN is not set # CT_LOG_PROGRESS_BAR is not set -# CT_LOG_USE_COLORS is not set CT_LOG_TO_FILE=y CT_LOG_FILE="${CT_PREFIX_DIR}/${CT_TARGET}.log" @@ -101,6 +100,7 @@ CT_TARGET_ALIAS="" CT_CROSS=y # CT_CROSS_NATIVE is not set # CT_CANADIAN is not set +CT_TOOLCHAIN_TYPE="cross" CT_BUILD="" CT_CC_NATIVE="gcc" @@ -108,7 +108,6 @@ CT_CC_NATIVE="gcc" # Kernel # CT_KERNEL_LINUX=y -# CT_KERNEL_CYGWIN is not set CT_KERNEL_VERSION="2.6.21.1" CT_KERNEL_LINUX_HEADERS_INSTALL=y # CT_KERNEL_LINUX_HEADERS_SANITISED is not set @@ -181,9 +180,6 @@ CT_BINUTILS_EXTRA_CONFIG="" # Core C Compiler (used to build the C library) # # CT_CC_USE_CORE is not set -CT_CC_CORE_GCC=y -# CT_CC_CORE_TCC is not set -CT_CC_CORE="gcc" # # Final C compiler @@ -240,8 +236,13 @@ CT_CC_LANG_OTHERS="" # # CT_LIBC_GLIBC is not set CT_LIBC_UCLIBC=y -CT_LIBC_VERSION="0.9.28.3" +CT_LIBC_VERSION="0.9.29" CT_LIBC="uClibc" +# CT_LIBC_SUPPORT_NPTL is not set +CT_LIBC_SUPPORT_LINUXTHREADS=y +# CT_LIBC_THREADS_NPTL is not set +CT_LIBC_THREADS_LINUXTHREADS=y +# CT_LIBC_THREADS_NONE is not set # CT_LIBC_V_snapshot is not set # CT_LIBC_V_specific_date is not set # CT_LIBC_V_0_9_26 is not set @@ -249,11 +250,20 @@ CT_LIBC="uClibc" # CT_LIBC_V_0_9_28 is not set # CT_LIBC_V_0_9_28_1 is not set # CT_LIBC_V_0_9_28_2 is not set -CT_LIBC_V_0_9_28_3=y -# CT_LIBC_V_0_9_29 is not set +# CT_LIBC_V_0_9_28_3 is not set +CT_LIBC_V_0_9_29=y CT_LIBC_UCLIBC_DEBUG_LEVEL_0=y # CT_LIBC_UCLIBC_DEBUG_LEVEL_1 is not set # CT_LIBC_UCLIBC_DEBUG_LEVEL_2 is not set CT_LIBC_UCLIBC_DEBUG_LEVEL=0 CT_LIBC_UCLIBC_CONFIG_FILE="${CT_TOP_DIR}/samples/${CT_TARGET}/${CT_LIBC}-${CT_LIBC_VERSION}.config" # CT_LIBC_UCLIBC_LOCALES is not set + +# +# Debug facilities +# +CT_DMALLOC=y +# CT_DMALLOC_V_5_4_3 is not set +CT_DMALLOC_V_5_5_2=y +CT_DMALLOC_VERSION="5.5.2" +# CT_GDB is not set diff --git a/samples/armeb-unknown-linux-uclibc/uClibc-0.9.28.3.config b/samples/armeb-unknown-linux-uclibc/uClibc-0.9.29.config index 92c4faf..2157901 100644 --- a/samples/armeb-unknown-linux-uclibc/uClibc-0.9.28.3.config +++ b/samples/armeb-unknown-linux-uclibc/uClibc-0.9.29.config @@ -1,5 +1,6 @@ # # Automatically generated make config: don't edit +# Thu May 17 20:12:32 2007 # # TARGET_alpha is not set TARGET_arm=y @@ -8,8 +9,10 @@ TARGET_arm=y # 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 is not set @@ -20,36 +23,49 @@ TARGET_arm=y # 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 -ARCH_SUPPORTS_LITTLE_ENDIAN=y TARGET_ARCH="arm" -ARCH_SUPPORTS_BIG_ENDIAN=y +FORCE_OPTIONS_FOR_ARCH=y +CONFIG_ARM_OABI=y +# CONFIG_ARM_EABI is not set +USE_BX=y # 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_ARM10T is not set # CONFIG_ARM1136JF_S is not set +# CONFIG_ARM1176JZ_S is not set +# CONFIG_ARM1176JZF_S is not set # CONFIG_ARM_SA110 is not set # CONFIG_ARM_SA1100 is not set CONFIG_ARM_XSCALE=y -# ARCH_LITTLE_ENDIAN is not set +# CONFIG_ARM_IWMMXT is not set +TARGET_SUBARCH="" + +# +# Using ELF file format +# +ARCH_ANY_ENDIAN=y ARCH_BIG_ENDIAN=y -# ARCH_HAS_NO_MMU is not set +ARCH_WANTS_BIG_ENDIAN=y +# ARCH_WANTS_LITTLE_ENDIAN is not set ARCH_HAS_MMU=y +ARCH_USE_MMU=y UCLIBC_HAS_FLOATS=y -# HAS_FPU is not set +# UCLIBC_HAS_FPU is not set UCLIBC_HAS_SOFT_FLOAT=y DO_C99_MATH=y -KERNEL_SOURCE="/usr/src/linux" -C_SYMBOL_PREFIX="" +KERNEL_HEADERS="/usr/include" HAVE_DOT_CONFIG=y # @@ -58,28 +74,32 @@ HAVE_DOT_CONFIG=y # HAVE_NO_PIC is not set DOPIC=y # HAVE_NO_SHARED is not set -HAVE_SHARED=y # ARCH_HAS_NO_LDSO is not set -BUILD_UCLIBC_LDSO=y -# FORCE_SHAREABLE_TEXT_SEGMENTS is not set +HAVE_SHARED=y +FORCE_SHAREABLE_TEXT_SEGMENTS=y LDSO_LDD_SUPPORT=y LDSO_CACHE_SUPPORT=y # LDSO_PRELOAD_FILE_SUPPORT is not set LDSO_BASE_FILENAME="ld.so" +UCLIBC_STATIC_LDCONFIG=y # 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=y # PTHREADS_DEBUG_SUPPORT is not set +LINUXTHREADS_OLD=y UCLIBC_HAS_LFS=y -UCLIBC_STATIC_LDCONFIG=y # MALLOC is not set # MALLOC_SIMPLE is not set MALLOC_STANDARD=y # MALLOC_GLIBC_COMPAT is not set UCLIBC_DYNAMIC_ATEXIT=y -HAS_SHADOW=y +# COMPAT_ATEXIT is not set +# UCLIBC_SUSV3_LEGACY is not set +# UCLIBC_SUSV3_LEGACY_MACROS is not set +UCLIBC_HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +# UCLIBC_HAS___PROGNAME is not set UNIX98PTY_ONLY=y ASSUME_DEVPTS=y UCLIBC_HAS_TM_EXTENSIONS=y @@ -89,11 +109,20 @@ UCLIBC_HAS_TZ_FILE=y UCLIBC_TZ_FILE_PATH="/etc/TZ" # +# Advanced Library Settings +# +UCLIBC_PWD_BUFFER_SIZE=256 +UCLIBC_GRP_BUFFER_SIZE=256 + +# # Networking Support # # UCLIBC_HAS_IPV6 is not set UCLIBC_HAS_RPC=y UCLIBC_HAS_FULL_RPC=y +UCLIBC_HAS_REENTRANT_RPC=y +UCLIBC_USE_NETLINK=y +# UCLIBC_HAS_BSD_RES_CLOSE is not set # # String and Stdio Support @@ -135,14 +164,19 @@ 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 is not set # # 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=y UCLIBC_HAS_GLOB=y +# UCLIBC_HAS_GNU_GLOB is not set # # Library Installation Options @@ -152,18 +186,29 @@ RUNTIME_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/" DEVEL_PREFIX="/usr/$(TARGET_ARCH)-linux-uclibc/usr/" # -# uClibc security related options +# Security options # -# UCLIBC_SECURITY is not set +UCLIBC_BUILD_PIE=y +UCLIBC_HAS_ARC4RANDOM=y +# HAVE_NO_SSP is not set +# UCLIBC_HAS_SSP is not set +# UCLIBC_BUILD_RELRO is not set +# UCLIBC_BUILD_NOW is not set +UCLIBC_BUILD_NOEXECSTACK=y # # uClibc development/debugging options # CROSS_COMPILER_PREFIX="" +UCLIBC_EXTRA_CFLAGS="" # DODEBUG is not set # DODEBUG_PT is not set +# DOSTRIP is not set # 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/scripts/build/debug/gdb.sh b/scripts/build/debug/gdb.sh index 457e899..0b64f51 100644 --- a/scripts/build/debug/gdb.sh +++ b/scripts/build/debug/gdb.sh @@ -31,7 +31,7 @@ do_debug_gdb_build() { esac if [ "${CT_GDB_CROSS}" = "y" ]; then - CT_DoStep EXTRA "Installing cross-gdb" + CT_DoStep INFO "Installing cross-gdb" CT_DoLog EXTRA "Configuring cross-gdb" mkdir -p "${CT_BUILD_DIR}/build-gdb-cross" @@ -54,7 +54,7 @@ do_debug_gdb_build() { CT_EndStep - CT_DoStep EXTRA "Installing gdbserver" + CT_DoStep INFO "Installing gdbserver" CT_DoLog EXTRA "Configuring gdbserver" mkdir -p "${CT_BUILD_DIR}/build-gdb-gdbserver" diff --git a/scripts/functions b/scripts/functions index 66d9ad8..e902f2b 100644 --- a/scripts/functions +++ b/scripts/functions @@ -97,7 +97,7 @@ CT_DoEnd() elapsed_min=$((elapsed/(60*1000*1000*1000))) elapsed_sec=`printf "%02d" $(((elapsed%(60*1000*1000*1000))/(1000*1000*1000)))` elapsed_csec=`printf "%02d" $(((elapsed%(1000*1000*1000))/(10*1000*1000)))` - CT_DoLog INFO "(elapsed: ${elapsed_min}:${elapsed_sec}.${elapsed_csec})" + CT_DoLog ${1:-INFO} "(elapsed: ${elapsed_min}:${elapsed_sec}.${elapsed_csec})" } # Abort the execution with an error message |