aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rwxr-xr-xconfigure4
-rw-r--r--configure.ac4
3 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 56fcc6c..ad208a1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
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.
* config.guess: Update to version 2009-12-30.
diff --git a/configure b/configure
index f321212..508d958 100755
--- 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 92f3a90..a5d75ee 100644
--- 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)