1.15: close branch

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

.hgtags

@@ -30,3 +30,7 @@ c71b4f4da4b46aa83e6c013208731edfffd249a1 crosstool-ng-0.0.4
 ce34b7cd6509906de6885c084dbef7ddecd603c6 crosstool-ng-1.1.3a
 e016efb7036c14f86e1592114e621cfadeaf714c crosstool-ng-0.0.2
 fec15dd785b1ab52e15a350665362c3f58852931 crosstool-ng-0.1.0
+b005740d1473771dafa21bec70f450e0ae64bc76 crosstool-ng-1.15.0
+32abc27a388678c53d0d6f62035cf878d4dec8c3 crosstool-ng-1.15.1
+76d84aa2405f23496e17977704c905b872f79416 crosstool-ng-1.15.2
+172b72d597f9083f1aae98b7c482528ef2e41b6a crosstool-ng-1.15.3

.version

@@ -1 +1 @@
-hg
+1.15.3+hg

Makefile.in

@@ -53,6 +53,7 @@ export mandir          := @mandir@
 export datarootdir     := @datarootdir@
 export install         := @INSTALL@
 export bash            := @_BASH@
+export awk             := @_AWK@
 export grep            := @GREP@
 export make            := @MAKE@
 export sed             := @SED@
@@ -177,6 +178,7 @@ define sed_it
 	           -e 's,@@CT_DATE@@,$(DATE),g;'            \
 	           -e 's,@@CT_make@@,$(make),g;'            \
 	           -e 's,@@CT_bash@@,$(bash),g;'            \
+	           -e 's,@@CT_awk@@,$(awk),g;'              \
 	           $< >$@
 endef
 
@@ -195,6 +197,7 @@ paths.mk: FORCE
 	@echo "  GEN    '$@'"
 	@(echo 'export install=$(install)';         \
 	  echo 'export bash=$(bash)';               \
+	  echo 'export awk=$(awk)';                 \
 	  echo 'export grep=$(grep)';               \
 	  echo 'export make=$(make)';               \
 	  echo 'export sed=$(sed)';                 \
@@ -210,6 +213,7 @@ paths.sh: FORCE
 	@echo "  GEN    '$@'"
 	@(echo 'export install="$(install)"';       \
 	  echo 'export bash="$(bash)"';             \
+	  echo 'export awk="$(awk)"';               \
 	  echo 'export grep="$(grep)"';             \
 	  echo 'export make="$(make)"';             \
 	  echo 'export sed="$(sed)"';               \

config/companion_libs/cloog.in

@@ -8,8 +8,7 @@ choice
 
 config CLOOG_V_0_15_11
     bool
-    prompt "0.15.11 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "0.15.11"
     select CLOOG_0_15_1x
 
 config CLOOG_V_0_15_10

config/companion_libs/gmp.in

@@ -8,13 +8,11 @@ choice
 
 config GMP_V_5_0_2
     bool
-    prompt "5.0.2 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "5.0.2"
 
 config GMP_V_5_0_1
     bool
-    prompt "5.0.1 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "5.0.1"
 
 config GMP_V_4_3_2
     bool

config/companion_libs/mpc.in

@@ -8,13 +8,12 @@ choice
 
 config MPC_V_0_9
     bool
-    prompt "0.9 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "0.9"
 
 config MPC_V_0_8_2
     bool
-    prompt "0.8.2 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "0.8.2"
+
 
 config MPC_V_0_8_1
     bool

config/companion_libs/mpfr.in

@@ -8,13 +8,11 @@ choice
 
 config MPFR_V_3_1_0
     bool
-    prompt "3.1.0 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "3.1.0"
 
 config MPFR_V_3_0_1
     bool
-    prompt "3.0.1 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "3.0.1"
 
 config MPFR_V_3_0_0
     bool

config/companion_libs/ppl.in

@@ -8,20 +8,17 @@ choice
 
 config PPL_V_0_11_2
     bool
-    prompt "0.11.2 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "0.11.2"
     select PPL_0_11
 
 config PPL_V_0_11_1
     bool
-    prompt "0.11.1 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "0.11.1"
     select PPL_0_11
 
 config PPL_V_0_11
     bool
-    prompt "0.11 (EXPERIMENTAL)"
-    depends on EXPERIMENTAL
+    prompt "0.11"
     select PPL_0_11
 
 config PPL_V_0_10_2

configure.ac

@@ -90,6 +90,10 @@ AC_ARG_PROGRAM
 # Initial checks that are usually done first (I don't know why, that's
 # just what I seem to experience...)
 #---------------------------------------------------------------------
+AC_ARG_WITH([install],
+    AS_HELP_STRING([--with-install=PATH],
+                   [Specify the full PATH to a BSD-compatible install]),
+    [INSTALL=$withval])
 AC_PROG_INSTALL
 AC_PROG_GREP
 AC_PROG_EGREP
@@ -99,7 +103,7 @@ AS_IF(
 AC_CACHE_VAL([ac_cv_path_SED],
     [AC_ARG_WITH([sed],
         AS_HELP_STRING([--with-sed=PATH],
-                       [Specify the full PATH to sed]),
+                       [Specify the full PATH to GNU sed]),
         [ac_cv_path_SED=$withval])])
 AC_PROG_SED
 AC_MSG_CHECKING([whether sed understands -r -i -e])
@@ -121,6 +125,25 @@ AC_PROG_CC
 AS_IF([test -z "$CC"],
       [AC_MSG_ERROR([no suitable compiler found])])
 AC_PROG_CPP
+
+# But we still need a way to specify the PATH to GNU versions (Damn MacOS)
+AC_ARG_WITH([objcopy],
+    AS_HELP_STRING([--with-objcopy=PATH],
+                   [Specify the full PATH to GNU objcopy]),
+    [OBJCOPY=$withval])
+AC_ARG_WITH([objdump],
+    AS_HELP_STRING([--with-objdump=PATH],
+                   [Specify the full PATH to GNU objdump]),
+    [OBJDUMP=$withval])
+AC_ARG_WITH([ranlib],
+    AS_HELP_STRING([--with-ranlib=PATH],
+                   [Specify the full PATH to GNU ranlib]),
+    [RANLIB=$withval])
+AC_ARG_WITH([readelf],
+    AS_HELP_STRING([--with-readelf=PATH],
+                   [Specify the full PATH to GNU readelf]),
+    [READELF=$withval])
+
 AC_PROG_RANLIB
 ACX_PATH_TOOL_REQ([OBJCOPY], [objcopy])
 ACX_PATH_TOOL_REQ([OBJDUMP], [objdump])
@@ -129,12 +152,11 @@ ACX_PATH_TOOL_REQ([READELF], [readelf])
 ACX_CHECK_PROGS_REQ([bison], [bison])
 ACX_CHECK_PROGS_REQ([flex], [flex])
 ACX_CHECK_PROGS_REQ([gperf], [gperf])
-ACX_CHECK_PROGS_REQ([awk], [gawk mawk nawk awk])
 ACX_CHECK_PROGS_REQ([makeinfo], [makeinfo])
 ACX_CHECK_PROGS_REQ([cut], [cut])
 ACX_CHECK_PROGS_REQ([stat], [stat])
 ACX_CHECK_PROGS_REQ([readlink], [readlink])
-ACX_CHECK_PROGS_REQ([curl], [curl])
+ACX_CHECK_PROGS_REQ([wget], [wget])
 ACX_CHECK_PROGS_REQ([tar], [tar])
 ACX_CHECK_PROGS_REQ([gzip], [gzip])
 ACX_CHECK_PROGS_REQ([bzip2], [bzip2])
@@ -151,7 +173,7 @@ ACX_PATH_PROGS_REQ([PATCH], [patch])
 AC_CACHE_VAL([ac_cv_path__BASH],
     [AC_ARG_WITH([bash],
         AS_HELP_STRING([--with-bash=PATH],
-                       [Specify the full PATH to bash >= 3.1]),
+                       [Specify the full PATH to GNU bash >= 3.1]),
         [ac_cv_path__BASH=$withval])])
 AC_CACHE_CHECK([for bash >= 3.1], [ac_cv_path__BASH],
     [AC_PATH_PROGS_FEATURE_CHECK([_BASH], [bash],
@@ -162,6 +184,21 @@ AC_CACHE_CHECK([for bash >= 3.1], [ac_cv_path__BASH],
          AC_MSG_ERROR([could not find bash >= 3.1])])])
 AC_SUBST([_BASH], [$ac_cv_path__BASH])
 
+# We need a awk that *is* GNU awk
+AC_CACHE_VAL([ac_cv_path__AWK],
+    [AC_ARG_WITH([awk],
+        AS_HELP_STRING([--with-awk=PATH],
+                       [Specify the full PATH to GNU awk]),
+        [ac_cv_path__AWK=$withval])])
+AC_CACHE_CHECK([for GNU awk], [ac_cv_path__AWK],
+    [AC_PATH_PROGS_FEATURE_CHECK([_AWK], [awk gawk],
+        [[_AWK_ver=$($ac_path__AWK --version 2>&1 \
+                     |$EGREP '^GNU Awk ')
+          test -n "$_AWK_ver" && ac_cv_path__AWK=$ac_path__AWK ac_path__AWK_found=:]],
+        [AC_MSG_RESULT([no])
+         AC_MSG_ERROR([could not find GNU awk])])])
+AC_SUBST([_AWK], [$ac_cv_path__AWK])
+
 #----------------------------------------
 # Check for GNU make 3.80 or above
 AC_CACHE_VAL([ac_cv_path_MAKE],
@@ -266,8 +303,10 @@ AC_CHECK_HEADERS(
 AS_IF(
     [test -n "$ac_ct_gettext_hdr"],
     [AC_CHECK_DECL(
-        [gettext],gettext=y,,
-        [#include <$ac_ct_gettext_hdr>])])
+        [gettext],
+        [gettext=y],,
+        [AC_INCLUDES_DEFAULT()
+         #include <$ac_ct_gettext_hdr>])])
 
 #----------------------------------------
 # Check for ncurses, for the kconfig frontends

ct-ng.comp

@@ -1,6 +1,6 @@
 # To be sourced
 
-_ct-ng () {
+_ct_ng () {
     local cur prev samples show_samples actions steps start_steps stop_steps ct_ng_opts vars
     COMPREPLY=()
     cur=$(_get_cword)
@@ -30,4 +30,4 @@ _ct-ng () {
     COMPREPLY=($(compgen -W "${ct_ng_opts}" -- "${cur}"))
     return 0
 }
-complete -F _ct-ng ct-ng
+complete -F _ct_ng ct-ng

kconfig/Makefile

@@ -88,7 +88,7 @@ zconf.hash.c: zconf.gperf
 
 lex.zconf.c: zconf.l
 	@echo "  LEX    '$@'"
-	@flex -L -P zconf -o $@ $<
+	@flex -L -Pzconf -o$@ $<
 
 # Build C files
 %.o: %.c

kconfig/kconfig.mk

@@ -28,18 +28,18 @@ oldconfig: .config
 
 # Always be silent, the stdout an be >.config
 extractconfig:
-	@awk 'BEGIN { dump=0; }                                                 \
-	      dump==1 && $$0~/^\[.....\][[:space:]]+(# |)CT_/ {                 \
-	          $$1="";                                                       \
-	          gsub("^[[:space:]]","");                                      \
-	          print;                                                        \
-	      }                                                                 \
-	      $$0~/Dumping user-supplied crosstool-NG configuration: done in/ { \
-	          dump=0;                                                       \
-	      }                                                                 \
-	      $$0~/Dumping user-supplied crosstool-NG configuration$$/ {        \
-	          dump=1;                                                       \
-	      }'
+	@$(awk) 'BEGIN { dump=0; }                                                  \
+	         dump==1 && $$0~/^\[.....\][[:space:]]+(# |)CT_/ {                  \
+	             $$1="";                                                        \
+	             gsub("^[[:space:]]","");                                       \
+	             print;                                                         \
+	         }                                                                  \
+	         $$0~/Dumping user-supplied crosstool-NG configuration: done in/ {  \
+	             dump=0;                                                        \
+	         }                                                                  \
+	         $$0~/Dumping user-supplied crosstool-NG configuration$$/ {         \
+	             dump=1;                                                        \
+	         }'
 
 #-----------------------------------------------------------
 # Help text used by make help

scripts/build/cc/gcc.sh

@@ -792,7 +792,7 @@ do_cc_backend() {
 
     if [ "${build_manuals}" = "yes" ]; then
         CT_DoLog EXTRA "Building the GCC manuals"
-        CT_DoExecLog ALL make ${JOBSFLAGS} pdf html
+        CT_DoExecLog ALL make pdf html
         CT_DoLog EXTRA "Installing the GCC manuals"
         CT_DoExecLog ALL make install-{pdf,html}-gcc
     fi

scripts/build/debug/200-duma.sh

@@ -1,10 +1,15 @@
 # Build script for D.U.M.A.
 
 do_debug_duma_get() {
+    local dl_base
+
+    dl_base="http://dfn.dl.sourceforge.net/project/duma/duma"
+    dl_base+="/${CT_DUMA_VERSION//_/.}"
+
     # Downloading an non-existing file from sourceforge will give you an
     # HTML file containing an error message, instead of returning a 404.
     # Sigh...
-    CT_GetFile "duma_${CT_DUMA_VERSION}" .tar.gz http://kent.dl.sourceforge.net/sourceforge/duma/
+    CT_GetFile "duma_${CT_DUMA_VERSION}" .tar.gz "${dl_base}"
     # Downloading from sourceforge may leave garbage, cleanup
     CT_DoExecLog ALL rm -f "${CT_TARBALLS_DIR}/showfiles.php"*
 }

scripts/crosstool-NG.sh.in

@@ -596,6 +596,10 @@ if [ "${CT_ONLY_DOWNLOAD}" != "y" -a "${CT_ONLY_EXTRACT}" != "y" ]; then
         fi
         if [ ${do_it} -eq 1 ]; then
             ( do_${step} )
+            # POSIX 1003.1-2008 does not say if "set -e" should catch a
+            # sub-shell ending with !0. bash-3 does not, while bash-4 does,
+            # so the following line is for bash-3; bash-4 would choke above.
+            [ $? -eq 0 ]
             if [ "${CT_STOP}" = "${step}" ]; then
                 do_stop=1
             fi

scripts/functions

@@ -971,13 +971,13 @@ CT_DoBuildTargetTuple() {
             target_endian_eb=eb
             target_endian_el=
             CT_ARCH_ENDIAN_CFLAG="-mbig-endian"
-            CT_ARCH_ENDIAN_LDFLAG="-EB"
+            CT_ARCH_ENDIAN_LDFLAG="-Wl,-EB"
             ;;
         little)
             target_endian_eb=
             target_endian_el=el
             CT_ARCH_ENDIAN_CFLAG="-mlittle-endian"
-            CT_ARCH_ENDIAN_LDFLAG="-EL"
+            CT_ARCH_ENDIAN_LDFLAG="-Wl,-EL"
             ;;
     esac