1.10: close branch

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>

.hgtags

@@ -30,3 +30,5 @@ c71b4f4da4b46aa83e6c013208731edfffd249a1 crosstool-ng-0.0.4
 ce34b7cd6509906de6885c084dbef7ddecd603c6 crosstool-ng-1.1.3a
 e016efb7036c14f86e1592114e621cfadeaf714c crosstool-ng-0.0.2
 fec15dd785b1ab52e15a350665362c3f58852931 crosstool-ng-0.1.0
+d18cc3da38793e41ad60a618bb84473c06e3f57a crosstool-ng-1.10.0
+2b19fff44d8705b1a9671504f4ff61cd32c6acd8 crosstool-ng-1.10.1

.version

@@ -1 +1 @@
-hg
+1.10.1+hg

config/binutils/binutils.in

@@ -67,10 +67,20 @@ config BINUTILS_2_21_or_later
 config BINUTILS_HAS_GOLD
     bool
 
+config BINUTILS_GOLD_SUPPORTS_ARCH
+    bool
+
 config BINUTILS_HAS_PLUGINS
     bool
 
-if BINUTILS_HAS_GOLD
+# Only these architectures have support in gold
+config ARCH_arm
+    select BINUTILS_GOLD_SUPPORTS_ARCH
+
+config ARCH_x86
+    select BINUTILS_GOLD_SUPPORTS_ARCH
+
+if BINUTILS_HAS_GOLD && BINUTILS_GOLD_SUPPORTS_ARCH
 
 choice
     bool
@@ -168,6 +178,7 @@ config BINUTILS_PLUGINS
     bool
     prompt "Enable support for plugins"
     depends on BINUTILS_HAS_PLUGINS
+    depends on ! STATIC_TOOLCHAIN
     help
       binutils can be extended through the use of plugins.
       Especially, gold can use the lto-plugin, as installed

config/cc/gcc.in

@@ -182,6 +182,7 @@ config CC_GCC_HAS_LTO
 config CC_GCC_ENABLE_PLUGINS
     bool
     depends on BINUTILS_PLUGINS
+    depends on ! STATIC_TOOLCHAIN
     default y
 
 # If binutils installs gold, enable support for gold in gcc

config/libc/glibc.in

@@ -3,7 +3,6 @@
 
 config LIBC_glibc
     select LIBC_SUPPORT_NPTL
-    select LIBC_SUPPORT_LINUXTHREADS
     help
       The de-facto standard for Linux distributions.
       Feature-rich, but large...  Most usefull for desktop-like systems.
@@ -95,11 +94,13 @@ config LIBC_GLIBC_V_2_5_1
     bool
     prompt "2.5.1 (OBSOLETE)"
     depends on OBSOLETE
+    select LIBC_SUPPORT_LINUXTHREADS
 
 config LIBC_GLIBC_V_2_5
     bool
     prompt "2.5 (OBSOLETE)"
     depends on OBSOLETE
+    select LIBC_SUPPORT_LINUXTHREADS
 
 endchoice
 

scripts/build/cc/gcc.sh

@@ -177,8 +177,8 @@ do_cc_core() {
         # the libstdc++ is not pulled automatically, although it
         # is needed. Shoe-horn it in our LDFLAGS
         # Ditto libm on some Fedora boxen
-        final_LDFLAGS+=("-lstdc++")
-        final_LDFLAGS+=("-lm")
+        core_LDFLAGS+=("-lstdc++")
+        core_LDFLAGS+=("-lm")
     else
         if [ "${CT_CC_STATIC_LIBSTDCXX}" = "y" ]; then
             # this is from CodeSourcery arm-2010q1-202-arm-none-linux-gnueabi.src.tar.bz2

scripts/build/internals.sh

@@ -7,6 +7,7 @@ do_finish() {
     local _t
     local _type
     local strip_args
+    local gcc_version
 
     CT_DoStep INFO "Cleaning-up the toolchain's directory"
 
@@ -21,14 +22,15 @@ do_finish() {
         esac
         CT_DoLog INFO "Stripping all toolchain executables"
         CT_Pushd "${CT_PREFIX_DIR}"
-        for _t in "bin/${CT_TARGET}-"*                                          \
-                  "${CT_TARGET}/bin/"*                                          \
-                  "libexec/gcc/${CT_TARGET}/${CT_CC_VERSION}/"*                 \
-                  "libexec/gcc/${CT_TARGET}/${CT_CC_VERSION}/install-tools/"*   \
+        gcc_version=$( "./bin/${CT_TARGET}-gcc" -dumpversion )
+        for _t in "bin/${CT_TARGET}-"*                                      \
+                  "${CT_TARGET}/bin/"*                                      \
+                  "libexec/gcc/${CT_TARGET}/${gcc_version}/"*               \
+                  "libexec/gcc/${CT_TARGET}/${gcc_version}/install-tools/"* \
         ; do
             _type="$( file "${_t}" |cut -d ' ' -f 2- )"
             case "${_type}" in
-                *"script text executable")
+                *script*executable*)
                     ;;
                 *executable*)
                     CT_DoExecLog ALL ${CT_HOST}-strip ${strip_args} "${_t}"
@@ -155,8 +157,6 @@ do_finish() {
     # the standard lib/ dirs, so we can get rid of the symlinks
     for d in                            \
         "${CT_PREFIX_DIR}"              \
-        "${CT_SYSROOT_DIR}"             \
-        "${CT_SYSROOT_DIR}/usr"         \
         "${CT_PREFIX_DIR}/${CT_TARGET}" \
     ; do
         CT_DoExecLog ALL rm -f "${d}/lib32"

scripts/crosstool-NG.sh.in

@@ -472,6 +472,13 @@ if [ -z "${CT_RESTART}" ]; then
         done
     done
 
+    # Some makeinfo versions are a pain in [put your most sensible body part here].
+    # Go ahead with those, by creating a wrapper that keeps partial files, and that
+    # never fails:
+    CT_DoLog DEBUG "  'makeinfo' -> '$(CT_Which makeinfo)'"
+    printf "#${BANG}${CT_SHELL}\n$(CT_Which makeinfo) --force \"\${@}\"\ntrue\n" >"${CT_PREFIX_DIR}/buildtools/makeinfo"
+    CT_DoExecLog ALL chmod 700 "${CT_PREFIX_DIR}/buildtools/makeinfo"
+
     # Carefully add paths in the order we want them:
     #  - first try in ${CT_PREFIX_DIR}/bin
     #  - then try in ${CT_CC_CORE_SHARED_PREFIX_DIR}/bin
@@ -485,13 +492,6 @@ if [ -z "${CT_RESTART}" ]; then
         *)  ;;
     esac
 
-    # Some makeinfo versions are a pain in [put your most sensible body part here].
-    # Go ahead with those, by creating a wrapper that keeps partial files, and that
-    # never fails:
-    CT_DoLog DEBUG "  'makeinfo' -> '$(CT_Which makeinfo)'"
-    printf "#${BANG}${CT_SHELL}\n$(CT_Which makeinfo) --force \"\${@}\"\ntrue\n" >"${CT_PREFIX_DIR}/buildtools/makeinfo"
-    CT_DoExecLog ALL chmod 700 "${CT_PREFIX_DIR}/buildtools/makeinfo"
-
     # Help gcc
     CT_CFLAGS_FOR_HOST=
     [ "${CT_USE_PIPES}" = "y" ] && CT_CFLAGS_FOR_HOST="${CT_CFLAGS_FOR_HOST} -pipe"

scripts/functions

@@ -105,7 +105,7 @@ CT_DoLog() {
               printf "[%-5s]%*s%s%s\n" "${cur_L}" "${indent}" " " "${line}"
               if [ ${cur_l} -le ${max_level} ]; then
                   # Only print to console (fd #6) if log level is high enough.
-                  printf "\r[%-5s]%*s%s%s\n" "${cur_L}" "${indent}" " " "${line}" >&6
+                  printf "${CT_LOG_PROGRESS_BAR:+\r}[%-5s]%*s%s%s\n" "${cur_L}" "${indent}" " " "${line}" >&6
               fi
               if [ "${CT_LOG_PROGRESS_BAR}" = "y" ]; then
                   printf "\r[%02d:%02d] %s " $((SECONDS/60)) $((SECONDS%60)) "${_prog_bar[$((_prog_bar_cpt/10))]}" >&6
@@ -235,7 +235,7 @@ CT_Which() {
 # to the highest entire second
 # Usage: CT_DoDate <fmt>
 CT_DoDate() {
-    date "$1" |sed -r -e 's/N$/000000000/;'
+    date "$1" |sed -r -e 's/%?N$/000000000/;'
 }
 
 CT_STEP_COUNT=1