aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2009-08-16 15:09:13 +0000
committerRalf Wildenhues <rwild@gcc.gnu.org>2009-08-16 15:09:13 +0000
commit354ebf88ee1806c4d9b279c765d2d344303ffc66 (patch)
tree0d65f46b84612963e2297e8117eea9ca10e355fd
parentc936f0d5762d634693e7320d991c5d4a4f10bfd4 (diff)
downloadgcc-354ebf88ee1806c4d9b279c765d2d344303ffc66.zip
gcc-354ebf88ee1806c4d9b279c765d2d344303ffc66.tar.gz
gcc-354ebf88ee1806c4d9b279c765d2d344303ffc66.tar.bz2
Sync toplevel from src and merge.
/: Sync from src, merge: 2009-07-02 Tristan Gingold <gingold@adacore.com> * configure.ac: Do not exclude gas for i386-*-darwin. Add a case for x86_64-*-darwin. * configure: Regenerate. From-SVN: r150800
-rw-r--r--ChangeLog10
-rwxr-xr-xconfigure6
-rw-r--r--configure.ac6
3 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f4dd8a4..5796e4f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2009-08-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+
+ Sync from src, merge:
+
+ 2009-07-02 Tristan Gingold <gingold@adacore.com>
+
+ * configure.ac: Do not exclude gas for i386-*-darwin.
+ Add a case for x86_64-*-darwin.
+ * configure: Regenerate.
+
2009-08-06 Neil Vachharajani <nvachhar@gmail.com>
* MAINTAINERS: Add my name to Write After Approval list.
diff --git a/configure b/configure
index b7e22f7..ed4791b1 100755
--- a/configure
+++ b/configure
@@ -2226,7 +2226,11 @@ case "${target}" in
noconfigdirs="$noconfigdirs ld gas gdb gprof"
noconfigdirs="$noconfigdirs sim target-rda"
;;
- i[3456789]86-*-darwin* | x86_64-*-darwin[912]*)
+ i[3456789]86-*-darwin*)
+ noconfigdirs="$noconfigdirs ld gprof"
+ noconfigdirs="$noconfigdirs sim target-rda"
+ ;;
+ x86_64-*-darwin[912]*)
noconfigdirs="$noconfigdirs ld gas gprof"
noconfigdirs="$noconfigdirs sim target-rda"
;;
diff --git a/configure.ac b/configure.ac
index 15cea13..7508758 100644
--- a/configure.ac
+++ b/configure.ac
@@ -450,7 +450,11 @@ case "${target}" in
noconfigdirs="$noconfigdirs ld gas gdb gprof"
noconfigdirs="$noconfigdirs sim target-rda"
;;
- i[[3456789]]86-*-darwin* | x86_64-*-darwin[[912]]*)
+ i[[3456789]]86-*-darwin*)
+ noconfigdirs="$noconfigdirs ld gprof"
+ noconfigdirs="$noconfigdirs sim target-rda"
+ ;;
+ x86_64-*-darwin[[912]]*)
noconfigdirs="$noconfigdirs ld gas gprof"
noconfigdirs="$noconfigdirs sim target-rda"
;;