Makefile (x86-64/Linux): Restore missing pairs.

	* gcc-interface/Makefile (x86-64/Linux): Restore missing pairs.
	(x86/Darwin): Likewise.

From-SVN: r241369

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index a868982b285d00974c161c0215901ab2bcf73a91..1a5607f6ce44ac84830d6a9031f490b3a7baa201 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2016-10-20  Nicolas Roche  <roche@adacore.com>
+
+       * gcc-interface/Makefile (x86-64/Linux): Restore missing pairs.
+       (x86/Darwin): Likewise.
+
 2016-10-19  Eric Botcazou  <ebotcazou@adacore.com>
 
        * system-linux-armel.ads: Rename into...

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index d24e5377da829ea108ea92a46eab8360debc1f39..e22b4d20a0003f6ccfff2c8d7d178d66bb2756a5 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -2274,6 +2274,9 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
 
     ifeq ($(strip $(MULTISUBDIR)),/x86_64)
       SO_OPTS += -m64
+      LIBGNAT_TARGET_PAIRS += $(X86_64_TARGET_PAIRS)
+    else
+      LIBGNAT_TARGET_PAIRS += $(X86_TARGET_PAIRS)
     endif
 
     EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o
@@ -2290,6 +2293,9 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
 
     ifeq ($(strip $(MULTISUBDIR)),/i386)
       SO_OPTS += -m32
+      LIBGNAT_TARGET_PAIRS += $(X86_TARGET_PAIRS)
+    else
+      LIBGNAT_TARGET_PAIRS += $(X86_64_TARGET_PAIRS)
     endif
 
     EXTRA_GNATRTL_NONTASKING_OBJS=g-sse.o g-ssvety.o