Support building glibc with gold 1.14 or above [BZ #14995]

author H.J. Lu <hjl.tools@gmail.com>

Wed, 28 Jun 2017 11:03:57 +0000 (04:03 -0700)

committer H.J. Lu <hjl.tools@gmail.com>

Wed, 28 Jun 2017 11:03:57 +0000 (04:03 -0700)
author H.J. Lu <hjl.tools@gmail.com>
Wed, 28 Jun 2017 11:03:57 +0000 (04:03 -0700)
committer H.J. Lu <hjl.tools@gmail.com>
Wed, 28 Jun 2017 11:03:57 +0000 (04:03 -0700)
diff --git a/ChangeLog b/ChangeLog

index 7bcff3bd62a3f12ac4c4a1f7dbd5e9b09870d98a..dc781f94d3eab49e691bd0b9d50084c06054e08d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2017-06-28  H.J. Lu  <hongjiu.lu@intel.com>
+
+       [BZ #14995]
+       * configure.ac: Allow gold 1.14 or above to configire glibc
+       * configure: Regenerated.
+
  2017-06-28  Joseph Myers  <joseph@codesourcery.com>
  
         [BZ #21457]
diff --git a/configure b/configure

index 97a2dadf2dd8c451b5da0409043cbe2144c6b847..b55fc92c53170ccdcd5f9100d5fb373383cac251 100755 (executable)
--- a/configure
+++ b/configure
@@ -4662,7 +4662,74 @@ if test $ac_verc_fail = yes; then
    AS=: critic_missing="$critic_missing as"
  fi
  
-for ac_prog in $LD
+
+if test -n "`$LD --version | sed -n 's/^GNU \(gold\).*$/\1/p'`"; then
+  # Accept gold 1.14 or higher
+  for ac_prog in $LD
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_LD+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$LD"; then
+  ac_cv_prog_LD="$LD" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_LD="$ac_prog"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+LD=$ac_cv_prog_LD
+if test -n "$LD"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LD" >&5
+$as_echo "$LD" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$LD" && break
+done
+
+if test -z "$LD"; then
+  ac_verc_fail=yes
+else
+  # Found it, now check the version.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking version of $LD" >&5
+$as_echo_n "checking version of $LD... " >&6; }
+  ac_prog_version=`$LD --version 2>&1 | sed -n 's/^.*GNU gold.* \([0-9][0-9]*\.[0-9.]*\).*$/\1/p'`
+  case $ac_prog_version in
+    '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;;
+    1.1[4-9]*|1.[2-9][0-9]*|1.1[0-9][0-9]*|[2-9].*|[1-9][0-9]*)
+       ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;;
+    *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;;
+
+  esac
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_prog_version" >&5
+$as_echo "$ac_prog_version" >&6; }
+fi
+if test $ac_verc_fail = yes; then
+  LD=: critic_missing="$critic_missing GNU gold"
+fi
+
+else
+  for ac_prog in $LD
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
  set dummy $ac_prog; ac_word=$2
@@ -4722,9 +4789,10 @@ $as_echo_n "checking version of $LD... " >&6; }
  $as_echo "$ac_prog_version" >&6; }
  fi
  if test $ac_verc_fail = yes; then
-  LD=: critic_missing="$critic_missing ld"
+  LD=: critic_missing="$critic_missing GNU ld"
  fi
  
+fi
  
  # These programs are version sensitive.
  
diff --git a/configure.ac b/configure.ac

index 16e97d3930b8adaf3f134bb60ed70d68e1131c94..5f62ecb7185dd8f7178733ab406f0622fb1131bc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1076,10 +1076,19 @@ AC_CHECK_PROG_VER(AS, $AS, --version,
                   [GNU assembler.* \([0-9]*\.[0-9.]*\)],
                   [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*],
                   AS=: critic_missing="$critic_missing as")
-AC_CHECK_PROG_VER(LD, $LD, --version,
-                 [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
-                 [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*],
-                 LD=: critic_missing="$critic_missing ld")
+
+if test -n "`$LD --version | sed -n 's/^GNU \(gold\).*$/\1/p'`"; then
+  # Accept gold 1.14 or higher
+  AC_CHECK_PROG_VER(LD, $LD, --version,
+                   [GNU gold.* \([0-9][0-9]*\.[0-9.]*\)],
+                   [1.1[4-9]*|1.[2-9][0-9]*|1.1[0-9][0-9]*|[2-9].*|[1-9][0-9]*],
+                   LD=: critic_missing="$critic_missing GNU gold")
+else
+  AC_CHECK_PROG_VER(LD, $LD, --version,
+                   [GNU ld.* \([0-9][0-9]*\.[0-9.]*\)],
+                   [2.1[0-9][0-9]*|2.2[2-9]*|2.[3-9][0-9]*|[3-9].*|[1-9][0-9]*],
+                   LD=: critic_missing="$critic_missing GNU ld")
+fi
  
  # These programs are version sensitive.
  AC_CHECK_TOOL_PREFIX
author	H.J. Lu <hjl.tools@gmail.com>
	Wed, 28 Jun 2017 11:03:57 +0000 (04:03 -0700)
committer	H.J. Lu <hjl.tools@gmail.com>
	Wed, 28 Jun 2017 11:03:57 +0000 (04:03 -0700)
ChangeLog		patch \| blob \| blame \| history
configure		patch \| blob \| blame \| history
configure.ac		patch \| blob \| blame \| history