aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorEric Botcazou <ebotcazou@adacore.com>2011-02-08 22:55:57 +0000
committerEric Botcazou <ebotcazou@gcc.gnu.org>2011-02-08 22:55:57 +0000
commit07b8e9109e7db1283e6164fdc5deb84812c090f7 (patch)
treedd1abb3c63b4591df02fdd944ca0ef1bdfe05113 /gcc
parent4933ae741c34303385b7eb4d8b5177af4c00e499 (diff)
downloadgcc-07b8e9109e7db1283e6164fdc5deb84812c090f7.zip
gcc-07b8e9109e7db1283e6164fdc5deb84812c090f7.tar.gz
gcc-07b8e9109e7db1283e6164fdc5deb84812c090f7.tar.bz2
* gcc-interface/Makefile.in (x86-64 darwin): Handle multilibs.
From-SVN: r169950
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/ChangeLog4
-rw-r--r--gcc/ada/gcc-interface/Makefile.in12
2 files changed, 13 insertions, 3 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index c520f72..f496bb4 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-08 Eric Botcazou <ebotcazou@adacore.com>
+
+ * gcc-interface/Makefile.in (x86-64 darwin): Handle multilibs.
+
2011-02-03 Eric Botcazou <ebotcazou@adacore.com>
* gcc-interface/gigi.h (fill_vms_descriptor): Take GNU_TYPE instead of
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index 29a79d7..b64ba55 100644
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -2142,12 +2142,18 @@ ifeq ($(strip $(filter-out darwin%,$(osys))),)
s-taprop.adb<s-taprop-posix.adb \
s-taspri.ads<s-taspri-posix.ads \
s-tpopsp.adb<s-tpopsp-posix-foreign.adb \
- a-numaux.ads<a-numaux-x86.ads \
- a-numaux.adb<a-numaux-x86.adb \
g-trasym.ads<g-trasym-unimplemented.ads \
g-trasym.adb<g-trasym-unimplemented.adb \
- system.ads<system-darwin-x86_64.ads \
+ a-numaux.ads<a-numaux-x86.ads \
+ a-numaux.adb<a-numaux-x86.adb \
$(ATOMICS_TARGET_PAIRS)
+ ifeq ($(strip $(MULTISUBDIR)),/i386)
+ LIBGNAT_TARGET_PAIRS += \
+ system.ads<system-darwin-x86.ads
+ else
+ LIBGNAT_TARGET_PAIRS += \
+ system.ads<system-darwin-x86_64.ads
+ endif
endif
ifeq ($(strip $(filter-out powerpc%,$(arch))),)