* lib/gas-defs.exp (regexp_diff): Allow '#...' to mean "some

[deliverable/binutils-gdb.git] / ld / configure

diff --git a/ld/configure b/ld/configure
index 6f159df75c17ada522da4ff4e3484db59195f459..d907e9fb55d3cf4ae5e2ecfc1e8fd3d3eb7ff14a 100755 (executable)
--- a/ld/configure
+++ b/ld/configure
@@ -814,7 +814,7 @@ fi
 
 PACKAGE=ld
 
-VERSION=2.9.4
+VERSION=2.9.5
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
@@ -4474,7 +4474,7 @@ fi
 
 
 case "${host}" in
-*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows)
+*-*-msdos* | *-*-go32* | *-*-mingw32* | *-*-cygwin* | *-*-windows*)
   cat >> confdefs.h <<\EOF
 #define USE_BINARY_FOPEN 1
 EOF
@@ -4717,12 +4717,49 @@ EOF
 fi
 
 
+# When converting linker scripts into strings for use in emulation
+# files, use astring.sed if the compiler supports ANSI string
+# concatenation, or ostring.sed otherwise.  This is to support the
+# broken Microsoft MSVC compiler, which limits the length of string
+# constants, while still supporting pre-ANSI compilers which do not
+# support string concatenation.
+if eval "test \"`echo '$''{'ld_cv_string_concatenation'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  cat > conftest.$ac_ext <<EOF
+#line 4731 "configure"
+#include "confdefs.h"
+
+int main() {
+char *a = "a" "a";
+; return 0; }
+EOF
+if { (eval echo configure:4738: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+  rm -rf conftest*
+  ld_cv_string_concatenation=true
+else
+  echo "configure: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  rm -rf conftest*
+  ld_cv_string_concatenation=false
+fi
+rm -f conftest*
+fi
+
+if test "$ld_cv_string_concatenation" = "true"; then
+  STRINGIFY=astring.sed
+else
+  STRINGIFY=ostring.sed
+fi
+
+
 # target-specific stuff:
 
 all_targets=
 EMUL=
 all_emuls=
 all_emul_extras=
+all_libpath=
 
 rm -f tdirs
 
@@ -4732,7 +4769,7 @@ do
     all_targets=true
   else
     # Canonicalize the secondary target names.
-    result=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $targ_alias 2>/dev/null`
+    result=`$ac_config_sub $targ_alias 2>/dev/null`
     if test -n "$result"; then
        targ=$result
     else
@@ -4757,12 +4794,15 @@ do
        esac
     done
 
-    all_libpath=$targ_emul
-    for i in $targ_extra_libpath; do
+    for i in $targ_emul $targ_extra_libpath; do
        case " $all_libpath " in
        *" ${i} "*) ;;
        *)
-         all_libpath="$all_libpath ${i}"
+         if test -z "$all_libpath"; then
+           all_libpath=${i}
+         else
+           all_libpath="$all_libpath ${i}"
+         fi
          ;;
        esac
     done
@@ -5009,6 +5049,7 @@ s%@HDEFINES@%$HDEFINES%g
 s%@HOSTING_CRT0@%$HOSTING_CRT0%g
 s%@HOSTING_LIBS@%$HOSTING_LIBS%g
 s%@NATIVE_LIB_DIRS@%$NATIVE_LIB_DIRS%g
+s%@STRINGIFY@%$STRINGIFY%g
 s%@EMUL@%$EMUL%g
 /@TDIRS@/r $TDIRS
 s%@TDIRS@%%g