Merge from gcc:

	2010-03-19  Jack Howarth <howarth@bromo.med.uc.edu>
	PR ada/42554
	* configure.ac: Only pass -c to ranlib for darwin9 and earlier.
	* configure: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 56fcc6c3d05224322738c8a456ef076f2f214396..ad208a1fe55d4d30961ec986f0186e4331f3f7ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-23  Joseph Myers  <joseph@codesourcery.com>
+
+       Merge from gcc:
+       2010-03-19  Jack Howarth <howarth@bromo.med.uc.edu>
+       PR ada/42554
+       * configure.ac: Only pass -c to ranlib for darwin9 and earlier.
+       * configure: Regenerate.
+
 2010-03-23  Joseph Myers  <joseph@codesourcery.com>
 
        * config.sub: Update to version 2010-03-22.

diff --git a/configure b/configure
index f3212128d00417a8d0a64eaef3d526df7011edeb..508d958960b6ea7381d8cd4994e3c9025abbd110 100755 (executable)
--- a/configure
+++ b/configure
@@ -7292,8 +7292,8 @@ case "${target}" in
     extra_arflags_for_target=" -X32_64"
     extra_nmflags_for_target=" -B -X32_64"
     ;;
-  *-*-darwin*)
-    # ranlib from Darwin requires the -c flag to look at common symbols.
+  *-*-darwin[3-9]*)
+    # ranlib before Darwin10 requires the -c flag to look at common symbols.
     extra_ranlibflags_for_target=" -c"
     ;;
   mips*-*-pe | sh*-*-pe | *arm-wince-pe)

diff --git a/configure.ac b/configure.ac
index 92f3a9062c25989a28dc98b1de8bbaea5990fccd..a5d75ee71d91407dd03f2101e8167eab594fc549 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2405,8 +2405,8 @@ case "${target}" in
     extra_arflags_for_target=" -X32_64"
     extra_nmflags_for_target=" -B -X32_64"
     ;;
-  *-*-darwin*)
-    # ranlib from Darwin requires the -c flag to look at common symbols.
+  *-*-darwin[[3-9]]*)
+    # ranlib before Darwin10 requires the -c flag to look at common symbols.
     extra_ranlibflags_for_target=" -c"
     ;;
   mips*-*-pe | sh*-*-pe | *arm-wince-pe)