diff options
| author | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-08-16 15:09:13 +0000 |
|---|---|---|
| committer | rwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-08-16 15:09:13 +0000 |
| commit | ea864ded82fb6031d519ab6d705e814db2337f9c (patch) | |
| tree | 0d65f46b84612963e2297e8117eea9ca10e355fd | |
| parent | 745dbd8cb5d93fe40be03434c93184c2cd30365b (diff) | |
| download | gcc-ea864ded82fb6031d519ab6d705e814db2337f9c.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@150800 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | configure.ac | 6 |
3 files changed, 20 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index f4dd8a4e17e..5796e4f376f 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 b7e22f700a4..ed4791b1288 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 15cea138ceb..7508758f01f 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" ;; |