From 799672a6414c7056d24213041bb3f0a12e9a9a66 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN\"" Date: Sun, 14 Sep 2008 16:21:07 +0000 Subject: Introduce a new EXPERIMENTAL feature: BARE_METAL. This should ultimately llow to build bare-metal compilers, for targets that have no kernel and no C library. Move the C library build script to their own sub-directory; introduce an empty build script for bare-metal. Move the compiler build script to its own sub-directory. Move the kernel build script to its own sub-directory; introduce an empty build script for bare-metal. Update the ARM target tuples to enable bare-metal targets. Add two ARM bare-metal samples. Add latest Linux kernel versions. /trunk/scripts/build/kernel/none.sh | 77 6 71 0 +---- /trunk/scripts/build/cc/gcc.sh | 58 41 17 0 ++- /trunk/scripts/build/libc/none.sh | 513 9 504 0 +----------------------------- /trunk/scripts/crosstool.sh | 17 9 8 0 + /trunk/scripts/functions | 6 4 2 0 + /trunk/scripts/showSamples.sh | 6 3 3 0 /trunk/samples/arm-unknown-elf/crosstool.config | 225 225 0 0 +++++++++++++ /trunk/samples/arm-unknown-eabi/crosstool.config | 223 223 0 0 +++++++++++++ /trunk/config/kernel/linux_headers_install.in | 64 27 37 0 ++-- /trunk/config/kernel.in | 9 8 1 0 + /trunk/config/toolchain.in | 1 1 0 0 + /trunk/config/cc/gcc.in | 3 3 0 0 + /trunk/config/debug/dmalloc.in | 1 1 0 0 + /trunk/config/debug/gdb.in | 4 3 1 0 + /trunk/config/debug/strace.in | 1 1 0 0 + /trunk/config/debug/duma.in | 1 1 0 0 + /trunk/config/cc.in | 8 8 0 0 + /trunk/config/target.in | 13 13 0 0 + /trunk/config/binutils.in | 1 1 0 0 + /trunk/config/gmp_mpfr.in | 1 1 0 0 + /trunk/config/libc.in | 17 11 6 0 + /trunk/arch/arm/functions | 3 1 2 0 - 22 files changed, 600 insertions(+), 652 deletions(-) diff --git a/arch/arm/functions b/arch/arm/functions index 9959277..a1b8542 100644 --- a/arch/arm/functions +++ b/arch/arm/functions @@ -6,10 +6,9 @@ CT_DoArchValues() { # The system part of the tuple: case "${CT_LIBC},${CT_ARCH_ARM_EABI}" in - *glibc,) CT_TARGET_SYS=gnu;; *glibc,y) CT_TARGET_SYS=gnueabi;; - uClibc,) CT_TARGET_SYS=uclibc;; uClibc,y) CT_TARGET_SYS=uclibcgnueabi;; + none,y) CT_TARGET_SYS=eabi;; esac # In case we're EABI, do *not* specify any ABI! diff --git a/config/binutils.in b/config/binutils.in index a83b50c..a3eb211 100644 --- a/config/binutils.in +++ b/config/binutils.in @@ -79,6 +79,7 @@ config BINUTILS_EXTRA_CONFIG config BINUTILS_FOR_TARGET bool prompt "binutils libraries for the target" + depends on ! BARE_METAL default n help Some utilities may need binutils libraries to be available on diff --git a/config/cc.in b/config/cc.in index 1ad692e..a88832e 100644 --- a/config/cc.in +++ b/config/cc.in @@ -53,6 +53,8 @@ config CC_SUPPORT_OBJC config CC_SUPPORT_OBJCXX bool +if ! BARE_METAL + comment "Additional supported languages:" config CC_LANG_CXX @@ -136,4 +138,10 @@ config CC_LANG_OTHERS Eg. gcc-4.1+ has a toy programming language, treelang. As it is not usefull in real life, it is not available in the selection above. +endif # ! BARE_METAL + +if BARE_METAL +comment "Only C language supported on bare metal" +endif # BARE_METAL + endmenu diff --git a/config/cc/gcc.in b/config/cc/gcc.in index 02d1879..64d27cb 100644 --- a/config/cc/gcc.in +++ b/config/cc/gcc.in @@ -130,6 +130,7 @@ config CC_CXA_ATEXIT bool prompt "Use __cxa_atexit" default y + depends on ! BARE_METAL help If you get the missing symbol "__cxa_atexit" when building C++ programs, you might want to try disabling this option. @@ -138,6 +139,7 @@ choice bool prompt "Use sjlj for exceptions" default CC_SJLJ_EXCEPTIONS_CONFIGURE + depends on ! BARE_METAL # This config option is used nowhere in the code on purpose. # It only serves as a choice entry to force neither using nor not using sjlj @@ -185,6 +187,7 @@ config CC_EXTRA_CONFIG string prompt "gcc extra config" default "" + depends on ! BARE_METAL help Extra flags to pass onto ./configure when configuring gcc. diff --git a/config/debug/dmalloc.in b/config/debug/dmalloc.in index 8a53c71..692c229 100644 --- a/config/debug/dmalloc.in +++ b/config/debug/dmalloc.in @@ -4,6 +4,7 @@ menuconfig DMALLOC bool prompt "dmalloc" default n + depends on ! BARE_METAL if DMALLOC diff --git a/config/debug/duma.in b/config/debug/duma.in index 16f3d2a..5de4e7c 100644 --- a/config/debug/duma.in +++ b/config/debug/duma.in @@ -4,6 +4,7 @@ menuconfig DUMA bool prompt "D.U.M.A." default n + depends on ! BARE_METAL help D.U.M.A. - Detect Unintended Memory Access A memory bound checker, with additional features. diff --git a/config/debug/gdb.in b/config/debug/gdb.in index 43239ac..b65a71b 100644 --- a/config/debug/gdb.in +++ b/config/debug/gdb.in @@ -13,7 +13,7 @@ config GDB_CROSS bool prompt "Cross-gdb" default y - select GDB_GDBSERVER + select GDB_GDBSERVER if ! BARE_METAL help Build and install a cross-gdb for the target, to run on host. @@ -45,6 +45,7 @@ config GDB_NATIVE bool prompt "Native gdb" default n + depends on ! BARE_METAL help Build and install a native gdb for the target, to run on the target. @@ -78,6 +79,7 @@ config GDB_GDBSERVER bool prompt "gdbserver" default n + depends on ! BARE_METAL help Build and install a gdbserver for the target, to run on the target. diff --git a/config/debug/strace.in b/config/debug/strace.in index 234556a..055bb22 100644 --- a/config/debug/strace.in +++ b/config/debug/strace.in @@ -4,6 +4,7 @@ menuconfig STRACE bool prompt "strace" default n + depends on ! BARE_METAL if STRACE diff --git a/config/gmp_mpfr.in b/config/gmp_mpfr.in index c384ecc..02afb76 100644 --- a/config/gmp_mpfr.in +++ b/config/gmp_mpfr.in @@ -20,6 +20,7 @@ config GMP_MPFR_TARGET bool prompt "Build libraries for the target" depends on GMP_MPFR + depends on ! BARE_METAL default n help Also build libraries for the target. This can be usefull if you want diff --git a/config/kernel.in b/config/kernel.in index 607917d..f46a937 100644 --- a/config/kernel.in +++ b/config/kernel.in @@ -1,11 +1,16 @@ # Kernel options -menu "Kernel" + config KERNEL string + default "none" if BARE_METAL default "linux" if KERNEL_LINUX +if ! BARE_METAL + +menu "Kernel" + choice bool prompt "Target OS" @@ -27,3 +32,5 @@ source config/kernel/linux.in endif endmenu + +endif # ! BARE_METAL diff --git a/config/kernel/linux_headers_install.in b/config/kernel/linux_headers_install.in index db7af99..fc3df3f 100644 --- a/config/kernel/linux_headers_install.in +++ b/config/kernel/linux_headers_install.in @@ -32,44 +32,10 @@ config KERNEL_INSTALL_V_2_6_23_17 prompt "2.6.23.17 (OBSOLETE)" depends on KERNEL_VERSION_SEE_EXTRAVERSION && OBSOLETE -config KERNEL_INSTALL_V_2_6_24 - bool - prompt "2.6.24" - -config KERNEL_INSTALL_V_2_6_24_1 - bool - prompt "2.6.24.1" - depends on KERNEL_VERSION_SEE_EXTRAVERSION - -config KERNEL_INSTALL_V_2_6_24_2 - bool - prompt "2.6.24.2" - depends on KERNEL_VERSION_SEE_EXTRAVERSION - -config KERNEL_INSTALL_V_2_6_24_3 - bool - prompt "2.6.24.3" - depends on KERNEL_VERSION_SEE_EXTRAVERSION - -config KERNEL_INSTALL_V_2_6_24_4 - bool - prompt "2.6.24.4" - depends on KERNEL_VERSION_SEE_EXTRAVERSION - -config KERNEL_INSTALL_V_2_6_24_5 - bool - prompt "2.6.24.5" - depends on KERNEL_VERSION_SEE_EXTRAVERSION - -config KERNEL_INSTALL_V_2_6_24_6 - bool - prompt "2.6.24.6" - depends on KERNEL_VERSION_SEE_EXTRAVERSION - config KERNEL_INSTALL_V_2_6_24_7 bool - prompt "2.6.24.7" - depends on KERNEL_VERSION_SEE_EXTRAVERSION + prompt "2.6.24.7 (OBSOLETE)" + depends on KERNEL_VERSION_SEE_EXTRAVERSION && OBSOLETE config KERNEL_INSTALL_V_2_6_25 bool @@ -150,6 +116,16 @@ config KERNEL_INSTALL_V_2_6_25_15 prompt "2.6.25.15" depends on KERNEL_VERSION_SEE_EXTRAVERSION +config KERNEL_INSTALL_V_2_6_25_16 + bool + prompt "2.6.25.16" + depends on KERNEL_VERSION_SEE_EXTRAVERSION + +config KERNEL_INSTALL_V_2_6_25_17 + bool + prompt "2.6.25.17" + depends on KERNEL_VERSION_SEE_EXTRAVERSION + config KERNEL_INSTALL_V_2_6_26 bool prompt "2.6.26" @@ -169,6 +145,16 @@ config KERNEL_INSTALL_V_2_6_26_3 prompt "2.6.26.3" depends on KERNEL_VERSION_SEE_EXTRAVERSION +config KERNEL_INSTALL_V_2_6_26_4 + bool + prompt "2.6.26.4" + depends on KERNEL_VERSION_SEE_EXTRAVERSION + +config KERNEL_INSTALL_V_2_6_26_5 + bool + prompt "2.6.26.5" + depends on KERNEL_VERSION_SEE_EXTRAVERSION + # CT_INSERT_VERSION_ABOVE # Don't remove above line! endchoice @@ -204,11 +190,15 @@ config KERNEL_VERSION default "2.6.25.12" if KERNEL_INSTALL_V_2_6_25_12 default "2.6.25.13" if KERNEL_INSTALL_V_2_6_25_13 default "2.6.25.14" if KERNEL_INSTALL_V_2_6_25_14 - default "2.6.25.15" if KERNEL_INSTALL_V_2_6_25_15 + default "2.6.25.14" if KERNEL_INSTALL_V_2_6_25_15 + default "2.6.25.15" if KERNEL_INSTALL_V_2_6_25_16 + default "2.6.25.15" if KERNEL_INSTALL_V_2_6_25_17 default "2.6.26" if KERNEL_INSTALL_V_2_6_26 default "2.6.26.1" if KERNEL_INSTALL_V_2_6_26_1 default "2.6.26.2" if KERNEL_INSTALL_V_2_6_26_2 default "2.6.26.3" if KERNEL_INSTALL_V_2_6_26_3 + default "2.6.26.4" if KERNEL_INSTALL_V_2_6_26_4 + default "2.6.26.5" if KERNEL_INSTALL_V_2_6_26_5 # CT_INSERT_VERSION_STRING_ABOVE # Don't remove above line! diff --git a/config/libc.in b/config/libc.in index a8cf28c..d564752 100644 --- a/config/libc.in +++ b/config/libc.in @@ -1,5 +1,14 @@ # C library options +config LIBC + string + default "none" if BARE_METAL + default "glibc" if LIBC_GLIBC + default "eglibc" if LIBC_EGLIBC + default "uClibc" if LIBC_UCLIBC + +if ! BARE_METAL + menu "C-library" choice @@ -49,12 +58,6 @@ endchoice config LIBC_VERSION string -config LIBC - string - default "glibc" if LIBC_GLIBC - default "eglibc" if LIBC_EGLIBC - default "uClibc" if LIBC_UCLIBC - config LIBC_SUPPORT_NPTL bool default n @@ -106,3 +109,5 @@ config LIBC_VERSION have to save your C library tarball by yourself. endmenu + +endif # ! BARE_METAL diff --git a/config/target.in b/config/target.in index b5c7af1..bd7b725 100644 --- a/config/target.in +++ b/config/target.in @@ -28,6 +28,19 @@ config TARGET_LDFLAGS comment "General target options" +config BARE_METAL + bool + prompt "Bare metal (EXPERIMENTAL)" + default n + depends on EXPERIMENTAL + help + Say 'y' here if you want a simple C compiler with no C library. + + You probably want to say 'y' here if you plan to use your compiler + to build only kernels or bootloaders + + 'Bare metal' also refer to those programs that run without any kernel. + choice bool prompt "Target architecture:" diff --git a/config/toolchain.in b/config/toolchain.in index db4f152..4078a29 100644 --- a/config/toolchain.in +++ b/config/toolchain.in @@ -15,6 +15,7 @@ config USE_SYSROOT config SHARED_LIBS bool prompt "Build shared libraries" + depends on ! BARE_METAL default y help Say 'y' here, unless you don't want shared libraries. diff --git a/samples/arm-unknown-eabi/crosstool.config b/samples/arm-unknown-eabi/crosstool.config new file mode 100644 index 0000000..e5cfaef --- /dev/null +++ b/samples/arm-unknown-eabi/crosstool.config @@ -0,0 +1,223 @@ +# +# Automatically generated make config: don't edit +# crosstool-NG version: 1.2.0+svn_trunk@1001M +# Thu Sep 11 00:53:13 2008 +# + +# +# Paths and misc options +# + +# +# crosstool-NG behavior +# +# CT_OBSOLETE is not set +CT_EXPERIMENTAL=y +# CT_BROKEN is not set +# CT_DEBUG_CT is not set + +# +# Paths +# +CT_LOCAL_TARBALLS_DIR="${HOME}/src" +CT_SAVE_TARBALLS=y +CT_WORK_DIR="${CT_TOP_DIR}/targets" +CT_PREFIX_DIR="${HOME}/x-tools/${CT_TARGET}" +CT_INSTALL_DIR="${CT_PREFIX_DIR}" +# CT_CUSTOM_PATCH is not set +CT_REMOVE_DOCS=y +CT_INSTALL_DIR_RO=y + +# +# Downloading +# +# CT_FORCE_DOWNLOAD is not set +# CT_USE_PROXY is not set +CT_PROXY_TYPE="none" +# CT_USE_LAN_MIRROR is not set +CT_CONNECT_TIMEOUT=10 +# CT_ONLY_DOWNLOAD is not set + +# +# Extracting +# +# CT_FORCE_EXTRACT is not set +CT_OVERIDE_CONFIG_GUESS_SUB=y +# CT_ONLY_EXTRACT is not set + +# +# Build behavior +# +CT_PARALLEL_JOBS=1 +CT_LOAD=0 +CT_NICE=0 +CT_USE_PIPES=y +CT_CONFIG_SHELL_ASH=y + +# +# Logging +# +# CT_LOG_ERROR is not set +# CT_LOG_WARN is not set +# CT_LOG_INFO is not set +CT_LOG_EXTRA=y +# CT_LOG_DEBUG is not set +# CT_LOG_ALL is not set +CT_LOG_LEVEL_MAX="EXTRA" +# CT_LOG_SEE_TOOLS_WARN is not set +CT_LOG_PROGRESS_BAR=y +CT_LOG_TO_FILE=y +CT_LOG_FILE_COMPRESS=y + +# +# Target options +# +CT_ARCH="arm" +CT_ARCH_SUPPORT_ARCH=y +# CT_ARCH_SUPPORT_ABI is not set +CT_ARCH_SUPPORT_CPU=y +CT_ARCH_SUPPORT_TUNE=y +CT_ARCH_SUPPORT_FPU=y +CT_ARCH_SUPPORTS_BOTH_ENDIAN=y +# CT_ARCH_DEFAULT_BE is not set +CT_ARCH_DEFAULT_LE=y +CT_ARCH_ARCH="" +CT_ARCH_CPU="" +CT_ARCH_TUNE="" +CT_ARCH_FPU="" +# CT_ARCH_BE is not set +CT_ARCH_LE=y +CT_ARCH_FLOAT_HW=y +# CT_ARCH_FLOAT_SW is not set +CT_TARGET_CFLAGS="" +CT_TARGET_LDFLAGS="" + +# +# General target options +# +CT_BARE_METAL=y +# CT_ARCH_alpha is not set +CT_ARCH_arm=y +CT_ARCH_ARM_EABI=y +# CT_ARCH_ia64 is not set +# CT_ARCH_mips is not set +# CT_ARCH_powerpc is not set +# CT_ARCH_sh is not set +# CT_ARCH_x86 is not set +# CT_ARCH_x86_64 is not set + +# +# Target optimisations +# + +# +# Toolchain options +# + +# +# General toolchain options +# +CT_USE_SYSROOT=y +CT_TARGET_VENDOR="unknown" +CT_TARGET_ALIAS_SED_EXPR="" +CT_TARGET_ALIAS="" + +# +# Toolchain type +# +# CT_NATIVE is not set +CT_CROSS=y +# CT_CROSS_NATIVE is not set +# CT_CANADIAN is not set +CT_TOOLCHAIN_TYPE="cross" +CT_BUILD="" +CT_CC_NATIVE="gcc" +CT_KERNEL="none" + +# +# GMP and MPFR +# +CT_GMP_MPFR=y +CT_GMP_V_4_2_2=y +CT_GMP_VERSION="4.2.2" +CT_GMP_CHECK=y +CT_MPFR_V_2_3_1=y +CT_MPFR_VERSION="2.3.1" +CT_MPFR_CHECK=y + +# +# binutils +# +CT_BINUTILS_VERSION="2.18" +# CT_BINUTILS_V_2_14 is not set +# CT_BINUTILS_V_2_15 is not set +# CT_BINUTILS_V_2_16_1 is not set +# CT_BINUTILS_V_2_17 is not set +CT_BINUTILS_V_2_18=y +# CT_BINUTILS_V_2_18_50_0_4 is not set +# CT_BINUTILS_V_2_18_50_0_6 is not set +# CT_BINUTILS_V_2_18_50_0_7 is not set +# CT_BINUTILS_V_2_18_50_0_8 is not set +CT_BINUTILS_EXTRA_CONFIG="" + +# +# C compiler +# +CT_CC_GCC=y +CT_CC_VERSION="4.3.1" +CT_CC="gcc" +# CT_CC_V_2_95_3 is not set +# CT_CC_V_3_2_3 is not set +# CT_CC_V_3_3_6 is not set +# CT_CC_V_3_4_6 is not set +# CT_CC_V_4_0_0 is not set +# CT_CC_V_4_0_1 is not set +# CT_CC_V_4_0_2 is not set +# CT_CC_V_4_0_3 is not set +# CT_CC_V_4_0_4 is not set +# CT_CC_V_4_1_0 is not set +# CT_CC_V_4_1_1 is not set +# CT_CC_V_4_1_2 is not set +# CT_CC_V_4_2_0 is not set +# CT_CC_V_4_2_1 is not set +# CT_CC_V_4_2_2 is not set +# CT_CC_V_4_2_3 is not set +# CT_CC_V_4_2_4 is not set +# CT_CC_V_4_3_0 is not set +CT_CC_V_4_3_1=y +CT_CC_GCC_4_3_or_later=y +CT_CC_CORE_EXTRA_CONFIG="" +CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}" +CT_CC_BUGURL="" +CT_CC_SUPPORT_CXX=y +CT_CC_SUPPORT_FORTRAN=y +CT_CC_SUPPORT_JAVA=y +CT_CC_SUPPORT_ADA=y +CT_CC_SUPPORT_OBJC=y +CT_CC_SUPPORT_OBJCXX=y + +# +# Only C language supported on bare metal +# +CT_LIBC="none" + +# +# Tools facilities +# +# CT_SSTRIP is not set + +# +# Debug facilities +# +CT_GDB=y +CT_GDB_CROSS=y +# CT_GDB_CROSS_STATIC is not set +# CT_GDB_CROSS_INSIGHT is not set +# CT_GDB_V_snapshot is not set +# CT_GDB_V_6_4 is not set +# CT_GDB_V_6_5 is not set +# CT_GDB_V_6_6 is not set +# CT_GDB_V_6_7 is not set +# CT_GDB_V_6_7_1 is not set +CT_GDB_V_6_8=y +CT_GDB_VERSION="6.8" diff --git a/samples/arm-unknown-elf/crosstool.config b/samples/arm-unknown-elf/crosstool.config new file mode 100644 index 0000000..827509d --- /dev/null +++ b/samples/arm-unknown-elf/crosstool.config @@ -0,0 +1,225 @@ +# +# Automatically generated make config: don't edit +# crosstool-NG version: 1.2.0+svn_trunk@1001M +# Thu Sep 11 00:48:33 2008 +# + +# +# Paths and misc options +# + +# +# crosstool-NG behavior +# +# CT_OBSOLETE is not set +CT_EXPERIMENTAL=y +# CT_BROKEN is not set +# CT_DEBUG_CT is not set + +# +# Paths +# +CT_LOCAL_TARBALLS_DIR="${HOME}/src" +CT_SAVE_TARBALLS=y +CT_WORK_DIR="${CT_TOP_DIR}/targets" +CT_PREFIX_DIR="${HOME}/x-tools/${CT_TARGET}" +CT_INSTALL_DIR="${CT_PREFIX_DIR}" +# CT_CUSTOM_PATCH is not set +CT_REMOVE_DOCS=y +CT_INSTALL_DIR_RO=y + +# +# Downloading +# +# CT_FORCE_DOWNLOAD is not set +# CT_USE_PROXY is not set +CT_PROXY_TYPE="none" +# CT_USE_LAN_MIRROR is not set +CT_CONNECT_TIMEOUT=10 +# CT_ONLY_DOWNLOAD is not set + +# +# Extracting +# +# CT_FORCE_EXTRACT is not set +CT_OVERIDE_CONFIG_GUESS_SUB=y +# CT_ONLY_EXTRACT is not set + +# +# Build behavior +# +CT_PARALLEL_JOBS=1 +CT_LOAD=0 +CT_NICE=0 +CT_USE_PIPES=y +CT_CONFIG_SHELL_ASH=y + +# +# Logging +# +# CT_LOG_ERROR is not set +# CT_LOG_WARN is not set +# CT_LOG_INFO is not set +CT_LOG_EXTRA=y +# CT_LOG_DEBUG is not set +# CT_LOG_ALL is not set +CT_LOG_LEVEL_MAX="EXTRA" +# CT_LOG_SEE_TOOLS_WARN is not set +CT_LOG_PROGRESS_BAR=y +CT_LOG_TO_FILE=y +CT_LOG_FILE_COMPRESS=y + +# +# Target options +# +CT_ARCH="arm" +CT_ARCH_SUPPORT_ARCH=y +CT_ARCH_SUPPORT_ABI=y +CT_ARCH_SUPPORT_CPU=y +CT_ARCH_SUPPORT_TUNE=y +CT_ARCH_SUPPORT_FPU=y +CT_ARCH_SUPPORTS_BOTH_ENDIAN=y +# CT_ARCH_DEFAULT_BE is not set +CT_ARCH_DEFAULT_LE=y +CT_ARCH_ARCH="" +CT_ARCH_ABI="" +CT_ARCH_CPU="" +CT_ARCH_TUNE="" +CT_ARCH_FPU="" +# CT_ARCH_BE is not set +CT_ARCH_LE=y +CT_ARCH_FLOAT_HW=y +# CT_ARCH_FLOAT_SW is not set +CT_TARGET_CFLAGS="" +CT_TARGET_LDFLAGS="" + +# +# General target options +# +CT_BARE_METAL=y +# CT_ARCH_alpha is not set +CT_ARCH_arm=y +# CT_ARCH_ARM_EABI is not set +CT_ARCH_ARM_ABI_OK=y +# CT_ARCH_ia64 is not set +# CT_ARCH_mips is not set +# CT_ARCH_powerpc is not set +# CT_ARCH_sh is not set +# CT_ARCH_x86 is not set +# CT_ARCH_x86_64 is not set + +# +# Target optimisations +# + +# +# Toolchain options +# + +# +# General toolchain options +# +CT_USE_SYSROOT=y +CT_TARGET_VENDOR="unknown" +CT_TARGET_ALIAS_SED_EXPR="" +CT_TARGET_ALIAS="" + +# +# Toolchain type +# +# CT_NATIVE is not set +CT_CROSS=y +# CT_CROSS_NATIVE is not set +# CT_CANADIAN is not set +CT_TOOLCHAIN_TYPE="cross" +CT_BUILD="" +CT_CC_NATIVE="gcc" +CT_KERNEL="none" + +# +# GMP and MPFR +# +CT_GMP_MPFR=y +CT_GMP_V_4_2_2=y +CT_GMP_VERSION="4.2.2" +CT_GMP_CHECK=y +CT_MPFR_V_2_3_1=y +CT_MPFR_VERSION="2.3.1" +CT_MPFR_CHECK=y + +# +# binutils +# +CT_BINUTILS_VERSION="2.18" +# CT_BINUTILS_V_2_14 is not set +# CT_BINUTILS_V_2_15 is not set +# CT_BINUTILS_V_2_16_1 is not set +# CT_BINUTILS_V_2_17 is not set +CT_BINUTILS_V_2_18=y +# CT_BINUTILS_V_2_18_50_0_4 is not set +# CT_BINUTILS_V_2_18_50_0_6 is not set +# CT_BINUTILS_V_2_18_50_0_7 is not set +# CT_BINUTILS_V_2_18_50_0_8 is not set +CT_BINUTILS_EXTRA_CONFIG="" + +# +# C compiler +# +CT_CC_GCC=y +CT_CC_VERSION="4.3.1" +CT_CC="gcc" +# CT_CC_V_2_95_3 is not set +# CT_CC_V_3_2_3 is not set +# CT_CC_V_3_3_6 is not set +# CT_CC_V_3_4_6 is not set +# CT_CC_V_4_0_0 is not set +# CT_CC_V_4_0_1 is not set +# CT_CC_V_4_0_2 is not set +# CT_CC_V_4_0_3 is not set +# CT_CC_V_4_0_4 is not set +# CT_CC_V_4_1_0 is not set +# CT_CC_V_4_1_1 is not set +# CT_CC_V_4_1_2 is not set +# CT_CC_V_4_2_0 is not set +# CT_CC_V_4_2_1 is not set +# CT_CC_V_4_2_2 is not set +# CT_CC_V_4_2_3 is not set +# CT_CC_V_4_2_4 is not set +# CT_CC_V_4_3_0 is not set +CT_CC_V_4_3_1=y +CT_CC_GCC_4_3_or_later=y +CT_CC_CORE_EXTRA_CONFIG="" +CT_CC_PKGVERSION="crosstool-NG-${CT_VERSION}" +CT_CC_BUGURL="" +CT_CC_SUPPORT_CXX=y +CT_CC_SUPPORT_FORTRAN=y +CT_CC_SUPPORT_JAVA=y +CT_CC_SUPPORT_ADA=y +CT_CC_SUPPORT_OBJC=y +CT_CC_SUPPORT_OBJCXX=y + +# +# Only C language supported on bare metal +# +CT_LIBC="none" + +# +# Tools facilities +# +# CT_SSTRIP is not set + +# +# Debug facilities +# +CT_GDB=y +CT_GDB_CROSS=y +# CT_GDB_CROSS_STATIC is not set +# CT_GDB_CROSS_INSIGHT is not set +# CT_GDB_V_snapshot is not set +# CT_GDB_V_6_4 is not set +# CT_GDB_V_6_5 is not set +# CT_GDB_V_6_6 is not set +# CT_GDB_V_6_7 is not set +# CT_GDB_V_6_7_1 is not set +CT_GDB_V_6_8=y +CT_GDB_VERSION="6.8" diff --git a/scripts/build/cc/gcc.sh b/scripts/build/cc/gcc.sh new file mode 100644 index 0000000..24ee3c3 --- /dev/null +++ b/scripts/build/cc/gcc.sh @@ -0,0 +1,299 @@ +# This file adds the function to build the gcc C compiler + ${extra_config} \ +# Copyright 2007 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +do_print_filename() { + [ "${CT_CC}" = "gcc" ] || return 0 + echo "gcc-${CT_CC_VERSION}" +} + +# Download gcc +do_cc_get() { + # Ah! gcc folks are kind of 'different': they store the tarballs in + # subdirectories of the same name! That's because gcc is such /crap/ that + # it is such /big/ that it needs being splitted for distribution! Sad. :-( + # Arrgghh! Some of those versions does not follow this convention: + # gcc-3.3.3 lives in releases/gcc-3.3.3, while gcc-2.95.* isn't in a + # subdirectory! You bastard! + CT_GetFile "${CT_CC_FILE}" \ + {ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/${CT_CC_FILE}} +} + +# Extract gcc +do_cc_extract() { + CT_ExtractAndPatch "${CT_CC_FILE}" +} + +#------------------------------------------------------------------------------ +# Core gcc pass 1 +do_cc_core_pass_1() { + # If we're building for bare metal, build the static core gcc, + # with libgcc. + # In case we're not bare metal, and we're NPTL, build the static core gcc. + # In any other case, do nothing. + case "${CT_BARE_METAL},${CT_THREADS}" in + y,*) do_cc_core mode=baremetal build_libgcc=yes;; + ,nptl) do_cc_core mode=static build_libgcc=no;; + *) ;; + esac +} + +# Core gcc pass 2 +do_cc_core_pass_2() { + # In case we're building for bare metal, do nothing, we already have + # our compiler. + # In case we're NPTL, build the shared core gcc. + # In any other case, build the static core gcc and the target libgcc. + case "${CT_BARE_METAL},${CT_THREADS}" in + y,*) ;; + ,nptl) do_cc_core mode=shared build_libgcc=yes;; + *) do_cc_core mode=static build_libgcc=yes;; + esac +} + +#------------------------------------------------------------------------------ +# Build core gcc +# This function is used to build both the static and the shared core C conpiler, +# with or without the target libgcc. We need to know wether: +# - we're building static, shared or bare metal: mode=[static|shared|baremetal] +# - we need to build libgcc or not : build_libgcc=[yes|no] +# Usage: do_cc_core_static mode=[static|shared|baremetal] build_libgcc=[yes|no] +do_cc_core() { + local mode + local build_libgcc + local core_prefix_dir + local extra_config + + eval $1 + eval $2 + CT_TestOrAbort "Internal Error: 'mode' must either 'static', 'shared' or 'baremetal', not '${mode:-(empty)}'" "${mode}" = "static" -o "${mode}" = "shared" -o "${mode}" = "baremetal" + CT_TestOrAbort "Internal Error: 'build_libgcc' must be either 'yes' or 'no', not '${build_libgcc:-(empty)}'" "${build_libgcc}" = "yes" -o "${build_libgcc}" = "no" + # In normal conditions, ( "${mode}" = "shared" ) implies + # ( "${build_libgcc}" = "yes" ), but I won't check for that + + mkdir -p "${CT_BUILD_DIR}/build-cc-core-${mode}" + cd "${CT_BUILD_DIR}/build-cc-core-${mode}" + + CT_DoStep INFO "Installing ${mode} core C compiler" + case "${mode}" in + static) + core_prefix_dir="${CT_CC_CORE_STATIC_PREFIX_DIR}" + extra_config="${extra_config} --with-newlib --enable-threads=no --disable-shared" + copy_headers=y + ;; + shared) + core_prefix_dir="${CT_CC_CORE_SHARED_PREFIX_DIR}" + extra_config="${extra_config} --enable-shared" + copy_headers=y + ;; + baremetal) + core_prefix_dir="${CT_PREFIX_DIR}" + extra_config="${extra_config} --with-newlib --enable-threads=no --disable-shared" + copy_headers=n + ;; + esac + + if [ "${copy_headers}" = "y" ]; then + CT_DoLog DEBUG "Copying headers to install area of bootstrap gcc, so it can build libgcc2" + CT_DoExecLog ALL mkdir -p "${core_prefix_dir}/${CT_TARGET}/include" + CT_DoExecLog ALL cp -r "${CT_HEADERS_DIR}"/* "${core_prefix_dir}/${CT_TARGET}/include" + fi + + CT_DoLog EXTRA "Configuring ${mode} core C compiler" + + extra_config="${extra_config} ${CT_ARCH_WITH_ARCH}" + extra_config="${extra_config} ${CT_ARCH_WITH_ABI}" + extra_config="${extra_config} ${CT_ARCH_WITH_CPU}" + extra_config="${extra_config} ${CT_ARCH_WITH_TUNE}" + extra_config="${extra_config} ${CT_ARCH_WITH_FPU}" + extra_config="${extra_config} ${CT_ARCH_WITH_FLOAT}" + [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" + if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then + extra_config="${extra_config} --enable-__cxa_atexit" + else + extra_config="${extra_config} --disable-__cxa_atexit" + fi + + CT_DoLog DEBUG "Extra config passed: '${extra_config}'" + + # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532) + CC_FOR_BUILD="${CT_CC_NATIVE}" \ + CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/${CT_CC_FILE}/configure" \ + ${CT_CANADIAN_OPT} \ + --host=${CT_HOST} \ + --target=${CT_TARGET} \ + --prefix="${core_prefix_dir}" \ + --with-local-prefix="${CT_SYSROOT_DIR}" \ + --disable-multilib \ + ${CC_CORE_SYSROOT_ARG} \ + ${extra_config} \ + --disable-nls \ + --enable-symvers=gnu \ + --enable-languages=c \ + --enable-target-optspace \ + ${CT_CC_CORE_EXTRA_CONFIG} + + if [ "${build_libgcc}" = "yes" ]; then + # HACK: we need to override SHLIB_LC from gcc/config/t-slibgcc-elf-ver or + # gcc/config/t-libunwind so -lc is removed from the link for + # libgcc_s.so, as we do not have a target -lc yet. + # This is not as ugly as it appears to be ;-) All symbols get resolved + # during the glibc build, and we provide a proper libgcc_s.so for the + # cross toolchain during the final gcc build. + # + # As we cannot modify the source tree, nor override SHLIB_LC itself + # during configure or make, we have to edit the resultant + # gcc/libgcc.mk itself to remove -lc from the link. + # This causes us to have to jump through some hoops... + # + # To produce libgcc.mk to edit we firstly require libiberty.a, + # so we configure then build it. + # Next we have to configure gcc, create libgcc.mk then edit it... + # So much easier if we just edit the source tree, but hey... + if [ ! -f "${CT_SRC_DIR}/${CT_CC_FILE}/gcc/BASE-VER" ]; then + CT_DoExecLog ALL make configure-libiberty + CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libiberty libiberty.a + CT_DoExecLog ALL make configure-gcc configure-libcpp + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp + else + CT_DoExecLog ALL make configure-gcc configure-libcpp configure-build-libiberty + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp all-build-libiberty + fi + # HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here. + if [ -d "${CT_SRC_DIR}/${CT_CC_FILE}/libdecnumber" ]; then + CT_DoExecLog ALL make configure-libdecnumber + CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libdecnumber libdecnumber.a + fi + + # Starting with GCC 4.3, libgcc.mk is no longer built, + # and libgcc.mvars is used instead. + + gcc_version_major=$(echo ${CT_CC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/') + gcc_version_minor=$(echo ${CT_CC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/') + + if [ ${gcc_version_major} -eq 4 -a ${gcc_version_minor} -ge 3 \ + -o ${gcc_version_major} -gt 4 ]; then + libgcc_rule="libgcc.mvars" + build_rules="all-gcc all-target-libgcc" + install_rules="install-gcc install-target-libgcc" + else + libgcc_rule="libgcc.mk" + build_rules="all-gcc" + install_rules="install-gcc" + fi + + CT_DoExecLog ALL make ${PARALLELMFLAGS} -C gcc ${libgcc_rule} + sed -r -i -e 's@-lc@@g' gcc/${libgcc_rule} + else # build_libgcc + build_rules="all-gcc" + install_rules="install-gcc" + fi # ! build libgcc + + if [ "${CT_CANADIAN}" = "y" ]; then + CT_DoLog EXTRA "Building libiberty" + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-build-libiberty + fi + + CT_DoLog EXTRA "Building ${mode} core C compiler" + CT_DoExecLog ALL make ${PARALLELMFLAGS} ${build_rules} + + CT_DoLog EXTRA "Installing ${mode} core C compiler" + CT_DoExecLog ALL make ${install_rules} + + CT_EndStep +} + +#------------------------------------------------------------------------------ +# Build final gcc +do_cc() { + # If building for bare metal, nothing to be done here, the static core conpiler is enough! + [ "${CT_BARE_METAL}" = "y" ] && return 0 + + CT_DoStep INFO "Installing final compiler" + + mkdir -p "${CT_BUILD_DIR}/build-cc" + cd "${CT_BUILD_DIR}/build-cc" + + CT_DoLog EXTRA "Configuring final compiler" + + # Enable selected languages + lang_opt="c" + [ "${CT_CC_LANG_CXX}" = "y" ] && lang_opt="${lang_opt},c++" + [ "${CT_CC_LANG_FORTRAN}" = "y" ] && lang_opt="${lang_opt},fortran" + [ "${CT_CC_LANG_ADA}" = "y" ] && lang_opt="${lang_opt},ada" + [ "${CT_CC_LANG_JAVA}" = "y" ] && lang_opt="${lang_opt},java" + [ "${CT_CC_LANG_OBJC}" = "y" ] && lang_opt="${lang_opt},objc" + [ "${CT_CC_LANG_OBJCXX}" = "y" ] && lang_opt="${lang_opt},obj-c++" + CT_Test "Building ADA language is not yet supported. Will try..." "${CT_CC_LANG_ADA}" = "y" + CT_Test "Building Objective-C language is not yet supported. Will try..." "${CT_CC_LANG_OBJC}" = "y" + CT_Test "Building Objective-C++ language is not yet supported. Will try..." "${CT_CC_LANG_OBJCXX}" = "y" + CT_Test "Building ${CT_CC_LANG_OTHERS//,/ } language(s) is not yet supported. Will try..." -n "${CT_CC_LANG_OTHERS}" + lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;') + + extra_config="--enable-languages=${lang_opt}" + extra_config="${extra_config} --disable-multilib" + extra_config="${extra_config} ${CT_ARCH_WITH_ARCH}" + extra_config="${extra_config} ${CT_ARCH_WITH_ABI}" + extra_config="${extra_config} ${CT_ARCH_WITH_CPU}" + extra_config="${extra_config} ${CT_ARCH_WITH_TUNE}" + extra_config="${extra_config} ${CT_ARCH_WITH_FPU}" + extra_config="${extra_config} ${CT_ARCH_WITH_FLOAT}" + [ "${CT_SHARED_LIBS}" = "y" ] || extra_config="${extra_config} --disable-shared" + [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" + [ -n "${CT_CC_PKGVERSION}" ] && extra_config="${extra_config} --with-pkgversion=${CT_CC_PKGVERSION}" + [ -n "${CT_CC_BUGURL}" ] && extra_config="${extra_config} --with-bugurl=${CT_CC_BUGURL}" + [ "${CT_CC_SJLJ_EXCEPTIONS_USE}" = "y" ] && extra_config="${extra_config} --enable-sjlj-exceptions" + [ "${CT_CC_SJLJ_EXCEPTIONS_DONT_USE}" = "y" ] && extra_config="${extra_config} --disable-sjlj-exceptions" + if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then + extra_config="${extra_config} --enable-__cxa_atexit" + else + extra_config="${extra_config} --disable-__cxa_atexit" + fi + + CT_DoLog DEBUG "Extra config passed: '${extra_config}'" + + # --enable-symvers=gnu really only needed for sh4 to work around a + # detection problem only matters for gcc-3.2.x and later, I think. + # --disable-nls to work around crash bug on ppc405, but also because + # embedded systems don't really need message catalogs... + CC_FOR_BUILD="${CT_CC_NATIVE}" \ + CFLAGS="${CT_CFLAGS_FOR_HOST}" \ + CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ + CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ + LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/${CT_CC_FILE}/configure" \ + ${CT_CANADIAN_OPT} \ + --target=${CT_TARGET} --host=${CT_HOST} \ + --prefix="${CT_PREFIX_DIR}" \ + ${CC_SYSROOT_ARG} \ + ${extra_config} \ + --with-local-prefix="${CT_SYSROOT_DIR}" \ + --disable-nls \ + --enable-threads=posix \ + --enable-symvers=gnu \ + --enable-c99 \ + --enable-long-long \ + --enable-target-optspace \ + ${CT_CC_EXTRA_CONFIG} + + if [ "${CT_CANADIAN}" = "y" ]; then + CT_DoLog EXTRA "Building libiberty" + CT_DoExecLog ALL make ${PARALLELMFLAGS} all-build-libiberty + fi + + CT_DoLog EXTRA "Building final compiler" + CT_DoExecLog ALL make ${PARALLELMFLAGS} all + + CT_DoLog EXTRA "Installing final compiler" + CT_DoExecLog ALL make install + + # Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able + # to call the C compiler with the same, somewhat canonical name. + ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}"-{g,}cc 2>&1 |CT_DoLog ALL + + CT_EndStep +} diff --git a/scripts/build/cc_gcc.sh b/scripts/build/cc_gcc.sh deleted file mode 100644 index f1f42fc..0000000 --- a/scripts/build/cc_gcc.sh +++ /dev/null @@ -1,275 +0,0 @@ -# This file adds the function to build the gcc C compiler -# Copyright 2007 Yann E. MORIN -# Licensed under the GPL v2. See COPYING in the root of this package - -do_print_filename() { - [ "${CT_CC}" = "gcc" ] || return 0 - echo "gcc-${CT_CC_VERSION}" -} - -# Download gcc -do_cc_get() { - # Ah! gcc folks are kind of 'different': they store the tarballs in - # subdirectories of the same name! That's because gcc is such /crap/ that - # it is such /big/ that it needs being splitted for distribution! Sad. :-( - # Arrgghh! Some of those versions does not follow this convention: - # gcc-3.3.3 lives in releases/gcc-3.3.3, while gcc-2.95.* isn't in a - # subdirectory! You bastard! - CT_GetFile "${CT_CC_FILE}" \ - {ftp,http}://ftp.gnu.org/gnu/gcc{,{,/releases}/${CT_CC_FILE}} -} - -# Extract gcc -do_cc_extract() { - CT_ExtractAndPatch "${CT_CC_FILE}" -} - -#------------------------------------------------------------------------------ -# Core gcc pass 1 -do_cc_core_pass_1() { - # In case we're NPTL, build the static core gcc; - # in any other case, do nothing. - case "${CT_THREADS}" in - nptl) do_cc_core mode=static build_libgcc=no;; - *) ;; - esac -} - -# Core gcc pass 2 -do_cc_core_pass_2() { - # In case we're NPTL, build the shared core gcc, - # in any other case, build the static core gcc and the target libgcc. - case "${CT_THREADS}" in - nptl) do_cc_core mode=shared build_libgcc=yes;; - *) do_cc_core mode=static build_libgcc=yes;; - esac -} - -#------------------------------------------------------------------------------ -# Build core gcc -# This function is used to build both the static and the shared core C conpiler, -# with or without the target libgcc. We need to know wether: -# - we're building static or shared: mode=[static|shared] -# - we need to build libgcc or not: build_libgcc=[yes|no] -# Usage: do_cc_core_static mode=[static|shared] build_libgcc=[yes|no] -do_cc_core() { - local mode - local build_libgcc - local core_prefix_dir - local extra_config - - eval $1 - eval $2 - CT_TestOrAbort "Internal Error: 'mode' must either 'static' or 'shared', not '${mode:-(empty)}'" "${mode}" = "static" -o "${mode}" = "shared" - CT_TestOrAbort "Internal Error: 'build_libgcc' must be either 'yes' or 'no', not '${build_libgcc:-(empty)}'" "${build_libgcc}" = "yes" -o "${build_libgcc}" = "no" - # In normal conditions, ( "${mode}" = "shared" ) implies - # ( "${build_libgcc}" = "yes" ), but I won't check for that - - mkdir -p "${CT_BUILD_DIR}/build-cc-core-${mode}" - cd "${CT_BUILD_DIR}/build-cc-core-${mode}" - - CT_DoStep INFO "Installing ${mode} core C compiler" - case "${mode}" in - static) - core_prefix_dir="${CT_CC_CORE_STATIC_PREFIX_DIR}" - extra_config="${extra_config} --with-newlib --enable-threads=no --disable-shared" - ;; - shared) - core_prefix_dir="${CT_CC_CORE_SHARED_PREFIX_DIR}" - extra_config="${extra_config} --enable-shared" - ;; - esac - - CT_DoLog DEBUG "Copying headers to install area of bootstrap gcc, so it can build libgcc2" - CT_DoExecLog ALL mkdir -p "${core_prefix_dir}/${CT_TARGET}/include" - CT_DoExecLog ALL cp -r "${CT_HEADERS_DIR}"/* "${core_prefix_dir}/${CT_TARGET}/include" - - CT_DoLog EXTRA "Configuring ${mode} core C compiler" - - extra_config="${extra_config} ${CT_ARCH_WITH_ARCH}" - extra_config="${extra_config} ${CT_ARCH_WITH_ABI}" - extra_config="${extra_config} ${CT_ARCH_WITH_CPU}" - extra_config="${extra_config} ${CT_ARCH_WITH_TUNE}" - extra_config="${extra_config} ${CT_ARCH_WITH_FPU}" - extra_config="${extra_config} ${CT_ARCH_WITH_FLOAT}" - [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" - if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then - extra_config="${extra_config} --enable-__cxa_atexit" - else - extra_config="${extra_config} --disable-__cxa_atexit" - fi - - CT_DoLog DEBUG "Extra config passed: '${extra_config}'" - - # Use --with-local-prefix so older gccs don't look in /usr/local (http://gcc.gnu.org/PR10532) - CC_FOR_BUILD="${CT_CC_NATIVE}" \ - CFLAGS="${CT_CFLAGS_FOR_HOST}" \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/${CT_CC_FILE}/configure" \ - ${CT_CANADIAN_OPT} \ - --host=${CT_HOST} \ - --target=${CT_TARGET} \ - --prefix="${core_prefix_dir}" \ - --with-local-prefix="${CT_SYSROOT_DIR}" \ - --disable-multilib \ - ${CC_CORE_SYSROOT_ARG} \ - ${extra_config} \ - --disable-nls \ - --enable-symvers=gnu \ - --enable-languages=c \ - --enable-target-optspace \ - ${CT_CC_CORE_EXTRA_CONFIG} - - if [ "${build_libgcc}" = "yes" ]; then - # HACK: we need to override SHLIB_LC from gcc/config/t-slibgcc-elf-ver or - # gcc/config/t-libunwind so -lc is removed from the link for - # libgcc_s.so, as we do not have a target -lc yet. - # This is not as ugly as it appears to be ;-) All symbols get resolved - # during the glibc build, and we provide a proper libgcc_s.so for the - # cross toolchain during the final gcc build. - # - # As we cannot modify the source tree, nor override SHLIB_LC itself - # during configure or make, we have to edit the resultant - # gcc/libgcc.mk itself to remove -lc from the link. - # This causes us to have to jump through some hoops... - # - # To produce libgcc.mk to edit we firstly require libiberty.a, - # so we configure then build it. - # Next we have to configure gcc, create libgcc.mk then edit it... - # So much easier if we just edit the source tree, but hey... - if [ ! -f "${CT_SRC_DIR}/${CT_CC_FILE}/gcc/BASE-VER" ]; then - CT_DoExecLog ALL make configure-libiberty - CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libiberty libiberty.a - CT_DoExecLog ALL make configure-gcc configure-libcpp - CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp - else - CT_DoExecLog ALL make configure-gcc configure-libcpp configure-build-libiberty - CT_DoExecLog ALL make ${PARALLELMFLAGS} all-libcpp all-build-libiberty - fi - # HACK: gcc-4.2 uses libdecnumber to build libgcc.mk, so build it here. - if [ -d "${CT_SRC_DIR}/${CT_CC_FILE}/libdecnumber" ]; then - CT_DoExecLog ALL make configure-libdecnumber - CT_DoExecLog ALL make ${PARALLELMFLAGS} -C libdecnumber libdecnumber.a - fi - - # Starting with GCC 4.3, libgcc.mk is no longer built, - # and libgcc.mvars is used instead. - - gcc_version_major=$(echo ${CT_CC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/') - gcc_version_minor=$(echo ${CT_CC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/') - - if [ ${gcc_version_major} -eq 4 -a ${gcc_version_minor} -ge 3 \ - -o ${gcc_version_major} -gt 4 ]; then - libgcc_rule="libgcc.mvars" - build_rules="all-gcc all-target-libgcc" - install_rules="install-gcc install-target-libgcc" - else - libgcc_rule="libgcc.mk" - build_rules="all-gcc" - install_rules="install-gcc" - fi - - CT_DoExecLog ALL make ${PARALLELMFLAGS} -C gcc ${libgcc_rule} - sed -r -i -e 's@-lc@@g' gcc/${libgcc_rule} - else # build_libgcc - build_rules="all-gcc" - install_rules="install-gcc" - fi # ! build libgcc - - if [ "${CT_CANADIAN}" = "y" ]; then - CT_DoLog EXTRA "Building libiberty" - CT_DoExecLog ALL make ${PARALLELMFLAGS} all-build-libiberty - fi - - CT_DoLog EXTRA "Building ${mode} core C compiler" - CT_DoExecLog ALL make ${PARALLELMFLAGS} ${build_rules} - - CT_DoLog EXTRA "Installing ${mode} core C compiler" - CT_DoExecLog ALL make ${install_rules} - - CT_EndStep -} - -#------------------------------------------------------------------------------ -# Build final gcc -do_cc() { - CT_DoStep INFO "Installing final compiler" - - mkdir -p "${CT_BUILD_DIR}/build-cc" - cd "${CT_BUILD_DIR}/build-cc" - - CT_DoLog EXTRA "Configuring final compiler" - - # Enable selected languages - lang_opt="c" - [ "${CT_CC_LANG_CXX}" = "y" ] && lang_opt="${lang_opt},c++" - [ "${CT_CC_LANG_FORTRAN}" = "y" ] && lang_opt="${lang_opt},fortran" - [ "${CT_CC_LANG_ADA}" = "y" ] && lang_opt="${lang_opt},ada" - [ "${CT_CC_LANG_JAVA}" = "y" ] && lang_opt="${lang_opt},java" - [ "${CT_CC_LANG_OBJC}" = "y" ] && lang_opt="${lang_opt},objc" - [ "${CT_CC_LANG_OBJCXX}" = "y" ] && lang_opt="${lang_opt},obj-c++" - CT_Test "Building ADA language is not yet supported. Will try..." "${CT_CC_LANG_ADA}" = "y" - CT_Test "Building Objective-C language is not yet supported. Will try..." "${CT_CC_LANG_OBJC}" = "y" - CT_Test "Building Objective-C++ language is not yet supported. Will try..." "${CT_CC_LANG_OBJCXX}" = "y" - CT_Test "Building ${CT_CC_LANG_OTHERS//,/ } language(s) is not yet supported. Will try..." -n "${CT_CC_LANG_OTHERS}" - lang_opt=$(echo "${lang_opt},${CT_CC_LANG_OTHERS}" |sed -r -e 's/,+/,/g; s/,*$//;') - - extra_config="--enable-languages=${lang_opt}" - extra_config="${extra_config} --disable-multilib" - extra_config="${extra_config} ${CT_ARCH_WITH_ARCH} ${CT_ARCH_WITH_ABI} ${CT_ARCH_WITH_CPU} ${CT_ARCH_WITH_TUNE} ${CT_ARCH_WITH_FPU} ${CT_ARCH_WITH_FLOAT}" - [ "${CT_SHARED_LIBS}" = "y" ] || extra_config="${extra_config} --disable-shared" - [ "${CT_GMP_MPFR}" = "y" ] && extra_config="${extra_config} --with-gmp=${CT_PREFIX_DIR} --with-mpfr=${CT_PREFIX_DIR}" - [ -n "${CT_CC_PKGVERSION}" ] && extra_config="${extra_config} --with-pkgversion=${CT_CC_PKGVERSION}" - [ -n "${CT_CC_BUGURL}" ] && extra_config="${extra_config} --with-bugurl=${CT_CC_BUGURL}" - [ "${CT_CC_SJLJ_EXCEPTIONS_USE}" = "y" ] && extra_config="${extra_config} --enable-sjlj-exceptions" - [ "${CT_CC_SJLJ_EXCEPTIONS_DONT_USE}" = "y" ] && extra_config="${extra_config} --disable-sjlj-exceptions" - if [ "${CT_CC_CXA_ATEXIT}" = "y" ]; then - extra_config="${extra_config} --enable-__cxa_atexit" - else - extra_config="${extra_config} --disable-__cxa_atexit" - fi - - CT_DoLog DEBUG "Extra config passed: '${extra_config}'" - - # --enable-symvers=gnu really only needed for sh4 to work around a - # detection problem only matters for gcc-3.2.x and later, I think. - # --disable-nls to work around crash bug on ppc405, but also because - # embedded systems don't really need message catalogs... - CC_FOR_BUILD="${CT_CC_NATIVE}" \ - CFLAGS="${CT_CFLAGS_FOR_HOST}" \ - CFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ - CXXFLAGS_FOR_TARGET="${CT_TARGET_CFLAGS}" \ - LDFLAGS_FOR_TARGET="${CT_TARGET_LDFLAGS}" \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/${CT_CC_FILE}/configure" \ - ${CT_CANADIAN_OPT} \ - --target=${CT_TARGET} --host=${CT_HOST} \ - --prefix="${CT_PREFIX_DIR}" \ - ${CC_SYSROOT_ARG} \ - ${extra_config} \ - --with-local-prefix="${CT_SYSROOT_DIR}" \ - --disable-nls \ - --enable-threads=posix \ - --enable-symvers=gnu \ - --enable-c99 \ - --enable-long-long \ - --enable-target-optspace \ - ${CT_CC_EXTRA_CONFIG} - - if [ "${CT_CANADIAN}" = "y" ]; then - CT_DoLog EXTRA "Building libiberty" - CT_DoExecLog ALL make ${PARALLELMFLAGS} all-build-libiberty - fi - - CT_DoLog EXTRA "Building final compiler" - CT_DoExecLog ALL make ${PARALLELMFLAGS} all - - CT_DoLog EXTRA "Installing final compiler" - CT_DoExecLog ALL make install - - # Create a symlink ${CT_TARGET}-cc to ${CT_TARGET}-gcc to always be able - # to call the C compiler with the same, somewhat canonical name. - ln -sv "${CT_PREFIX_DIR}/bin/${CT_TARGET}"-{g,}cc 2>&1 |CT_DoLog ALL - - CT_EndStep -} diff --git a/scripts/build/kernel/none.sh b/scripts/build/kernel/none.sh new file mode 100644 index 0000000..2dfda41 --- /dev/null +++ b/scripts/build/kernel/none.sh @@ -0,0 +1,19 @@ +# This file declares functions for bare metal kernel (IE. none) +# Copyright 2008 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +do_print_filename() { + : +} + +do_kernel_get() { + : +} + +do_kernel_extract() { + : +} + +do_kernel_headers() { + : +} diff --git a/scripts/build/libc/eglibc.sh b/scripts/build/libc/eglibc.sh new file mode 100644 index 0000000..6b6e718 --- /dev/null +++ b/scripts/build/libc/eglibc.sh @@ -0,0 +1,283 @@ +# eglibc build functions (initially by Thomas JOURDAN). + +do_print_filename() { + [ "${CT_LIBC}" = "eglibc" ] || return 0 + echo "eglibc-${CT_LIBC_VERSION}" + for addon in $(do_libc_add_ons_list " "); do + # NPTL addon is not to be downloaded, in any case + [ "${addon}" = "nptl" ] && continue || true + echo "eglibc-${addon}-${CT_LIBC_VERSION}" + done +} + +# Download eglibc repository +do_eglibc_get() { + CT_HasOrAbort svn + + case "${CT_LIBC_VERSION}" in + trunk) svn_url="svn://svn.eglibc.org/trunk";; + *) svn_url="svn://svn.eglibc.org/branches/eglibc-${CT_LIBC_VERSION}";; + esac + + CT_MktempDir tmp_dir + CT_Pushd "${tmp_dir}" + + case "${CT_EGLIBC_CHECKOUT}" in + y) svn_action="checkout";; + *) svn_action="export --force";; + esac + + CT_DoSetProxy ${CT_PROXY_TYPE} + CT_DoExecLog ALL svn ${svn_action} -r "${CT_EGLIBC_REVISION:-HEAD}" "${svn_url}" . 2>&1 + + # Compress eglibc + CT_DoExecLog ALL mv libc "${CT_LIBC_FILE}" + CT_DoExecLog ALL tar cjf "${CT_TARBALLS_DIR}/${CT_LIBC_FILE}.tar.bz2" "${CT_LIBC_FILE}" + + # Compress linuxthreads, localedef and ports + # Assign them the name the way ct-ng like it + for addon in linuxthreads localedef ports; do + CT_DoExecLog ALL tar cjf "${CT_TARBALLS_DIR}/${CT_LIBC}-${addon}-${CT_LIBC_VERSION}.tar.bz2" "${addon}" + done + + CT_Popd + + # Remove source files + CT_DoExecLog ALL rm -rf "${tmp_dir}" +} + +# Download glibc +do_libc_get() { + # eglibc is only available through subversion, there are no + # snapshots available. Moreover, addons will be downloaded + # simultaneously. + + # build filename + eglibc="${CT_LIBC_FILE}.tar.bz2" + eglibc_linuxthreads="${CT_LIBC}-linuxthreads-${CT_LIBC_VERSION}.tar.bz2" + eglibc_localedef="${CT_LIBC}-localedef-${CT_LIBC_VERSION}.tar.bz2" + eglibc_ports="${CT_LIBC}-ports-${CT_LIBC_VERSION}.tar.bz2" + + # Check if every tarballs are already present + if [ -a "${CT_TARBALLS_DIR}/${eglibc}" ] && \ + [ -a "${CT_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \ + [ -a "${CT_TARBALLS_DIR}/${eglibc_localedef}" ] && \ + [ -a "${CT_TARBALLS_DIR}/${eglibc_ports}" ]; then + CT_DoLog DEBUG "Already have 'eglibc-${CT_LIBC_VERSION}'" + return 0 + fi + + if [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc}" ] && \ + [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \ + [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}" ] && \ + [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}" ] && \ + [ "${CT_FORCE_DOWNLOAD}" != "y" ]; then + CT_DoLog DEBUG "Got 'eglibc-${CT_LIBC_VERSION}' from local storage" + for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do + CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}" "${CT_TARBALLS_DIR}/${file}" + done + return 0 + fi + + # Not found locally, try from the network + CT_DoLog EXTRA "Retrieving 'eglibc-${CT_LIBC_VERSION}'" + do_eglibc_get + + if [ "${CT_SAVE_TARBALLS}" = "y" ]; then + CT_DoLog EXTRA "Saving 'eglibc-${CT_LIBC_VERSION}' to local storage" + for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do + CT_DoExecLog ALL mv -f "${CT_TARBALLS_DIR}/${file}" "${CT_LOCAL_TARBALLS_DIR}" + CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}" "${CT_TARBALLS_DIR}/${file}" + done + fi + + return 0 +} + +# Extract eglibc +do_libc_extract() { + CT_ExtractAndPatch "${CT_LIBC_FILE}" + + # C library addons + for addon in $(do_libc_add_ons_list " "); do + # NPTL addon is not to be extracted, in any case + [ "${addon}" = "nptl" ] && continue || true + CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" + done + + return 0 +} + +# There is nothing to do for eglibc check config +do_libc_check_config() { + : +} + +# This function installs the glibc headers needed to build the core compiler +do_libc_headers() { + # Instead of doing two time the same actions, headers will + # be installed with start files + : +} + +# Build and install start files +do_libc_start_files() { + CT_DoStep INFO "Installing C library headers / start files" + + mkdir -p "${CT_BUILD_DIR}/build-libc-startfiles" + cd "${CT_BUILD_DIR}/build-libc-startfiles" + + CT_DoLog EXTRA "Configuring C library" + + cross_cc=$(CT_Which "${CT_TARGET}-gcc") + cross_cxx=$(CT_Which "${CT_TARGET}-g++") + cross_ar=$(CT_Which "${CT_TARGET}-ar") + cross_ranlib=$(CT_Which "${CT_TARGET}-ranlib") + + CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'" + CT_DoLog DEBUG "Using g++ for target: '${cross_cxx}'" + CT_DoLog DEBUG "Using ar for target: '${cross_ar}'" + CT_DoLog DEBUG "Using ranlib for target: '${cross_ranlib}'" + + BUILD_CC=${CT_CC_NATIVE} \ + CC=${cross_cc} \ + CXX=${cross_cxx} \ + AR=${cross_ar} \ + RANLIB=${cross_ranlib} \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ + --prefix=/usr \ + --with-headers="${CT_HEADERS_DIR}" \ + --build="${CT_UNIQ_BUILD}" \ + --host="${CT_TARGET}" \ + --disable-profile \ + --without-gd \ + --without-cvs \ + --enable-add-ons + + CT_DoLog EXTRA "Installing C library headers" + + # use the 'install-headers' makefile target to install the + # headers + + CT_DoExecLog ALL \ + make install-headers \ + install_root=${CT_SYSROOT_DIR} \ + install-bootstrap-headers=yes + + CT_DoLog EXTRA "Installing C library start files" + + # there are a few object files needed to link shared libraries, + # which we build and install by hand + + CT_DoExecLog ALL mkdir -p ${CT_SYSROOT_DIR}/usr/lib + CT_DoExecLog ALL make csu/subdir_lib + CT_DoExecLog ALL cp csu/crt1.o csu/crti.o csu/crtn.o \ + ${CT_SYSROOT_DIR}/usr/lib + + # Finally, 'libgcc_s.so' requires a 'libc.so' to link against. + # However, since we will never actually execute its code, + # it doesn't matter what it contains. So, treating '/dev/null' + # as a C source file, we produce a dummy 'libc.so' in one step + + CT_DoExecLog ALL ${cross_cc} -nostdlib -nostartfiles -shared -x c /dev/null -o ${CT_SYSROOT_DIR}/usr/lib/libc.so + + CT_EndStep +} + +# This function builds and install the full glibc +do_libc() { + CT_DoStep INFO "Installing C library" + + mkdir -p "${CT_BUILD_DIR}/build-libc" + cd "${CT_BUILD_DIR}/build-libc" + + CT_DoLog EXTRA "Configuring C library" + + # Add some default glibc config options if not given by user. + # We don't need to be conditional on wether the user did set different + # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG is passed after extra_config + + extra_config="--enable-kernel=$(echo ${CT_LIBC_GLIBC_MIN_KERNEL} |sed -r -e 's/^([^.]+\.[^.]+\.[^.]+)(|\.[^.]+)$/\1/;')" + + case "${CT_THREADS}" in + nptl) extra_config="${extra_config} --with-__thread --with-tls";; + linuxthreads) extra_config="${extra_config} --with-__thread --without-tls --without-nptl";; + none) extra_config="${extra_config} --without-__thread --without-nptl" + case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in + *-tls*) ;; + *) extra_config="${extra_config} --without-tls";; + esac + ;; + esac + + case "${CT_SHARED_LIBS}" in + y) extra_config="${extra_config} --enable-shared";; + *) extra_config="${extra_config} --disable-shared";; + esac + + case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in + y,) extra_config="${extra_config} --with-fp";; + ,y) extra_config="${extra_config} --without-fp";; + esac + + case "$(do_libc_add_ons_list ,)" in + "") ;; + *) extra_config="${extra_config} --enable-add-ons=$(do_libc_add_ons_list ,)";; + esac + + extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}" + + cross_cc=$(CT_Which "${CT_TARGET}-gcc") + + CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'" + CT_DoLog DEBUG "Configuring with addons : '$(do_libc_add_ons_list ,)'" + CT_DoLog DEBUG "Extra config args passed: '${extra_config}'" + CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'" + + BUILD_CC=${CT_CC_NATIVE} \ + CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \ + CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \ + AR=${CT_TARGET}-ar \ + RANLIB=${CT_TARGET}-ranlib \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ + --prefix=/usr \ + --with-headers="${CT_HEADERS_DIR}" \ + --build=${CT_UNIQ_BUILD} \ + --host=${CT_TARGET} \ + --disable-profile \ + --without-gd \ + --without-cvs \ + ${extra_config} \ + ${CT_LIBC_GLIBC_EXTRA_CONFIG} + + CT_DoLog EXTRA "Building C library" + + CT_DoExecLog ALL make + + CT_DoLog EXTRA "Installing C library" + + CT_DoExecLog ALL make install install_root="${CT_SYSROOT_DIR}" + + CT_EndStep +} + +# This function finishes the glibc install +do_libc_finish() { + # Nothing to be done for eglibc + : +} + +# Build up the addons list, separated with $1 +do_libc_add_ons_list() { + local sep="$1" + local addons_list=$(echo "${CT_LIBC_ADDONS_LIST//,/${sep}}" |tr -s ,) + case "${CT_THREADS}" in + none) ;; + *) addons_list="${addons_list}${sep}${CT_THREADS}";; + esac + [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports" + addons_list="${addons_list%%${sep}}" + echo "${addons_list##${sep}}" +} diff --git a/scripts/build/libc/glibc.sh b/scripts/build/libc/glibc.sh new file mode 100644 index 0000000..b864a5b --- /dev/null +++ b/scripts/build/libc/glibc.sh @@ -0,0 +1,531 @@ +# This file adds functions to build glibc +# Copyright 2007 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +do_print_filename() { + [ "${CT_LIBC}" = "glibc" ] || return 0 + echo "glibc-${CT_LIBC_VERSION}" + for addon in $(do_libc_add_ons_list " "); do + # NPTL addon is not to be downloaded, in any case + [ "${addon}" = "nptl" ] && continue || true + echo "glibc-${addon}-${CT_LIBC_VERSION}" + done +} + +# Download glibc +do_libc_get() { + # Ah! Not all GNU folks seem stupid. All glibc releases are in the same + # directory. Good. Alas, there is no snapshot there. I'll deal with them + # later on... :-/ + CT_GetFile "${CT_LIBC_FILE}" \ + {ftp,http}://ftp.gnu.org/gnu/glibc \ + ftp://gcc.gnu.org/pub/glibc/releases \ + ftp://gcc.gnu.org/pub/glibc/snapshots + + # C library addons + for addon in $(do_libc_add_ons_list " "); do + # NPTL addon is not to be downloaded, in any case + [ "${addon}" = "nptl" ] && continue || true + CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" \ + {ftp,http}://ftp.gnu.org/gnu/glibc \ + ftp://gcc.gnu.org/pub/glibc/releases \ + ftp://gcc.gnu.org/pub/glibc/snapshots + done + + return 0 +} + +# Extract glibc +do_libc_extract() { + CT_ExtractAndPatch "${CT_LIBC_FILE}" + + # C library addons + for addon in $(do_libc_add_ons_list " "); do + # NPTL addon is not to be extracted, in any case + [ "${addon}" = "nptl" ] && continue || true + CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" + done + + return 0 +} + +# There is nothing to do for glibc check config +do_libc_check_config() { + : +} + +# This function installs the glibc headers needed to build the core compiler +do_libc_headers() { + # Only need to install bootstrap glibc headers for gcc-3.0 and above? Or maybe just gcc-3.3 and above? + # See also http://gcc.gnu.org/PR8180, which complains about the need for this step. + grep -q 'gcc-[34]' "${CT_SRC_DIR}/${CT_CC_FILE}/ChangeLog" 2>/dev/null || return 0 + + CT_DoStep INFO "Installing C library headers" + + mkdir -p "${CT_BUILD_DIR}/build-libc-headers" + cd "${CT_BUILD_DIR}/build-libc-headers" + + CT_DoLog EXTRA "Configuring C library" + + # The following three things have to be done to build glibc-2.3.x, but they don't hurt older versions. + # 1. override CC to keep glibc's configure from using $TARGET-gcc. + # 2. disable linuxthreads, which needs a real cross-compiler to generate tcb-offsets.h properly + # 3. build with gcc 3.2 or later + # Compare these options with the ones used when building glibc for real below - they're different. + # As of glibc-2.3.2, to get this step to work for hppa-linux, you need --enable-hacker-mode + # so when configure checks to make sure gcc has access to the assembler you just built... + # Alternately, we could put ${PREFIX}/${TARGET}/bin on the path. + # Set --build so maybe we don't have to specify "cross-compiling=yes" below (haven't tried yet) + # Note: the warning + # "*** WARNING: Are you sure you do not want to use the `linuxthreads'" + # *** add-on?" + # is ok here, since all we want are the basic headers at this point. + # Override libc_cv_ppc_machine so glibc-cvs doesn't complain + # 'a version of binutils that supports .machine "altivec" is needed'. + + addons_config="--enable-add-ons=$(do_libc_add_ons_list ,)" + # We need to remove any threading addon when installing headers + addons_config="${addons_config//nptl/}" + addons_config="${addons_config//linuxthreads/}" + addons_config=$(echo "${addons_config}" |sed -r -e 's/^,+//; s/,+$//; s/,+/,/g;') + + cross_cc=$(CT_Which "${CT_TARGET}-gcc") + CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'" + CT_DoLog DEBUG "Extra config passed : '${addons_config}'" + + libc_cv_ppc_machine=yes \ + CC=${cross_cc} \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ + --build="${CT_UNIQ_BUILD}" \ + --host="${CT_TARGET}" \ + --prefix=/usr \ + --with-headers="${CT_HEADERS_DIR}" \ + --without-cvs \ + --disable-sanity-checks \ + --enable-hacker-mode \ + ${addons_config} \ + --without-nptl + + CT_DoLog EXTRA "Installing C library headers" + + if grep -q GLIBC_2.3 "${CT_SRC_DIR}/${CT_LIBC_FILE}/ChangeLog"; then + # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, + # which fails without a real cross-compiler. + # Fortunately, we don't need errlist-compat.c, since we just need .h + # files, so work around this by creating a fake errlist-compat.c and + # satisfying its dependencies. + # Another workaround might be to tell configure to not use any cross + # options to $(CC). + # The real fix would be to get install-headers to not generate + # errlist-compat.c. + # Note: BOOTSTRAP_GCC is used by: + # patches/glibc-2.3.5/glibc-mips-bootstrap-gcc-header-install.patch + + libc_cv_ppc_machine=yes \ + CT_DoExecLog ALL \ + make CFLAGS="-O -DBOOTSTRAP_GCC" \ + OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ + sysdeps/gnu/errlist.c + mkdir -p stdio-common + + # sleep for 2 seconds for benefit of filesystems with lousy time + # resolution, like FAT, so make knows for sure errlist-compat.c doesn't + # need generating + sleep 2 + CT_DoExecLog ALL touch stdio-common/errlist-compat.c + fi + # Note: BOOTSTRAP_GCC (see above) + libc_cv_ppc_machine=yes \ + CT_DoExecLog ALL \ + make cross-compiling=yes \ + install_root=${CT_SYSROOT_DIR} \ + CFLAGS="-O -DBOOTSTRAP_GCC" \ + ${LIBC_SYSROOT_ARG} \ + OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ + install-headers + + # Two headers -- stubs.h and features.h -- aren't installed by install-headers, + # so do them by hand. We can tolerate an empty stubs.h for the moment. + # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html + mkdir -p "${CT_HEADERS_DIR}/gnu" + CT_DoExecLog ALL touch "${CT_HEADERS_DIR}/gnu/stubs.h" + CT_DoExecLog ALL cp -v "${CT_SRC_DIR}/${CT_LIBC_FILE}/include/features.h" \ + "${CT_HEADERS_DIR}/features.h" + + # Building the bootstrap gcc requires either setting inhibit_libc, or + # having a copy of stdio_lim.h... see + # http://sources.redhat.com/ml/libc-alpha/2003-11/msg00045.html + CT_DoExecLog ALL cp -v bits/stdio_lim.h "${CT_HEADERS_DIR}/bits/stdio_lim.h" + + # Following error building gcc-4.0.0's gcj: + # error: bits/syscall.h: No such file or directory + # solved by following copy; see http://sourceware.org/ml/crossgcc/2005-05/msg00168.html + # but it breaks arm, see http://sourceware.org/ml/crossgcc/2006-01/msg00091.html + [ "${CT_ARCH}" != "arm" ] && CT_DoExecLog ALL cp -v misc/syscall-list.h "${CT_HEADERS_DIR}/bits/syscall.h" || true + + # Those headers are to be manually copied so gcc can build properly + pthread_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/${CT_THREADS}/sysdeps/pthread/pthread.h" + pthreadtypes_h= + case "${CT_THREADS}" in + nptl) + # NOTE: for some archs, the pathes are different, but they are not + # supported by crosstool-NG right now. See original crosstool when they are. + pthread_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/${CT_THREADS}/sysdeps/pthread/pthread.h" + pthreadtypes_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/nptl/sysdeps/unix/sysv/linux/${CT_KERNEL_ARCH}/bits/pthreadtypes.h" + if [ ! -f "${pthreadtypes_h}" ]; then + pthreadtypes_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/${CT_LIBC}-ports-${CT_LIBC_VERSION}/sysdeps/unix/sysv/linux/${CT_KERNEL_ARCH}/nptl/bits/pthreadtypes.h" + fi + ;; + linuxthreads) + pthreadtypes_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h" + ;; + *) + pthread_h= + pthreadtypes_h= + ;; + esac + if [ -n "${pthread_h}" ]; then + CT_DoExecLog ALL cp -v "${pthread_h}" "${CT_HEADERS_DIR}/pthread.h" + fi + if [ -n "${pthreadtypes_h}" ]; then + CT_DoExecLog ALL cp -v "${pthreadtypes_h}" "${CT_HEADERS_DIR}/bits/pthreadtypes.h" + fi + + CT_EndStep +} + +# Build and install start files +do_libc_start_files() { + # Needed only in the NPTL case. Otherwise, return. + [ "${CT_THREADS}" = "nptl" ] || return 0 + + CT_DoStep INFO "Installing C library start files" + + mkdir -p "${CT_BUILD_DIR}/build-libc-startfiles" + cd "${CT_BUILD_DIR}/build-libc-startfiles" + + CT_DoLog EXTRA "Configuring C library" + + # Add some default glibc config options if not given by user. + extra_config="" + case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in + *enable-kernel*) ;; + *) extra_config="${extra_config} --enable-kernel=$(echo ${CT_LIBC_GLIBC_MIN_KERNEL} |sed -r -e 's/^([^.]+\.[^.]+\.[^.]+)(|\.[^.]+)$/\1/;')" + esac + case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in + *-tls*) ;; + *) extra_config="${extra_config} --with-tls" + esac + case "${CT_SHARED_LIBS}" in + y) extra_config="${extra_config} --enable-shared";; + *) extra_config="${extra_config} --disable-shared";; + esac + case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in + y,) extra_config="${extra_config} --with-fp";; + ,y) extra_config="${extra_config} --without-fp";; + esac + # Obviously, we want threads, as we come here only for NPTL + extra_config="${extra_config} --with-__thread" + + addons_config="--enable-add-ons=$(do_libc_add_ons_list ,)" + extra_config="${extra_config} ${addons_config}" + + # Add some default CC args + glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/') + glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/') + # In case we're using a snapshot, fake a >=2.6 version. + if [ "${CT_LIBC_V_LATEST}" = "y" \ + -o "${CT_LIBC_V_date}" = "y" ]; then + glibc_version_major=3 + glibc_version_minor=0 + fi + if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ + -o ${glibc_version_major} -gt 2 ]; then + # Don't use -pipe: configure chokes on it for glibc >= 2.6. + CT_Test 'Removing "-pipe" for use with glibc>=2.6' "${CT_USE_PIPES}" = "y" + extra_cc_args="${CT_CFLAGS_FOR_HOST/-pipe}" + else + extra_cc_args="${CT_CFLAGS_FOR_HOST}" + fi + extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}" + + cross_cc=$(CT_Which "${CT_TARGET}-gcc") + CT_DoLog DEBUG "Using gcc for target : '${cross_cc}'" + CT_DoLog DEBUG "Configuring with addons : '$(do_libc_add_ons_list ,)'" + CT_DoLog DEBUG "Extra config args passed: '${extra_config}'" + CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'" + + # Super-H really needs to set configparms as of gcc-3.4/glibc-2.3.2 + # note: this is awkward, doesn't work well if you need more than one + # line in configparms + echo ${CT_LIBC_GLIBC_CONFIGPARMS} > configparms + + echo "libc_cv_forced_unwind=yes" > config.cache + echo "libc_cv_c_cleanup=yes" >> config.cache + + # Please see the comment for the configure step in do_libc(). + + BUILD_CC=${CT_CC_NATIVE} \ + CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O " \ + CC="${cross_cc} ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \ + AR=${CT_TARGET}-ar \ + RANLIB=${CT_TARGET}-ranlib \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ + --prefix=/usr \ + --build="${CT_UNIQ_BUILD}" \ + --host=${CT_TARGET} \ + --without-cvs \ + --disable-profile \ + --disable-debug \ + --without-gd \ + --with-headers="${CT_HEADERS_DIR}" \ + --cache-file=config.cache \ + ${extra_config} \ + ${CT_LIBC_GLIBC_EXTRA_CONFIG} + + + #TODO: should check whether slibdir has been set in configparms to */lib64 + # and copy the startfiles into the appropriate libdir. + CT_DoLog EXTRA "Building C library start files" + CT_DoExecLog ALL make OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" csu/subdir_lib + + CT_DoLog EXTRA "Installing C library start files" + if [ "${CT_USE_SYSROOT}" = "y" ]; then + CT_DoExecLog ALL cp -fpv csu/crt[1in].o "${CT_SYSROOT_DIR}/usr/lib/" + else + CT_DoExecLog ALL cp -fpv csu/crt[1in].o "${CT_SYSROOT_DIR}/lib/" + fi + + CT_EndStep +} + +# This function builds and install the full glibc +do_libc() { + CT_DoStep INFO "Installing C library" + + mkdir -p "${CT_BUILD_DIR}/build-libc" + cd "${CT_BUILD_DIR}/build-libc" + + CT_DoLog EXTRA "Configuring C library" + + # Add some default glibc config options if not given by user. + # We don't need to be conditional on wether the user did set different + # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG is passed after extra_config + + extra_config="--enable-kernel=$(echo ${CT_LIBC_GLIBC_MIN_KERNEL} |sed -r -e 's/^([^.]+\.[^.]+\.[^.]+)(|\.[^.]+)$/\1/;')" + + case "${CT_THREADS}" in + nptl) extra_config="${extra_config} --with-__thread --with-tls";; + linuxthreads) extra_config="${extra_config} --with-__thread --without-tls --without-nptl";; + none) extra_config="${extra_config} --without-__thread --without-nptl" + case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in + *-tls*) ;; + *) extra_config="${extra_config} --without-tls";; + esac + ;; + esac + + case "${CT_SHARED_LIBS}" in + y) extra_config="${extra_config} --enable-shared";; + *) extra_config="${extra_config} --disable-shared";; + esac + + case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in + y,) extra_config="${extra_config} --with-fp";; + ,y) extra_config="${extra_config} --without-fp";; + esac + + case "$(do_libc_add_ons_list ,)" in + "") ;; + *) extra_config="${extra_config} --enable-add-ons=$(do_libc_add_ons_list ,)";; + esac + + # Add some default CC args + glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/') + glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/') + # In case we're using a snapshot, fake a >=2.6 version. + if [ "${CT_LIBC_V_LATEST}" = "y" \ + -o "${CT_LIBC_V_date}" = "y" ]; then + glibc_version_major=3 + glibc_version_minor=0 + fi + if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ + -o ${glibc_version_major} -gt 2 ]; then + # Don't use -pipe: configure chokes on it for glibc >= 2.6. + CT_Test 'Removing "-pipe" for use with glibc>=2.6' "${CT_USE_PIPES}" = "y" + extra_cc_args="${CT_CFLAGS_FOR_HOST/-pipe}" + else + extra_cc_args="${CT_CFLAGS_FOR_HOST}" + fi + extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}" + + cross_cc=$(CT_Which "${CT_TARGET}-gcc") + CT_DoLog DEBUG "Using gcc for target : '${cross_cc}'" + CT_DoLog DEBUG "Configuring with addons : '$(do_libc_add_ons_list ,)'" + CT_DoLog DEBUG "Extra config args passed: '${extra_config}'" + CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'" + + # sh3 and sh4 really need to set configparms as of gcc-3.4/glibc-2.3.2 + # note: this is awkward, doesn't work well if you need more than one line in configparms + echo ${CT_LIBC_GLIBC_CONFIGPARMS} > configparms + + # For glibc 2.3.4 and later we need to set some autoconf cache + # variables, because nptl/sysdeps/pthread/configure.in does not + # work when cross-compiling. + if [ "${CT_THREADS}" = "nptl" ]; then + echo libc_cv_forced_unwind=yes + echo libc_cv_c_cleanup=yes + fi >config.cache + + # Configure with --prefix the way we want it on the target... + # There are a whole lot of settings here. You'll probably want + # to read up on what they all mean, and customize a bit, possibly by setting GLIBC_EXTRA_CONFIG + # Compare these options with the ones used when installing the glibc headers above - they're different. + # Adding "--without-gd" option to avoid error "memusagestat.c:36:16: gd.h: No such file or directory" + # See also http://sources.redhat.com/ml/libc-alpha/2000-07/msg00024.html. + # Set BUILD_CC, or you won't be able to build datafiles + # Set --build, else glibc-2.3.2 will think you're not cross-compiling, and try to run the test programs + + # OK. I'm fed up with those folks telling me what I should do. + # I don't configure nptl? Well, maybe that's purposedly because + # I don't want nptl! --disable-sanity-checks will shut up those + # silly messages. GNU folks again, he? + + BUILD_CC=${CT_CC_NATIVE} \ + CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \ + CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \ + AR=${CT_TARGET}-ar \ + RANLIB=${CT_TARGET}-ranlib \ + CT_DoExecLog ALL \ + "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ + --prefix=/usr \ + --build=${CT_UNIQ_BUILD} \ + --host=${CT_TARGET} \ + --without-cvs \ + --disable-profile \ + --disable-debug \ + --without-gd \ + --disable-sanity-checks \ + --cache-file=config.cache \ + --with-headers="${CT_HEADERS_DIR}" \ + ${extra_config} \ + ${CT_LIBC_GLIBC_EXTRA_CONFIG} + + if grep -l '^install-lib-all:' "${CT_SRC_DIR}/${CT_LIBC_FILE}/Makerules" > /dev/null; then + # nptl-era glibc. + # If the install-lib-all target (which is added by our make-install-lib-all.patch) + # is present, it means we're building glibc-2.3.3 or later, and we can't + # build programs yet, as they require libeh, which won't be installed + # until full build of gcc + # YEM-FIXME: This comment is misleading: latest glibc-s do not have the + # make-install-lib-all.patch applied, so do not pass through this + # part of the if statement; nonetheless, they do build, and + # the result is useable (maybe the dual-pass core gcc is + # responsible for this). + GLIBC_INITIAL_BUILD_RULE=lib + GLIBC_INITIAL_INSTALL_RULE="install-lib-all install-headers" + GLIBC_INSTALL_APPS_LATER=yes + else + # classic glibc. + # We can build and install everything with the bootstrap compiler. + # YEM-FIXME: See the above FIXME as well. + GLIBC_INITIAL_BUILD_RULE=all + GLIBC_INITIAL_INSTALL_RULE=install + GLIBC_INSTALL_APPS_LATER=no + fi + + # If this fails with an error like this: + # ... linux/autoconf.h: No such file or directory + # then you need to set the KERNELCONFIG variable to point to a .config file for this arch. + # The following architectures are known to need kernel .config: alpha, arm, ia64, s390, sh, sparc + # Note: LD and RANLIB needed by glibc-2.1.3's c_stub directory, at least on macosx + # No need for PARALLELMFLAGS here, Makefile already reads this environment variable + CT_DoLog EXTRA "Building C library" + CT_DoExecLog ALL make LD=${CT_TARGET}-ld \ + RANLIB=${CT_TARGET}-ranlib \ + OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ + ${GLIBC_INITIAL_BUILD_RULE} + + CT_DoLog EXTRA "Installing C library" + CT_DoExecLog ALL make install_root="${CT_SYSROOT_DIR}" \ + ${LIBC_SYSROOT_ARG} \ + OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ + ${GLIBC_INITIAL_INSTALL_RULE} + + # This doesn't seem to work when building a crosscompiler, + # as it tries to execute localedef using the just-built ld.so!? + #CT_DoLog EXTRA "Installing locales" + #make localedata/install-locales install_root=${SYSROOT} 2>&1 |CT_DoLog ALL + + # Fix problems in linker scripts. + # + # 1. Remove absolute paths + # Any file in a list of known suspects that isn't a symlink is assumed to be a linker script. + # FIXME: test -h is not portable + # FIXME: probably need to check more files than just these three... + # Need to use sed instead of just assuming we know what's in libc.so because otherwise alpha breaks + # + # 2. Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html, + # needed to fix gcc-3.2.3/glibc-2.3.2 targeting arm + # + # To make "strip *.so.*" not fail (ptxdist does this), rename to .so_orig rather than .so.orig + CT_DoLog EXTRA "Fixing C library linker scripts" + for file in libc.so libpthread.so libgcc_s.so; do + for dir in lib lib64 usr/lib usr/lib64; do + if [ -f "${CT_SYSROOT_DIR}/${dir}/${file}" -a ! -L ${CT_SYSROOT_DIR}/$lib/$file ]; then + CT_DoExecLog ALL cp -v "${CT_SYSROOT_DIR}/${dir}/${file}" "${CT_SYSROOT_DIR}/${dir}/${file}_orig" + CT_DoLog DEBUG "Fixing '${CT_SYS_ROOT_DIR}/${dir}/${file}'" + CT_DoExecLog ALL sed -i -r -e 's,/usr/lib/,,g; + s,/usr/lib64/,,g; + s,/lib/,,g; + s,/lib64/,,g; + /BUG in libc.scripts.output-format.sed/d' "${CT_SYSROOT_DIR}/${dir}/${file}" + fi + done + done + + CT_EndStep +} + +# This function finishes the glibc install +do_libc_finish() { + # Finally, build and install glibc programs, now that libeh (if any) is installed + # Don't do this unless needed, 'cause it causes glibc-2.{1.3,2.2} to fail here with + # .../gcc-3.4.1-glibc-2.1.3/build-glibc/libc.so.6: undefined reference to `__deregister_frame_info' + # .../gcc-3.4.1-glibc-2.1.3/build-glibc/libc.so.6: undefined reference to `__register_frame_info' + [ "${GLIBC_INSTALL_APPS_LATER}" = "yes" ] || return 0 + + CT_DoStep INFO "Finishing C library" + + cd "${CT_BUILD_DIR}/build-libc" + + CT_DoLog EXTRA "Re-building C library" + CT_DoExecLog ALL make LD=${CT_TARGET}-ld RANLIB=${CT_TARGET}-ranlib + + CT_DoLog EXTRA "Installing missing C library components" + # note: should do full install and then fix linker scripts, but this is faster + for t in bin rootsbin sbin data others; do + CT_DoExecLog ALL make install_root="${CT_SYSROOT_DIR}" \ + ${LIBC_SYSROOT_ARG} \ + OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ + install-${t} + done + + CT_EndStep +} + +# Build up the addons list, separated with $1 +do_libc_add_ons_list() { + local sep="$1" + local addons_list=$(echo "${CT_LIBC_ADDONS_LIST//,/${sep}}" |tr -s ,) + case "${CT_THREADS}" in + none) ;; + *) addons_list="${addons_list}${sep}${CT_THREADS}";; + esac + [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports" + addons_list="${addons_list%%${sep}}" + echo "${addons_list##${sep}}" +} + diff --git a/scripts/build/libc/none.sh b/scripts/build/libc/none.sh new file mode 100644 index 0000000..4053459 --- /dev/null +++ b/scripts/build/libc/none.sh @@ -0,0 +1,36 @@ +# This file adds functions to build the C library for bare metal (IE. none) +# Copyright 2008 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +do_print_filename() { + : +} + +do_libc_get() { + : +} + +do_libc_extract() { + : +} + +do_libc_check_config() { + : +} + +do_libc_headers() { + : +} + +# Build and install start files +do_libc_start_files() { + : +} + +do_libc() { + : +} + +do_libc_finish() { + : +} diff --git a/scripts/build/libc/uClibc.sh b/scripts/build/libc/uClibc.sh new file mode 100644 index 0000000..85f5997 --- /dev/null +++ b/scripts/build/libc/uClibc.sh @@ -0,0 +1,313 @@ +# This file declares functions to install the uClibc C library +# Copyright 2007 Yann E. MORIN +# Licensed under the GPL v2. See COPYING in the root of this package + +do_print_filename() { + [ "${CT_LIBC}" = "uClibc" ] || return 0 + echo "uClibc-${CT_LIBC_VERSION}" + [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && echo "uClibc-locale-030818" || true +} + +# Download uClibc +do_libc_get() { + libc_src="http://www.uclibc.org/downloads + http://www.uclibc.org/downloads/snapshots + http://www.uclibc.org/downloads/old-releases" + # For uClibc, we have almost every thing: releases, and snapshots + # for the last month or so. We'll have to deal with svn revisions + # later... + CT_GetFile "${CT_LIBC_FILE}" ${libc_src} + # uClibc locales + [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src} || true + + return 0 +} + +# Extract uClibc +do_libc_extract() { + CT_ExtractAndPatch "${CT_LIBC_FILE}" + # uClibc locales + [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818" || true + + return 0 +} + +# Check that uClibc has been previously configured +do_libc_check_config() { + CT_DoStep INFO "Checking C library configuration" + + CT_TestOrAbort "You did not provide a uClibc config file!" -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" -a -f "${CT_LIBC_UCLIBC_CONFIG_FILE}" + + if egrep '^KERNEL_SOURCE=' "${CT_LIBC_UCLIBC_CONFIG_FILE}" >/dev/null 2>&1; then + CT_DoLog WARN "Your uClibc version refers to the kernel _sources_, which is bad." + CT_DoLog WARN "I can't guarantee that our little hack will work. Please try to upgrade." + fi + + CT_DoLog EXTRA "Munging uClibc configuration" + mungeuClibcConfig "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${CT_BUILD_DIR}/uClibc.config" + + CT_EndStep +} + +# This functions installs uClibc's headers +do_libc_headers() { + # Only need to install bootstrap uClibc headers for gcc-3.0 and above? Or maybe just gcc-3.3 and above? + # See also http://gcc.gnu.org/PR8180, which complains about the need for this step. + grep -q 'gcc-[34]' "${CT_SRC_DIR}/${CT_CC_FILE}/ChangeLog" 2>/dev/null || return 0 + + CT_DoStep INFO "Installing C library headers" + + mkdir -p "${CT_BUILD_DIR}/build-libc-headers" + cd "${CT_BUILD_DIR}/build-libc-headers" + + # Simply copy files until uClibc has the ablity to build out-of-tree + CT_DoLog EXTRA "Copying sources to build dir" + { cd "${CT_SRC_DIR}/${CT_LIBC_FILE}"; tar cf - .; } |tar xf - + + # Retrieve the config file + cp "${CT_BUILD_DIR}/uClibc.config" .config + + # uClibc uses the CROSS environment variable as a prefix to the + # compiler tools to use. Setting it to the empty string forces + # use of the native build host tools, which we need at this + # stage, as we don't have target tools yet. + CT_DoLog EXTRA "Applying configuration" + CT_DoYes "" |CT_DoExecLog ALL make CROSS= PREFIX="${CT_SYSROOT_DIR}/" oldconfig + + CT_DoLog EXTRA "Building headers" + CT_DoExecLog ALL make ${CT_LIBC_UCLIBC_VERBOSITY} CROSS= PREFIX="${CT_SYSROOT_DIR}/" headers + + CT_DoLog EXTRA "Installing headers" + CT_DoExecLog ALL make ${CT_LIBC_UCLIBC_VERBOSITY} CROSS= PREFIX="${CT_SYSROOT_DIR}/" install_dev + + CT_EndStep +} + +# Build and install start files +do_libc_start_files() { + : +} + +# This function build and install the full uClibc +do_libc() { + CT_DoStep INFO "Installing C library" + + mkdir -p "${CT_BUILD_DIR}/build-libc" + cd "${CT_BUILD_DIR}/build-libc" + + # Simply copy files until uClibc has the ablity to build out-of-tree + CT_DoLog EXTRA "Copying sources to build dir" + { cd "${CT_SRC_DIR}/${CT_LIBC_FILE}"; tar cf - .; } |tar xf - + + # Retrieve the config file + cp "${CT_BUILD_DIR}/uClibc.config" .config + + # uClibc uses the CROSS environment variable as a prefix to the compiler + # tools to use. The newly built tools should be in our path, so we need + # only give the correct name for them. + # Note about CFLAGS: In uClibc, CFLAGS are generated by Rules.mak, + # depending on the configuration of the library. That is, they are tailored + # to best fit the target. So it is useless and seems to be a bad thing to + # use LIBC_EXTRA_CFLAGS here. + CT_DoLog EXTRA "Applying configuration" + CT_DoYes "" |CT_DoExecLog ALL \ + make CROSS=${CT_TARGET}- \ + PREFIX="${CT_SYSROOT_DIR}/" \ + oldconfig + + # We do _not_ want to strip anything for now, in case we specifically + # asked for a debug toolchain, thus the STRIPTOOL= assignment + CT_DoLog EXTRA "Building C library" + CT_DoExecLog ALL \ + make CROSS=${CT_TARGET}- \ + PREFIX="${CT_SYSROOT_DIR}/" \ + STRIPTOOL=true \ + ${CT_LIBC_UCLIBC_VERBOSITY} \ + all + + # YEM-FIXME: we want to install libraries in $SYSROOT/lib, but we don't want + # to install headers in $SYSROOT/include, thus making only install_runtime. + # Plus, the headers were previously installed earlier with install_dev, so + # all should be well. Unfortunately, the install_dev target does not install + # crti.o and consorts... :-( So reverting to target 'install'. + # Note: PARALLELMFLAGS is not usefull for installation. + # We do _not_ want to strip anything for now, in case we specifically + # asked for a debug toolchain, thus the STRIPTOOL= assignment + CT_DoLog EXTRA "Installing C library" + CT_DoExecLog ALL \ + make CROSS=${CT_TARGET}- \ + PREFIX="${CT_SYSROOT_DIR}/" \ + STRIPTOOL=true \ + ${CT_LIBC_UCLIBC_VERBOSITY} \ + install + + CT_EndStep +} + +# This function is used to install those components needing the final C compiler +do_libc_finish() { + : +} + +# Initialises the .config file to sensible values +# $1: original file +# $2: munged file +mungeuClibcConfig() { + src_config_file="$1" + dst_config_file="$2" + munge_file="${CT_BUILD_DIR}/munge-uClibc-config.sed" + + # Start with a fresh file + rm -f "${munge_file}" + touch "${munge_file}" + + # Hack our target in the config file. + # Also remove stripping: its the responsibility of the + # firmware builder to strip or not. + cat >>"${munge_file}" <<-ENDSED +s/^(TARGET_.*)=y$/# \\1 is not set/ +s/^# TARGET_${CT_KERNEL_ARCH} is not set/TARGET_${CT_KERNEL_ARCH}=y/ +s/^TARGET_ARCH=".*"/TARGET_ARCH="${CT_KERNEL_ARCH}"/ +s/.*(DOSTRIP).*/# \\1 is not set/ +ENDSED + + # Ah. We may one day need architecture-specific handler here... + # Hack the ARM {E,O}ABI into the config file + if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then + cat >>"${munge_file}" <<-ENDSED +s/.*(CONFIG_ARM_OABI).*/# \\1 is not set/ +s/.*(CONFIG_ARM_EABI).*/\\1=y/ +ENDSED + else + cat >>"${munge_file}" <<-ENDSED +s/.*(CONFIG_ARM_OABI).*/\\1=y/ +s/.*(CONFIG_ARM_EABI).*/# \\1 is not set/ +ENDSED + fi + + # Accomodate for old and new uClibc versions, where the + # way to select between big/little endian has changed + case "${CT_ARCH_BE},${CT_ARCH_LE}" in + y,) cat >>"${munge_file}" <<-ENDSED +s/.*(ARCH_LITTLE_ENDIAN).*/# \\1 is not set/ +s/.*(ARCH_BIG_ENDIAN).*/\\1=y/ +s/.*(ARCH_WANTS_LITTLE_ENDIAN).*/# \\1 is not set/ +s/.*(ARCH_WANTS_BIG_ENDIAN).*/\\1=y/ +ENDSED + ;; + ,y) cat >>"${munge_file}" <<-ENDSED +s/.*(ARCH_LITTLE_ENDIAN).*/\\1=y/ +s/.*(ARCH_BIG_ENDIAN).*/# \\1 is not set/ +s/.*(ARCH_WANTS_LITTLE_ENDIAN).*/\\1=y/ +s/.*(ARCH_WANTS_BIG_ENDIAN).*/# \\1 is not set/ +ENDSED + ;; + esac + + # Accomodate for old and new uClibc version, where the + # way to select between hard/soft float has changed + case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in + y,) cat >>"${munge_file}" <<-ENDSED +s/^[^_]*(HAS_FPU).*/\\1=y/ +s/.*(UCLIBC_HAS_FPU).*/\\1=y/ +ENDSED + ;; + ,y) cat >>"${munge_file}" <<-ENDSED +s/^[^_]*(HAS_FPU).*/\\# \\1 is not set/ +s/.*(UCLIBC_HAS_FPU).*/# \\1 is not set/ +ENDSED + ;; + esac + + # Change paths to work with crosstool-NG + # From http://www.uclibc.org/cgi-bin/viewcvs.cgi?rev=16846&view=rev + # " we just want the kernel headers, not the whole kernel source ... + # " so people may need to update their paths slightly + quoted_kernel_source=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/include/?$,,; s,/,\\/,g;') + quoted_headers_dir=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/,\\/,g;') + # CROSS_COMPILER_PREFIX is left as is, as the CROSS parameter is forced on the command line + # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX, wich is the correct value of ${PREFIX}/${TARGET} + # Some (old) versions of uClibc use KERNEL_SOURCE (which is _wrong_), and + # newer versions use KERNEL_HEADERS (which is right). See: + cat >>"${munge_file}" <<-ENDSED +s/^DEVEL_PREFIX=".*"/DEVEL_PREFIX="\\/usr\\/"/ +s/^RUNTIME_PREFIX=".*"/RUNTIME_PREFIX="\\/"/ +s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="\\/lib\\/"/ +s/^KERNEL_SOURCE=".*"/KERNEL_SOURCE="${quoted_kernel_source}"/ +s/^KERNEL_HEADERS=".*"/KERNEL_HEADERS="${quoted_headers_dir}"/ +s/^UCLIBC_DOWNLOAD_PREGENERATED_LOCALE=y/\\# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE is not set/ +ENDSED + + if [ "${CT_USE_PIPES}" = "y" ]; then + if grep UCLIBC_EXTRA_CFLAGS extra/Configs/Config.in >/dev/null 2>&1; then + # Good, there is special provision for such things as -pipe! + cat >>"${munge_file}" <<-ENDSED +s/^(UCLIBC_EXTRA_CFLAGS=".*)"$/\\1 -pipe"/ +ENDSED + else + # Hack our -pipe into WARNINGS, which will be internally incorporated to + # CFLAGS. This a dirty hack, but yet needed + cat >> "${munge_file}" <<-ENDSED +s/^(WARNINGS=".*)"$/\\1 -pipe"/ +ENDSED + fi + fi + + # Force on options needed for C++ if we'll be making a C++ compiler. + # Note that the two PREGEN_LOCALE and the XLOCALE lines may be missing + # entirely if LOCALE is not set. If LOCALE was already set, we'll + # assume the user has already made all the appropriate generation + # arrangements. Note that having the uClibc Makefile download the + # pregenerated locales is not compatible with crosstool; besides, + # crosstool downloads them as part of getandpatch.sh. + if [ "${CT_CC_LANG_CXX}" = "y" ]; then + cat >>"${munge_file}" <<-ENDSED +s/^# DO_C99_MATH is not set/DO_C99_MATH=y/ +s/^# UCLIBC_CTOR_DTOR is not set/UCLIBC_CTOR_DTOR=y/ +# Add these three lines when doing C++? +s/^# UCLIBC_HAS_WCHAR is not set/UCLIBC_HAS_WCHAR=y/ +#s/^# UCLIBC_HAS_LOCALE is not set/UCLIBC_HAS_LOCALE=y\\nUCLIBC_PREGENERATED_LOCALE_DATA=y\\n\\# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set\\n\\# UCLIBC_HAS_XLOCALE is not set/ +s/^# UCLIBC_HAS_GNU_GETOPT is not set/UCLIBC_HAS_GNU_GETOPT=y/ +ENDSED + fi + + # Always build the libpthread_db + cat >>"${munge_file}" <<-ENDSED +s/^# PTHREADS_DEBUG_SUPPORT is not set.*/PTHREADS_DEBUG_SUPPORT=y/ +ENDSED + + # Force on debug options if asked for + case "${CT_LIBC_UCLIBC_DEBUG_LEVEL}" in + 0) + cat >>"${munge_file}" <<-ENDSED +s/^DODEBUG=y/# DODEBUG is not set/ +s/^DODEBUG_PT=y/# DODEBUG_PT is not set/ +s/^DOASSERTS=y/# DOASSERTS is not set/ +s/^SUPPORT_LD_DEBUG=y/# SUPPORT_LD_DEBUG is not set/ +s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/ +s/^UCLIBC_MALLOC_DEBUGGING=y/# UCLIBC_MALLOC_DEBUGGING is not set/ +ENDSED + ;; + 1) + cat >>"${munge_file}" <<-ENDSED +s/^# DODEBUG is not set.*/DODEBUG=y/ +s/^DODEBUG_PT=y/# DODEBUG_PT is not set/ +s/^DOASSERTS=y/# DOASSERTS is not set/ +s/^SUPPORT_LD_DEBUG=y/# SUPPORT_LD_DEBUG is not set/ +s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/ +s/^UCLIBC_MALLOC_DEBUGGING=y/# UCLIBC_MALLOC_DEBUGGING is not set/ +ENDSED + ;; + 2) + cat >>"${munge_file}" <<-ENDSED +s/^# DODEBUG is not set.*/DODEBUG=y/ +s/^# DODEBUG_PT is not set.*/DODEBUG_PT=y/ +s/^# DOASSERTS is not set.*/DOASSERTS=y/ +s/^# SUPPORT_LD_DEBUG is not set.*/SUPPORT_LD_DEBUG=y/ +s/^# SUPPORT_LD_DEBUG_EARLY is not set.*/SUPPORT_LD_DEBUG_EARLY=y/ +s/^# UCLIBC_MALLOC_DEBUGGING is not set/UCLIBC_MALLOC_DEBUGGING=y/ +ENDSED + ;; + esac + sed -r -f "${munge_file}" "${src_config_file}" >"${dst_config_file}" +} diff --git a/scripts/build/libc_eglibc.sh b/scripts/build/libc_eglibc.sh deleted file mode 100644 index 6b6e718..0000000 --- a/scripts/build/libc_eglibc.sh +++ /dev/null @@ -1,283 +0,0 @@ -# eglibc build functions (initially by Thomas JOURDAN). - -do_print_filename() { - [ "${CT_LIBC}" = "eglibc" ] || return 0 - echo "eglibc-${CT_LIBC_VERSION}" - for addon in $(do_libc_add_ons_list " "); do - # NPTL addon is not to be downloaded, in any case - [ "${addon}" = "nptl" ] && continue || true - echo "eglibc-${addon}-${CT_LIBC_VERSION}" - done -} - -# Download eglibc repository -do_eglibc_get() { - CT_HasOrAbort svn - - case "${CT_LIBC_VERSION}" in - trunk) svn_url="svn://svn.eglibc.org/trunk";; - *) svn_url="svn://svn.eglibc.org/branches/eglibc-${CT_LIBC_VERSION}";; - esac - - CT_MktempDir tmp_dir - CT_Pushd "${tmp_dir}" - - case "${CT_EGLIBC_CHECKOUT}" in - y) svn_action="checkout";; - *) svn_action="export --force";; - esac - - CT_DoSetProxy ${CT_PROXY_TYPE} - CT_DoExecLog ALL svn ${svn_action} -r "${CT_EGLIBC_REVISION:-HEAD}" "${svn_url}" . 2>&1 - - # Compress eglibc - CT_DoExecLog ALL mv libc "${CT_LIBC_FILE}" - CT_DoExecLog ALL tar cjf "${CT_TARBALLS_DIR}/${CT_LIBC_FILE}.tar.bz2" "${CT_LIBC_FILE}" - - # Compress linuxthreads, localedef and ports - # Assign them the name the way ct-ng like it - for addon in linuxthreads localedef ports; do - CT_DoExecLog ALL tar cjf "${CT_TARBALLS_DIR}/${CT_LIBC}-${addon}-${CT_LIBC_VERSION}.tar.bz2" "${addon}" - done - - CT_Popd - - # Remove source files - CT_DoExecLog ALL rm -rf "${tmp_dir}" -} - -# Download glibc -do_libc_get() { - # eglibc is only available through subversion, there are no - # snapshots available. Moreover, addons will be downloaded - # simultaneously. - - # build filename - eglibc="${CT_LIBC_FILE}.tar.bz2" - eglibc_linuxthreads="${CT_LIBC}-linuxthreads-${CT_LIBC_VERSION}.tar.bz2" - eglibc_localedef="${CT_LIBC}-localedef-${CT_LIBC_VERSION}.tar.bz2" - eglibc_ports="${CT_LIBC}-ports-${CT_LIBC_VERSION}.tar.bz2" - - # Check if every tarballs are already present - if [ -a "${CT_TARBALLS_DIR}/${eglibc}" ] && \ - [ -a "${CT_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \ - [ -a "${CT_TARBALLS_DIR}/${eglibc_localedef}" ] && \ - [ -a "${CT_TARBALLS_DIR}/${eglibc_ports}" ]; then - CT_DoLog DEBUG "Already have 'eglibc-${CT_LIBC_VERSION}'" - return 0 - fi - - if [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc}" ] && \ - [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc_linuxthreads}" ] && \ - [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc_localedef}" ] && \ - [ -a "${CT_LOCAL_TARBALLS_DIR}/${eglibc_ports}" ] && \ - [ "${CT_FORCE_DOWNLOAD}" != "y" ]; then - CT_DoLog DEBUG "Got 'eglibc-${CT_LIBC_VERSION}' from local storage" - for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do - CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}" "${CT_TARBALLS_DIR}/${file}" - done - return 0 - fi - - # Not found locally, try from the network - CT_DoLog EXTRA "Retrieving 'eglibc-${CT_LIBC_VERSION}'" - do_eglibc_get - - if [ "${CT_SAVE_TARBALLS}" = "y" ]; then - CT_DoLog EXTRA "Saving 'eglibc-${CT_LIBC_VERSION}' to local storage" - for file in ${eglibc} ${eglibc_linuxthreads} ${eglibc_localedef} ${eglibc_ports}; do - CT_DoExecLog ALL mv -f "${CT_TARBALLS_DIR}/${file}" "${CT_LOCAL_TARBALLS_DIR}" - CT_DoExecLog ALL ln -s "${CT_LOCAL_TARBALLS_DIR}/${file}" "${CT_TARBALLS_DIR}/${file}" - done - fi - - return 0 -} - -# Extract eglibc -do_libc_extract() { - CT_ExtractAndPatch "${CT_LIBC_FILE}" - - # C library addons - for addon in $(do_libc_add_ons_list " "); do - # NPTL addon is not to be extracted, in any case - [ "${addon}" = "nptl" ] && continue || true - CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" - done - - return 0 -} - -# There is nothing to do for eglibc check config -do_libc_check_config() { - : -} - -# This function installs the glibc headers needed to build the core compiler -do_libc_headers() { - # Instead of doing two time the same actions, headers will - # be installed with start files - : -} - -# Build and install start files -do_libc_start_files() { - CT_DoStep INFO "Installing C library headers / start files" - - mkdir -p "${CT_BUILD_DIR}/build-libc-startfiles" - cd "${CT_BUILD_DIR}/build-libc-startfiles" - - CT_DoLog EXTRA "Configuring C library" - - cross_cc=$(CT_Which "${CT_TARGET}-gcc") - cross_cxx=$(CT_Which "${CT_TARGET}-g++") - cross_ar=$(CT_Which "${CT_TARGET}-ar") - cross_ranlib=$(CT_Which "${CT_TARGET}-ranlib") - - CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'" - CT_DoLog DEBUG "Using g++ for target: '${cross_cxx}'" - CT_DoLog DEBUG "Using ar for target: '${cross_ar}'" - CT_DoLog DEBUG "Using ranlib for target: '${cross_ranlib}'" - - BUILD_CC=${CT_CC_NATIVE} \ - CC=${cross_cc} \ - CXX=${cross_cxx} \ - AR=${cross_ar} \ - RANLIB=${cross_ranlib} \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ - --prefix=/usr \ - --with-headers="${CT_HEADERS_DIR}" \ - --build="${CT_UNIQ_BUILD}" \ - --host="${CT_TARGET}" \ - --disable-profile \ - --without-gd \ - --without-cvs \ - --enable-add-ons - - CT_DoLog EXTRA "Installing C library headers" - - # use the 'install-headers' makefile target to install the - # headers - - CT_DoExecLog ALL \ - make install-headers \ - install_root=${CT_SYSROOT_DIR} \ - install-bootstrap-headers=yes - - CT_DoLog EXTRA "Installing C library start files" - - # there are a few object files needed to link shared libraries, - # which we build and install by hand - - CT_DoExecLog ALL mkdir -p ${CT_SYSROOT_DIR}/usr/lib - CT_DoExecLog ALL make csu/subdir_lib - CT_DoExecLog ALL cp csu/crt1.o csu/crti.o csu/crtn.o \ - ${CT_SYSROOT_DIR}/usr/lib - - # Finally, 'libgcc_s.so' requires a 'libc.so' to link against. - # However, since we will never actually execute its code, - # it doesn't matter what it contains. So, treating '/dev/null' - # as a C source file, we produce a dummy 'libc.so' in one step - - CT_DoExecLog ALL ${cross_cc} -nostdlib -nostartfiles -shared -x c /dev/null -o ${CT_SYSROOT_DIR}/usr/lib/libc.so - - CT_EndStep -} - -# This function builds and install the full glibc -do_libc() { - CT_DoStep INFO "Installing C library" - - mkdir -p "${CT_BUILD_DIR}/build-libc" - cd "${CT_BUILD_DIR}/build-libc" - - CT_DoLog EXTRA "Configuring C library" - - # Add some default glibc config options if not given by user. - # We don't need to be conditional on wether the user did set different - # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG is passed after extra_config - - extra_config="--enable-kernel=$(echo ${CT_LIBC_GLIBC_MIN_KERNEL} |sed -r -e 's/^([^.]+\.[^.]+\.[^.]+)(|\.[^.]+)$/\1/;')" - - case "${CT_THREADS}" in - nptl) extra_config="${extra_config} --with-__thread --with-tls";; - linuxthreads) extra_config="${extra_config} --with-__thread --without-tls --without-nptl";; - none) extra_config="${extra_config} --without-__thread --without-nptl" - case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in - *-tls*) ;; - *) extra_config="${extra_config} --without-tls";; - esac - ;; - esac - - case "${CT_SHARED_LIBS}" in - y) extra_config="${extra_config} --enable-shared";; - *) extra_config="${extra_config} --disable-shared";; - esac - - case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in - y,) extra_config="${extra_config} --with-fp";; - ,y) extra_config="${extra_config} --without-fp";; - esac - - case "$(do_libc_add_ons_list ,)" in - "") ;; - *) extra_config="${extra_config} --enable-add-ons=$(do_libc_add_ons_list ,)";; - esac - - extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}" - - cross_cc=$(CT_Which "${CT_TARGET}-gcc") - - CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'" - CT_DoLog DEBUG "Configuring with addons : '$(do_libc_add_ons_list ,)'" - CT_DoLog DEBUG "Extra config args passed: '${extra_config}'" - CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'" - - BUILD_CC=${CT_CC_NATIVE} \ - CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \ - CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \ - AR=${CT_TARGET}-ar \ - RANLIB=${CT_TARGET}-ranlib \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ - --prefix=/usr \ - --with-headers="${CT_HEADERS_DIR}" \ - --build=${CT_UNIQ_BUILD} \ - --host=${CT_TARGET} \ - --disable-profile \ - --without-gd \ - --without-cvs \ - ${extra_config} \ - ${CT_LIBC_GLIBC_EXTRA_CONFIG} - - CT_DoLog EXTRA "Building C library" - - CT_DoExecLog ALL make - - CT_DoLog EXTRA "Installing C library" - - CT_DoExecLog ALL make install install_root="${CT_SYSROOT_DIR}" - - CT_EndStep -} - -# This function finishes the glibc install -do_libc_finish() { - # Nothing to be done for eglibc - : -} - -# Build up the addons list, separated with $1 -do_libc_add_ons_list() { - local sep="$1" - local addons_list=$(echo "${CT_LIBC_ADDONS_LIST//,/${sep}}" |tr -s ,) - case "${CT_THREADS}" in - none) ;; - *) addons_list="${addons_list}${sep}${CT_THREADS}";; - esac - [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports" - addons_list="${addons_list%%${sep}}" - echo "${addons_list##${sep}}" -} diff --git a/scripts/build/libc_glibc.sh b/scripts/build/libc_glibc.sh deleted file mode 100644 index b864a5b..0000000 --- a/scripts/build/libc_glibc.sh +++ /dev/null @@ -1,531 +0,0 @@ -# This file adds functions to build glibc -# Copyright 2007 Yann E. MORIN -# Licensed under the GPL v2. See COPYING in the root of this package - -do_print_filename() { - [ "${CT_LIBC}" = "glibc" ] || return 0 - echo "glibc-${CT_LIBC_VERSION}" - for addon in $(do_libc_add_ons_list " "); do - # NPTL addon is not to be downloaded, in any case - [ "${addon}" = "nptl" ] && continue || true - echo "glibc-${addon}-${CT_LIBC_VERSION}" - done -} - -# Download glibc -do_libc_get() { - # Ah! Not all GNU folks seem stupid. All glibc releases are in the same - # directory. Good. Alas, there is no snapshot there. I'll deal with them - # later on... :-/ - CT_GetFile "${CT_LIBC_FILE}" \ - {ftp,http}://ftp.gnu.org/gnu/glibc \ - ftp://gcc.gnu.org/pub/glibc/releases \ - ftp://gcc.gnu.org/pub/glibc/snapshots - - # C library addons - for addon in $(do_libc_add_ons_list " "); do - # NPTL addon is not to be downloaded, in any case - [ "${addon}" = "nptl" ] && continue || true - CT_GetFile "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" \ - {ftp,http}://ftp.gnu.org/gnu/glibc \ - ftp://gcc.gnu.org/pub/glibc/releases \ - ftp://gcc.gnu.org/pub/glibc/snapshots - done - - return 0 -} - -# Extract glibc -do_libc_extract() { - CT_ExtractAndPatch "${CT_LIBC_FILE}" - - # C library addons - for addon in $(do_libc_add_ons_list " "); do - # NPTL addon is not to be extracted, in any case - [ "${addon}" = "nptl" ] && continue || true - CT_ExtractAndPatch "${CT_LIBC}-${addon}-${CT_LIBC_VERSION}" - done - - return 0 -} - -# There is nothing to do for glibc check config -do_libc_check_config() { - : -} - -# This function installs the glibc headers needed to build the core compiler -do_libc_headers() { - # Only need to install bootstrap glibc headers for gcc-3.0 and above? Or maybe just gcc-3.3 and above? - # See also http://gcc.gnu.org/PR8180, which complains about the need for this step. - grep -q 'gcc-[34]' "${CT_SRC_DIR}/${CT_CC_FILE}/ChangeLog" 2>/dev/null || return 0 - - CT_DoStep INFO "Installing C library headers" - - mkdir -p "${CT_BUILD_DIR}/build-libc-headers" - cd "${CT_BUILD_DIR}/build-libc-headers" - - CT_DoLog EXTRA "Configuring C library" - - # The following three things have to be done to build glibc-2.3.x, but they don't hurt older versions. - # 1. override CC to keep glibc's configure from using $TARGET-gcc. - # 2. disable linuxthreads, which needs a real cross-compiler to generate tcb-offsets.h properly - # 3. build with gcc 3.2 or later - # Compare these options with the ones used when building glibc for real below - they're different. - # As of glibc-2.3.2, to get this step to work for hppa-linux, you need --enable-hacker-mode - # so when configure checks to make sure gcc has access to the assembler you just built... - # Alternately, we could put ${PREFIX}/${TARGET}/bin on the path. - # Set --build so maybe we don't have to specify "cross-compiling=yes" below (haven't tried yet) - # Note: the warning - # "*** WARNING: Are you sure you do not want to use the `linuxthreads'" - # *** add-on?" - # is ok here, since all we want are the basic headers at this point. - # Override libc_cv_ppc_machine so glibc-cvs doesn't complain - # 'a version of binutils that supports .machine "altivec" is needed'. - - addons_config="--enable-add-ons=$(do_libc_add_ons_list ,)" - # We need to remove any threading addon when installing headers - addons_config="${addons_config//nptl/}" - addons_config="${addons_config//linuxthreads/}" - addons_config=$(echo "${addons_config}" |sed -r -e 's/^,+//; s/,+$//; s/,+/,/g;') - - cross_cc=$(CT_Which "${CT_TARGET}-gcc") - CT_DoLog DEBUG "Using gcc for target: '${cross_cc}'" - CT_DoLog DEBUG "Extra config passed : '${addons_config}'" - - libc_cv_ppc_machine=yes \ - CC=${cross_cc} \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ - --build="${CT_UNIQ_BUILD}" \ - --host="${CT_TARGET}" \ - --prefix=/usr \ - --with-headers="${CT_HEADERS_DIR}" \ - --without-cvs \ - --disable-sanity-checks \ - --enable-hacker-mode \ - ${addons_config} \ - --without-nptl - - CT_DoLog EXTRA "Installing C library headers" - - if grep -q GLIBC_2.3 "${CT_SRC_DIR}/${CT_LIBC_FILE}/ChangeLog"; then - # glibc-2.3.x passes cross options to $(CC) when generating errlist-compat.c, - # which fails without a real cross-compiler. - # Fortunately, we don't need errlist-compat.c, since we just need .h - # files, so work around this by creating a fake errlist-compat.c and - # satisfying its dependencies. - # Another workaround might be to tell configure to not use any cross - # options to $(CC). - # The real fix would be to get install-headers to not generate - # errlist-compat.c. - # Note: BOOTSTRAP_GCC is used by: - # patches/glibc-2.3.5/glibc-mips-bootstrap-gcc-header-install.patch - - libc_cv_ppc_machine=yes \ - CT_DoExecLog ALL \ - make CFLAGS="-O -DBOOTSTRAP_GCC" \ - OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ - sysdeps/gnu/errlist.c - mkdir -p stdio-common - - # sleep for 2 seconds for benefit of filesystems with lousy time - # resolution, like FAT, so make knows for sure errlist-compat.c doesn't - # need generating - sleep 2 - CT_DoExecLog ALL touch stdio-common/errlist-compat.c - fi - # Note: BOOTSTRAP_GCC (see above) - libc_cv_ppc_machine=yes \ - CT_DoExecLog ALL \ - make cross-compiling=yes \ - install_root=${CT_SYSROOT_DIR} \ - CFLAGS="-O -DBOOTSTRAP_GCC" \ - ${LIBC_SYSROOT_ARG} \ - OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ - install-headers - - # Two headers -- stubs.h and features.h -- aren't installed by install-headers, - # so do them by hand. We can tolerate an empty stubs.h for the moment. - # See e.g. http://gcc.gnu.org/ml/gcc/2002-01/msg00900.html - mkdir -p "${CT_HEADERS_DIR}/gnu" - CT_DoExecLog ALL touch "${CT_HEADERS_DIR}/gnu/stubs.h" - CT_DoExecLog ALL cp -v "${CT_SRC_DIR}/${CT_LIBC_FILE}/include/features.h" \ - "${CT_HEADERS_DIR}/features.h" - - # Building the bootstrap gcc requires either setting inhibit_libc, or - # having a copy of stdio_lim.h... see - # http://sources.redhat.com/ml/libc-alpha/2003-11/msg00045.html - CT_DoExecLog ALL cp -v bits/stdio_lim.h "${CT_HEADERS_DIR}/bits/stdio_lim.h" - - # Following error building gcc-4.0.0's gcj: - # error: bits/syscall.h: No such file or directory - # solved by following copy; see http://sourceware.org/ml/crossgcc/2005-05/msg00168.html - # but it breaks arm, see http://sourceware.org/ml/crossgcc/2006-01/msg00091.html - [ "${CT_ARCH}" != "arm" ] && CT_DoExecLog ALL cp -v misc/syscall-list.h "${CT_HEADERS_DIR}/bits/syscall.h" || true - - # Those headers are to be manually copied so gcc can build properly - pthread_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/${CT_THREADS}/sysdeps/pthread/pthread.h" - pthreadtypes_h= - case "${CT_THREADS}" in - nptl) - # NOTE: for some archs, the pathes are different, but they are not - # supported by crosstool-NG right now. See original crosstool when they are. - pthread_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/${CT_THREADS}/sysdeps/pthread/pthread.h" - pthreadtypes_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/nptl/sysdeps/unix/sysv/linux/${CT_KERNEL_ARCH}/bits/pthreadtypes.h" - if [ ! -f "${pthreadtypes_h}" ]; then - pthreadtypes_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/${CT_LIBC}-ports-${CT_LIBC_VERSION}/sysdeps/unix/sysv/linux/${CT_KERNEL_ARCH}/nptl/bits/pthreadtypes.h" - fi - ;; - linuxthreads) - pthreadtypes_h="${CT_SRC_DIR}/${CT_LIBC_FILE}/linuxthreads/sysdeps/pthread/bits/pthreadtypes.h" - ;; - *) - pthread_h= - pthreadtypes_h= - ;; - esac - if [ -n "${pthread_h}" ]; then - CT_DoExecLog ALL cp -v "${pthread_h}" "${CT_HEADERS_DIR}/pthread.h" - fi - if [ -n "${pthreadtypes_h}" ]; then - CT_DoExecLog ALL cp -v "${pthreadtypes_h}" "${CT_HEADERS_DIR}/bits/pthreadtypes.h" - fi - - CT_EndStep -} - -# Build and install start files -do_libc_start_files() { - # Needed only in the NPTL case. Otherwise, return. - [ "${CT_THREADS}" = "nptl" ] || return 0 - - CT_DoStep INFO "Installing C library start files" - - mkdir -p "${CT_BUILD_DIR}/build-libc-startfiles" - cd "${CT_BUILD_DIR}/build-libc-startfiles" - - CT_DoLog EXTRA "Configuring C library" - - # Add some default glibc config options if not given by user. - extra_config="" - case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in - *enable-kernel*) ;; - *) extra_config="${extra_config} --enable-kernel=$(echo ${CT_LIBC_GLIBC_MIN_KERNEL} |sed -r -e 's/^([^.]+\.[^.]+\.[^.]+)(|\.[^.]+)$/\1/;')" - esac - case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in - *-tls*) ;; - *) extra_config="${extra_config} --with-tls" - esac - case "${CT_SHARED_LIBS}" in - y) extra_config="${extra_config} --enable-shared";; - *) extra_config="${extra_config} --disable-shared";; - esac - case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in - y,) extra_config="${extra_config} --with-fp";; - ,y) extra_config="${extra_config} --without-fp";; - esac - # Obviously, we want threads, as we come here only for NPTL - extra_config="${extra_config} --with-__thread" - - addons_config="--enable-add-ons=$(do_libc_add_ons_list ,)" - extra_config="${extra_config} ${addons_config}" - - # Add some default CC args - glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/') - glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/') - # In case we're using a snapshot, fake a >=2.6 version. - if [ "${CT_LIBC_V_LATEST}" = "y" \ - -o "${CT_LIBC_V_date}" = "y" ]; then - glibc_version_major=3 - glibc_version_minor=0 - fi - if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ - -o ${glibc_version_major} -gt 2 ]; then - # Don't use -pipe: configure chokes on it for glibc >= 2.6. - CT_Test 'Removing "-pipe" for use with glibc>=2.6' "${CT_USE_PIPES}" = "y" - extra_cc_args="${CT_CFLAGS_FOR_HOST/-pipe}" - else - extra_cc_args="${CT_CFLAGS_FOR_HOST}" - fi - extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}" - - cross_cc=$(CT_Which "${CT_TARGET}-gcc") - CT_DoLog DEBUG "Using gcc for target : '${cross_cc}'" - CT_DoLog DEBUG "Configuring with addons : '$(do_libc_add_ons_list ,)'" - CT_DoLog DEBUG "Extra config args passed: '${extra_config}'" - CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'" - - # Super-H really needs to set configparms as of gcc-3.4/glibc-2.3.2 - # note: this is awkward, doesn't work well if you need more than one - # line in configparms - echo ${CT_LIBC_GLIBC_CONFIGPARMS} > configparms - - echo "libc_cv_forced_unwind=yes" > config.cache - echo "libc_cv_c_cleanup=yes" >> config.cache - - # Please see the comment for the configure step in do_libc(). - - BUILD_CC=${CT_CC_NATIVE} \ - CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O " \ - CC="${cross_cc} ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \ - AR=${CT_TARGET}-ar \ - RANLIB=${CT_TARGET}-ranlib \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ - --prefix=/usr \ - --build="${CT_UNIQ_BUILD}" \ - --host=${CT_TARGET} \ - --without-cvs \ - --disable-profile \ - --disable-debug \ - --without-gd \ - --with-headers="${CT_HEADERS_DIR}" \ - --cache-file=config.cache \ - ${extra_config} \ - ${CT_LIBC_GLIBC_EXTRA_CONFIG} - - - #TODO: should check whether slibdir has been set in configparms to */lib64 - # and copy the startfiles into the appropriate libdir. - CT_DoLog EXTRA "Building C library start files" - CT_DoExecLog ALL make OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" csu/subdir_lib - - CT_DoLog EXTRA "Installing C library start files" - if [ "${CT_USE_SYSROOT}" = "y" ]; then - CT_DoExecLog ALL cp -fpv csu/crt[1in].o "${CT_SYSROOT_DIR}/usr/lib/" - else - CT_DoExecLog ALL cp -fpv csu/crt[1in].o "${CT_SYSROOT_DIR}/lib/" - fi - - CT_EndStep -} - -# This function builds and install the full glibc -do_libc() { - CT_DoStep INFO "Installing C library" - - mkdir -p "${CT_BUILD_DIR}/build-libc" - cd "${CT_BUILD_DIR}/build-libc" - - CT_DoLog EXTRA "Configuring C library" - - # Add some default glibc config options if not given by user. - # We don't need to be conditional on wether the user did set different - # values, as they CT_LIBC_GLIBC_EXTRA_CONFIG is passed after extra_config - - extra_config="--enable-kernel=$(echo ${CT_LIBC_GLIBC_MIN_KERNEL} |sed -r -e 's/^([^.]+\.[^.]+\.[^.]+)(|\.[^.]+)$/\1/;')" - - case "${CT_THREADS}" in - nptl) extra_config="${extra_config} --with-__thread --with-tls";; - linuxthreads) extra_config="${extra_config} --with-__thread --without-tls --without-nptl";; - none) extra_config="${extra_config} --without-__thread --without-nptl" - case "${CT_LIBC_GLIBC_EXTRA_CONFIG}" in - *-tls*) ;; - *) extra_config="${extra_config} --without-tls";; - esac - ;; - esac - - case "${CT_SHARED_LIBS}" in - y) extra_config="${extra_config} --enable-shared";; - *) extra_config="${extra_config} --disable-shared";; - esac - - case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in - y,) extra_config="${extra_config} --with-fp";; - ,y) extra_config="${extra_config} --without-fp";; - esac - - case "$(do_libc_add_ons_list ,)" in - "") ;; - *) extra_config="${extra_config} --enable-add-ons=$(do_libc_add_ons_list ,)";; - esac - - # Add some default CC args - glibc_version_major=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^([^\.]+)\..*/\1/') - glibc_version_minor=$(echo ${CT_LIBC_VERSION} |sed -r -e 's/^[^\.]+\.([^.]+).*/\1/') - # In case we're using a snapshot, fake a >=2.6 version. - if [ "${CT_LIBC_V_LATEST}" = "y" \ - -o "${CT_LIBC_V_date}" = "y" ]; then - glibc_version_major=3 - glibc_version_minor=0 - fi - if [ ${glibc_version_major} -eq 2 -a ${glibc_version_minor} -ge 6 \ - -o ${glibc_version_major} -gt 2 ]; then - # Don't use -pipe: configure chokes on it for glibc >= 2.6. - CT_Test 'Removing "-pipe" for use with glibc>=2.6' "${CT_USE_PIPES}" = "y" - extra_cc_args="${CT_CFLAGS_FOR_HOST/-pipe}" - else - extra_cc_args="${CT_CFLAGS_FOR_HOST}" - fi - extra_cc_args="${extra_cc_args} ${CT_ARCH_ENDIAN_OPT}" - - cross_cc=$(CT_Which "${CT_TARGET}-gcc") - CT_DoLog DEBUG "Using gcc for target : '${cross_cc}'" - CT_DoLog DEBUG "Configuring with addons : '$(do_libc_add_ons_list ,)'" - CT_DoLog DEBUG "Extra config args passed: '${extra_config}'" - CT_DoLog DEBUG "Extra CC args passed : '${extra_cc_args}'" - - # sh3 and sh4 really need to set configparms as of gcc-3.4/glibc-2.3.2 - # note: this is awkward, doesn't work well if you need more than one line in configparms - echo ${CT_LIBC_GLIBC_CONFIGPARMS} > configparms - - # For glibc 2.3.4 and later we need to set some autoconf cache - # variables, because nptl/sysdeps/pthread/configure.in does not - # work when cross-compiling. - if [ "${CT_THREADS}" = "nptl" ]; then - echo libc_cv_forced_unwind=yes - echo libc_cv_c_cleanup=yes - fi >config.cache - - # Configure with --prefix the way we want it on the target... - # There are a whole lot of settings here. You'll probably want - # to read up on what they all mean, and customize a bit, possibly by setting GLIBC_EXTRA_CONFIG - # Compare these options with the ones used when installing the glibc headers above - they're different. - # Adding "--without-gd" option to avoid error "memusagestat.c:36:16: gd.h: No such file or directory" - # See also http://sources.redhat.com/ml/libc-alpha/2000-07/msg00024.html. - # Set BUILD_CC, or you won't be able to build datafiles - # Set --build, else glibc-2.3.2 will think you're not cross-compiling, and try to run the test programs - - # OK. I'm fed up with those folks telling me what I should do. - # I don't configure nptl? Well, maybe that's purposedly because - # I don't want nptl! --disable-sanity-checks will shut up those - # silly messages. GNU folks again, he? - - BUILD_CC=${CT_CC_NATIVE} \ - CFLAGS="${CT_TARGET_CFLAGS} ${CT_LIBC_GLIBC_EXTRA_CFLAGS} -O" \ - CC="${CT_TARGET}-gcc ${CT_LIBC_EXTRA_CC_ARGS} ${extra_cc_args}" \ - AR=${CT_TARGET}-ar \ - RANLIB=${CT_TARGET}-ranlib \ - CT_DoExecLog ALL \ - "${CT_SRC_DIR}/${CT_LIBC_FILE}/configure" \ - --prefix=/usr \ - --build=${CT_UNIQ_BUILD} \ - --host=${CT_TARGET} \ - --without-cvs \ - --disable-profile \ - --disable-debug \ - --without-gd \ - --disable-sanity-checks \ - --cache-file=config.cache \ - --with-headers="${CT_HEADERS_DIR}" \ - ${extra_config} \ - ${CT_LIBC_GLIBC_EXTRA_CONFIG} - - if grep -l '^install-lib-all:' "${CT_SRC_DIR}/${CT_LIBC_FILE}/Makerules" > /dev/null; then - # nptl-era glibc. - # If the install-lib-all target (which is added by our make-install-lib-all.patch) - # is present, it means we're building glibc-2.3.3 or later, and we can't - # build programs yet, as they require libeh, which won't be installed - # until full build of gcc - # YEM-FIXME: This comment is misleading: latest glibc-s do not have the - # make-install-lib-all.patch applied, so do not pass through this - # part of the if statement; nonetheless, they do build, and - # the result is useable (maybe the dual-pass core gcc is - # responsible for this). - GLIBC_INITIAL_BUILD_RULE=lib - GLIBC_INITIAL_INSTALL_RULE="install-lib-all install-headers" - GLIBC_INSTALL_APPS_LATER=yes - else - # classic glibc. - # We can build and install everything with the bootstrap compiler. - # YEM-FIXME: See the above FIXME as well. - GLIBC_INITIAL_BUILD_RULE=all - GLIBC_INITIAL_INSTALL_RULE=install - GLIBC_INSTALL_APPS_LATER=no - fi - - # If this fails with an error like this: - # ... linux/autoconf.h: No such file or directory - # then you need to set the KERNELCONFIG variable to point to a .config file for this arch. - # The following architectures are known to need kernel .config: alpha, arm, ia64, s390, sh, sparc - # Note: LD and RANLIB needed by glibc-2.1.3's c_stub directory, at least on macosx - # No need for PARALLELMFLAGS here, Makefile already reads this environment variable - CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL make LD=${CT_TARGET}-ld \ - RANLIB=${CT_TARGET}-ranlib \ - OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ - ${GLIBC_INITIAL_BUILD_RULE} - - CT_DoLog EXTRA "Installing C library" - CT_DoExecLog ALL make install_root="${CT_SYSROOT_DIR}" \ - ${LIBC_SYSROOT_ARG} \ - OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ - ${GLIBC_INITIAL_INSTALL_RULE} - - # This doesn't seem to work when building a crosscompiler, - # as it tries to execute localedef using the just-built ld.so!? - #CT_DoLog EXTRA "Installing locales" - #make localedata/install-locales install_root=${SYSROOT} 2>&1 |CT_DoLog ALL - - # Fix problems in linker scripts. - # - # 1. Remove absolute paths - # Any file in a list of known suspects that isn't a symlink is assumed to be a linker script. - # FIXME: test -h is not portable - # FIXME: probably need to check more files than just these three... - # Need to use sed instead of just assuming we know what's in libc.so because otherwise alpha breaks - # - # 2. Remove lines containing BUG per http://sources.redhat.com/ml/bug-glibc/2003-05/msg00055.html, - # needed to fix gcc-3.2.3/glibc-2.3.2 targeting arm - # - # To make "strip *.so.*" not fail (ptxdist does this), rename to .so_orig rather than .so.orig - CT_DoLog EXTRA "Fixing C library linker scripts" - for file in libc.so libpthread.so libgcc_s.so; do - for dir in lib lib64 usr/lib usr/lib64; do - if [ -f "${CT_SYSROOT_DIR}/${dir}/${file}" -a ! -L ${CT_SYSROOT_DIR}/$lib/$file ]; then - CT_DoExecLog ALL cp -v "${CT_SYSROOT_DIR}/${dir}/${file}" "${CT_SYSROOT_DIR}/${dir}/${file}_orig" - CT_DoLog DEBUG "Fixing '${CT_SYS_ROOT_DIR}/${dir}/${file}'" - CT_DoExecLog ALL sed -i -r -e 's,/usr/lib/,,g; - s,/usr/lib64/,,g; - s,/lib/,,g; - s,/lib64/,,g; - /BUG in libc.scripts.output-format.sed/d' "${CT_SYSROOT_DIR}/${dir}/${file}" - fi - done - done - - CT_EndStep -} - -# This function finishes the glibc install -do_libc_finish() { - # Finally, build and install glibc programs, now that libeh (if any) is installed - # Don't do this unless needed, 'cause it causes glibc-2.{1.3,2.2} to fail here with - # .../gcc-3.4.1-glibc-2.1.3/build-glibc/libc.so.6: undefined reference to `__deregister_frame_info' - # .../gcc-3.4.1-glibc-2.1.3/build-glibc/libc.so.6: undefined reference to `__register_frame_info' - [ "${GLIBC_INSTALL_APPS_LATER}" = "yes" ] || return 0 - - CT_DoStep INFO "Finishing C library" - - cd "${CT_BUILD_DIR}/build-libc" - - CT_DoLog EXTRA "Re-building C library" - CT_DoExecLog ALL make LD=${CT_TARGET}-ld RANLIB=${CT_TARGET}-ranlib - - CT_DoLog EXTRA "Installing missing C library components" - # note: should do full install and then fix linker scripts, but this is faster - for t in bin rootsbin sbin data others; do - CT_DoExecLog ALL make install_root="${CT_SYSROOT_DIR}" \ - ${LIBC_SYSROOT_ARG} \ - OBJDUMP_FOR_HOST="${CT_TARGET}-objdump" \ - install-${t} - done - - CT_EndStep -} - -# Build up the addons list, separated with $1 -do_libc_add_ons_list() { - local sep="$1" - local addons_list=$(echo "${CT_LIBC_ADDONS_LIST//,/${sep}}" |tr -s ,) - case "${CT_THREADS}" in - none) ;; - *) addons_list="${addons_list}${sep}${CT_THREADS}";; - esac - [ "${CT_LIBC_GLIBC_USE_PORTS}" = "y" ] && addons_list="${addons_list}${sep}ports" - addons_list="${addons_list%%${sep}}" - echo "${addons_list##${sep}}" -} - diff --git a/scripts/build/libc_uClibc.sh b/scripts/build/libc_uClibc.sh deleted file mode 100644 index 85f5997..0000000 --- a/scripts/build/libc_uClibc.sh +++ /dev/null @@ -1,313 +0,0 @@ -# This file declares functions to install the uClibc C library -# Copyright 2007 Yann E. MORIN -# Licensed under the GPL v2. See COPYING in the root of this package - -do_print_filename() { - [ "${CT_LIBC}" = "uClibc" ] || return 0 - echo "uClibc-${CT_LIBC_VERSION}" - [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && echo "uClibc-locale-030818" || true -} - -# Download uClibc -do_libc_get() { - libc_src="http://www.uclibc.org/downloads - http://www.uclibc.org/downloads/snapshots - http://www.uclibc.org/downloads/old-releases" - # For uClibc, we have almost every thing: releases, and snapshots - # for the last month or so. We'll have to deal with svn revisions - # later... - CT_GetFile "${CT_LIBC_FILE}" ${libc_src} - # uClibc locales - [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_GetFile "uClibc-locale-030818" ${libc_src} || true - - return 0 -} - -# Extract uClibc -do_libc_extract() { - CT_ExtractAndPatch "${CT_LIBC_FILE}" - # uClibc locales - [ "${CT_LIBC_UCLIBC_LOCALES}" = "y" ] && CT_ExtractAndPatch "uClibc-locale-030818" || true - - return 0 -} - -# Check that uClibc has been previously configured -do_libc_check_config() { - CT_DoStep INFO "Checking C library configuration" - - CT_TestOrAbort "You did not provide a uClibc config file!" -n "${CT_LIBC_UCLIBC_CONFIG_FILE}" -a -f "${CT_LIBC_UCLIBC_CONFIG_FILE}" - - if egrep '^KERNEL_SOURCE=' "${CT_LIBC_UCLIBC_CONFIG_FILE}" >/dev/null 2>&1; then - CT_DoLog WARN "Your uClibc version refers to the kernel _sources_, which is bad." - CT_DoLog WARN "I can't guarantee that our little hack will work. Please try to upgrade." - fi - - CT_DoLog EXTRA "Munging uClibc configuration" - mungeuClibcConfig "${CT_LIBC_UCLIBC_CONFIG_FILE}" "${CT_BUILD_DIR}/uClibc.config" - - CT_EndStep -} - -# This functions installs uClibc's headers -do_libc_headers() { - # Only need to install bootstrap uClibc headers for gcc-3.0 and above? Or maybe just gcc-3.3 and above? - # See also http://gcc.gnu.org/PR8180, which complains about the need for this step. - grep -q 'gcc-[34]' "${CT_SRC_DIR}/${CT_CC_FILE}/ChangeLog" 2>/dev/null || return 0 - - CT_DoStep INFO "Installing C library headers" - - mkdir -p "${CT_BUILD_DIR}/build-libc-headers" - cd "${CT_BUILD_DIR}/build-libc-headers" - - # Simply copy files until uClibc has the ablity to build out-of-tree - CT_DoLog EXTRA "Copying sources to build dir" - { cd "${CT_SRC_DIR}/${CT_LIBC_FILE}"; tar cf - .; } |tar xf - - - # Retrieve the config file - cp "${CT_BUILD_DIR}/uClibc.config" .config - - # uClibc uses the CROSS environment variable as a prefix to the - # compiler tools to use. Setting it to the empty string forces - # use of the native build host tools, which we need at this - # stage, as we don't have target tools yet. - CT_DoLog EXTRA "Applying configuration" - CT_DoYes "" |CT_DoExecLog ALL make CROSS= PREFIX="${CT_SYSROOT_DIR}/" oldconfig - - CT_DoLog EXTRA "Building headers" - CT_DoExecLog ALL make ${CT_LIBC_UCLIBC_VERBOSITY} CROSS= PREFIX="${CT_SYSROOT_DIR}/" headers - - CT_DoLog EXTRA "Installing headers" - CT_DoExecLog ALL make ${CT_LIBC_UCLIBC_VERBOSITY} CROSS= PREFIX="${CT_SYSROOT_DIR}/" install_dev - - CT_EndStep -} - -# Build and install start files -do_libc_start_files() { - : -} - -# This function build and install the full uClibc -do_libc() { - CT_DoStep INFO "Installing C library" - - mkdir -p "${CT_BUILD_DIR}/build-libc" - cd "${CT_BUILD_DIR}/build-libc" - - # Simply copy files until uClibc has the ablity to build out-of-tree - CT_DoLog EXTRA "Copying sources to build dir" - { cd "${CT_SRC_DIR}/${CT_LIBC_FILE}"; tar cf - .; } |tar xf - - - # Retrieve the config file - cp "${CT_BUILD_DIR}/uClibc.config" .config - - # uClibc uses the CROSS environment variable as a prefix to the compiler - # tools to use. The newly built tools should be in our path, so we need - # only give the correct name for them. - # Note about CFLAGS: In uClibc, CFLAGS are generated by Rules.mak, - # depending on the configuration of the library. That is, they are tailored - # to best fit the target. So it is useless and seems to be a bad thing to - # use LIBC_EXTRA_CFLAGS here. - CT_DoLog EXTRA "Applying configuration" - CT_DoYes "" |CT_DoExecLog ALL \ - make CROSS=${CT_TARGET}- \ - PREFIX="${CT_SYSROOT_DIR}/" \ - oldconfig - - # We do _not_ want to strip anything for now, in case we specifically - # asked for a debug toolchain, thus the STRIPTOOL= assignment - CT_DoLog EXTRA "Building C library" - CT_DoExecLog ALL \ - make CROSS=${CT_TARGET}- \ - PREFIX="${CT_SYSROOT_DIR}/" \ - STRIPTOOL=true \ - ${CT_LIBC_UCLIBC_VERBOSITY} \ - all - - # YEM-FIXME: we want to install libraries in $SYSROOT/lib, but we don't want - # to install headers in $SYSROOT/include, thus making only install_runtime. - # Plus, the headers were previously installed earlier with install_dev, so - # all should be well. Unfortunately, the install_dev target does not install - # crti.o and consorts... :-( So reverting to target 'install'. - # Note: PARALLELMFLAGS is not usefull for installation. - # We do _not_ want to strip anything for now, in case we specifically - # asked for a debug toolchain, thus the STRIPTOOL= assignment - CT_DoLog EXTRA "Installing C library" - CT_DoExecLog ALL \ - make CROSS=${CT_TARGET}- \ - PREFIX="${CT_SYSROOT_DIR}/" \ - STRIPTOOL=true \ - ${CT_LIBC_UCLIBC_VERBOSITY} \ - install - - CT_EndStep -} - -# This function is used to install those components needing the final C compiler -do_libc_finish() { - : -} - -# Initialises the .config file to sensible values -# $1: original file -# $2: munged file -mungeuClibcConfig() { - src_config_file="$1" - dst_config_file="$2" - munge_file="${CT_BUILD_DIR}/munge-uClibc-config.sed" - - # Start with a fresh file - rm -f "${munge_file}" - touch "${munge_file}" - - # Hack our target in the config file. - # Also remove stripping: its the responsibility of the - # firmware builder to strip or not. - cat >>"${munge_file}" <<-ENDSED -s/^(TARGET_.*)=y$/# \\1 is not set/ -s/^# TARGET_${CT_KERNEL_ARCH} is not set/TARGET_${CT_KERNEL_ARCH}=y/ -s/^TARGET_ARCH=".*"/TARGET_ARCH="${CT_KERNEL_ARCH}"/ -s/.*(DOSTRIP).*/# \\1 is not set/ -ENDSED - - # Ah. We may one day need architecture-specific handler here... - # Hack the ARM {E,O}ABI into the config file - if [ "${CT_ARCH_ARM_EABI}" = "y" ]; then - cat >>"${munge_file}" <<-ENDSED -s/.*(CONFIG_ARM_OABI).*/# \\1 is not set/ -s/.*(CONFIG_ARM_EABI).*/\\1=y/ -ENDSED - else - cat >>"${munge_file}" <<-ENDSED -s/.*(CONFIG_ARM_OABI).*/\\1=y/ -s/.*(CONFIG_ARM_EABI).*/# \\1 is not set/ -ENDSED - fi - - # Accomodate for old and new uClibc versions, where the - # way to select between big/little endian has changed - case "${CT_ARCH_BE},${CT_ARCH_LE}" in - y,) cat >>"${munge_file}" <<-ENDSED -s/.*(ARCH_LITTLE_ENDIAN).*/# \\1 is not set/ -s/.*(ARCH_BIG_ENDIAN).*/\\1=y/ -s/.*(ARCH_WANTS_LITTLE_ENDIAN).*/# \\1 is not set/ -s/.*(ARCH_WANTS_BIG_ENDIAN).*/\\1=y/ -ENDSED - ;; - ,y) cat >>"${munge_file}" <<-ENDSED -s/.*(ARCH_LITTLE_ENDIAN).*/\\1=y/ -s/.*(ARCH_BIG_ENDIAN).*/# \\1 is not set/ -s/.*(ARCH_WANTS_LITTLE_ENDIAN).*/\\1=y/ -s/.*(ARCH_WANTS_BIG_ENDIAN).*/# \\1 is not set/ -ENDSED - ;; - esac - - # Accomodate for old and new uClibc version, where the - # way to select between hard/soft float has changed - case "${CT_ARCH_FLOAT_HW},${CT_ARCH_FLOAT_SW}" in - y,) cat >>"${munge_file}" <<-ENDSED -s/^[^_]*(HAS_FPU).*/\\1=y/ -s/.*(UCLIBC_HAS_FPU).*/\\1=y/ -ENDSED - ;; - ,y) cat >>"${munge_file}" <<-ENDSED -s/^[^_]*(HAS_FPU).*/\\# \\1 is not set/ -s/.*(UCLIBC_HAS_FPU).*/# \\1 is not set/ -ENDSED - ;; - esac - - # Change paths to work with crosstool-NG - # From http://www.uclibc.org/cgi-bin/viewcvs.cgi?rev=16846&view=rev - # " we just want the kernel headers, not the whole kernel source ... - # " so people may need to update their paths slightly - quoted_kernel_source=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/include/?$,,; s,/,\\/,g;') - quoted_headers_dir=$(echo "${CT_HEADERS_DIR}" | sed -r -e 's,/,\\/,g;') - # CROSS_COMPILER_PREFIX is left as is, as the CROSS parameter is forced on the command line - # DEVEL_PREFIX is left as '/usr/' because it is post-pended to $PREFIX, wich is the correct value of ${PREFIX}/${TARGET} - # Some (old) versions of uClibc use KERNEL_SOURCE (which is _wrong_), and - # newer versions use KERNEL_HEADERS (which is right). See: - cat >>"${munge_file}" <<-ENDSED -s/^DEVEL_PREFIX=".*"/DEVEL_PREFIX="\\/usr\\/"/ -s/^RUNTIME_PREFIX=".*"/RUNTIME_PREFIX="\\/"/ -s/^SHARED_LIB_LOADER_PREFIX=.*/SHARED_LIB_LOADER_PREFIX="\\/lib\\/"/ -s/^KERNEL_SOURCE=".*"/KERNEL_SOURCE="${quoted_kernel_source}"/ -s/^KERNEL_HEADERS=".*"/KERNEL_HEADERS="${quoted_headers_dir}"/ -s/^UCLIBC_DOWNLOAD_PREGENERATED_LOCALE=y/\\# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE is not set/ -ENDSED - - if [ "${CT_USE_PIPES}" = "y" ]; then - if grep UCLIBC_EXTRA_CFLAGS extra/Configs/Config.in >/dev/null 2>&1; then - # Good, there is special provision for such things as -pipe! - cat >>"${munge_file}" <<-ENDSED -s/^(UCLIBC_EXTRA_CFLAGS=".*)"$/\\1 -pipe"/ -ENDSED - else - # Hack our -pipe into WARNINGS, which will be internally incorporated to - # CFLAGS. This a dirty hack, but yet needed - cat >> "${munge_file}" <<-ENDSED -s/^(WARNINGS=".*)"$/\\1 -pipe"/ -ENDSED - fi - fi - - # Force on options needed for C++ if we'll be making a C++ compiler. - # Note that the two PREGEN_LOCALE and the XLOCALE lines may be missing - # entirely if LOCALE is not set. If LOCALE was already set, we'll - # assume the user has already made all the appropriate generation - # arrangements. Note that having the uClibc Makefile download the - # pregenerated locales is not compatible with crosstool; besides, - # crosstool downloads them as part of getandpatch.sh. - if [ "${CT_CC_LANG_CXX}" = "y" ]; then - cat >>"${munge_file}" <<-ENDSED -s/^# DO_C99_MATH is not set/DO_C99_MATH=y/ -s/^# UCLIBC_CTOR_DTOR is not set/UCLIBC_CTOR_DTOR=y/ -# Add these three lines when doing C++? -s/^# UCLIBC_HAS_WCHAR is not set/UCLIBC_HAS_WCHAR=y/ -#s/^# UCLIBC_HAS_LOCALE is not set/UCLIBC_HAS_LOCALE=y\\nUCLIBC_PREGENERATED_LOCALE_DATA=y\\n\\# UCLIBC_DOWNLOAD_PREGENERATED_LOCALE_DATA is not set\\n\\# UCLIBC_HAS_XLOCALE is not set/ -s/^# UCLIBC_HAS_GNU_GETOPT is not set/UCLIBC_HAS_GNU_GETOPT=y/ -ENDSED - fi - - # Always build the libpthread_db - cat >>"${munge_file}" <<-ENDSED -s/^# PTHREADS_DEBUG_SUPPORT is not set.*/PTHREADS_DEBUG_SUPPORT=y/ -ENDSED - - # Force on debug options if asked for - case "${CT_LIBC_UCLIBC_DEBUG_LEVEL}" in - 0) - cat >>"${munge_file}" <<-ENDSED -s/^DODEBUG=y/# DODEBUG is not set/ -s/^DODEBUG_PT=y/# DODEBUG_PT is not set/ -s/^DOASSERTS=y/# DOASSERTS is not set/ -s/^SUPPORT_LD_DEBUG=y/# SUPPORT_LD_DEBUG is not set/ -s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/ -s/^UCLIBC_MALLOC_DEBUGGING=y/# UCLIBC_MALLOC_DEBUGGING is not set/ -ENDSED - ;; - 1) - cat >>"${munge_file}" <<-ENDSED -s/^# DODEBUG is not set.*/DODEBUG=y/ -s/^DODEBUG_PT=y/# DODEBUG_PT is not set/ -s/^DOASSERTS=y/# DOASSERTS is not set/ -s/^SUPPORT_LD_DEBUG=y/# SUPPORT_LD_DEBUG is not set/ -s/^SUPPORT_LD_DEBUG_EARLY=y/# SUPPORT_LD_DEBUG_EARLY is not set/ -s/^UCLIBC_MALLOC_DEBUGGING=y/# UCLIBC_MALLOC_DEBUGGING is not set/ -ENDSED - ;; - 2) - cat >>"${munge_file}" <<-ENDSED -s/^# DODEBUG is not set.*/DODEBUG=y/ -s/^# DODEBUG_PT is not set.*/DODEBUG_PT=y/ -s/^# DOASSERTS is not set.*/DOASSERTS=y/ -s/^# SUPPORT_LD_DEBUG is not set.*/SUPPORT_LD_DEBUG=y/ -s/^# SUPPORT_LD_DEBUG_EARLY is not set.*/SUPPORT_LD_DEBUG_EARLY=y/ -s/^# UCLIBC_MALLOC_DEBUGGING is not set/UCLIBC_MALLOC_DEBUGGING=y/ -ENDSED - ;; - esac - sed -r -f "${munge_file}" "${src_config_file}" >"${dst_config_file}" -} diff --git a/scripts/crosstool.sh b/scripts/crosstool.sh index f0eaa82..35aa247 100755 --- a/scripts/crosstool.sh +++ b/scripts/crosstool.sh @@ -356,8 +356,8 @@ fi . "${CT_LIB_DIR}/scripts/build/gmp.sh" . "${CT_LIB_DIR}/scripts/build/mpfr.sh" . "${CT_LIB_DIR}/scripts/build/binutils.sh" -. "${CT_LIB_DIR}/scripts/build/libc_${CT_LIBC}.sh" -. "${CT_LIB_DIR}/scripts/build/cc_${CT_CC}.sh" +. "${CT_LIB_DIR}/scripts/build/libc/${CT_LIBC}.sh" +. "${CT_LIB_DIR}/scripts/build/cc/${CT_CC}.sh" . "${CT_LIB_DIR}/scripts/build/debug.sh" . "${CT_LIB_DIR}/scripts/build/tools.sh" @@ -433,12 +433,13 @@ if [ "${CT_ONLY_DOWNLOAD}" != "y" -a "${CT_ONLY_EXTRACT}" != "y" ]; then find "${CT_PREFIX_DIR}/bin" -name "${CT_HOST}-"'*' -exec rm -fv {} \; |CT_DoLog DEBUG rm -fv "${CT_PREFIX_DIR}/bin/makeinfo" |CT_DoLog DEBUG - # Install the /populator/ - CT_DoLog EXTRA "Installing the populate helper" - sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \ - "${CT_LIB_DIR}/tools/populate.in" \ - >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate" - chmod 755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate" + if [ "${CT_BARE_METAL}" != "y" ]; then + CT_DoLog EXTRA "Installing the populate helper" + sed -r -e 's|@@CT_TARGET@@|'"${CT_TARGET}"'|g;' \ + "${CT_LIB_DIR}/tools/populate.in" \ + >"${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate" + chmod 755 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-populate" + fi # Create the aliases to the target tools CT_DoLog EXTRA "Creating toolchain aliases" diff --git a/scripts/functions b/scripts/functions index d80e2fa..829539f 100644 --- a/scripts/functions +++ b/scripts/functions @@ -673,6 +673,7 @@ CT_DoBuildTargetTuple() { # Set defaults for the system part of the tuple. Can be overriden # by architecture-specific values. case "${CT_LIBC}" in + none) CT_TARGET_SYS=elf;; *glibc) CT_TARGET_SYS=gnu;; uClibc) CT_TARGET_SYS=uclibc;; esac @@ -695,9 +696,10 @@ CT_DoBuildTargetTuple() { # Finish the target tuple construction case "${CT_KERNEL}" in - linux*) CT_TARGET_KERNEL=linux;; + none) CT_TARGET_KERNEL=;; + linux) CT_TARGET_KERNEL=linux-;; esac - CT_TARGET=$(CT_DoConfigSub "${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}-${CT_TARGET_SYS}") + CT_TARGET=$(CT_DoConfigSub "${CT_TARGET_ARCH}-${CT_TARGET_VENDOR:-unknown}-${CT_TARGET_KERNEL}${CT_TARGET_SYS}") # Prepare the target CFLAGS CT_ARCH_TARGET_CFLAGS="${CT_ARCH_TARGET_CFLAGS} ${CT_ARCH_ENDIAN_CFLAG}" diff --git a/scripts/showSamples.sh b/scripts/showSamples.sh index eab9edf..666656f 100755 --- a/scripts/showSamples.sh +++ b/scripts/showSamples.sh @@ -30,7 +30,7 @@ dump_single_sample() { [ "${CT_EXPERIMENTAL}" = "y" ] && printf "X" || printf " " echo "]" if [ ${verbose} -ne 0 ]; then - echo " OS : ${CT_KERNEL}-${CT_KERNEL_VERSION}" + echo " OS : ${CT_KERNEL}${CT_KERNEL_VERSION:+-}${CT_KERNEL_VERSION}" if [ "${CT_GMP_MPFR}" = "y" ]; then echo " GMP/MPFR : gmp-${CT_GMP_VERSION} / mpfr-${CT_MPFR_VERSION}" fi @@ -44,7 +44,7 @@ dump_single_sample() { [ "${CT_CC_LANG_OBJCXX}" = "y" ] && printf ",Objective-C++" [ -n "${CT_CC_LANG_OTHERS}" ] && printf ",${CT_CC_LANG_OTHERS}" echo ")" - echo " C library : ${CT_LIBC}-${CT_LIBC_VERSION}" + echo " C library : ${CT_LIBC}${CT_LIBC_VERSION:+-}${CT_LIBC_VERSION}" printf " Tools :" [ "${CT_LIBELF}" ] && printf " libelf-${CT_LIBELF_VERSION}" [ "${CT_SSTRIP}" ] && printf " sstrip" @@ -133,7 +133,7 @@ for sample in "${@}"; do done if [ "${opt}" = -w ]; then - printf "^ Total: ${#@} samples | ''X'': sample uses features marked as being EXPERIMENTAL.\\\\\\\\ ''B'': Samples is curently BROKEN. |||||||||||||" + printf "^ Total: ${#@} samples | ''X'': sample uses features marked as being EXPERIMENTAL.\\\\\\\\ ''B'': sample is curently BROKEN. |||||||||||||" echo "" elif [ -z "${opt}" ]; then echo ' l (local) : sample was found in current directory' -- cgit v0.10.2-6-g49f6