From: Nicolas Roche <roche@adacore.com>
Date: Thu, 20 Oct 2016 11:06:21 +0000 (+0000)
Subject: Makefile (x86-64/Linux): Restore missing pairs.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e20345f137fe5116140ba78193f88dd57e2b8a6;p=gcc.git

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 a868982b285..1a5607f6ce4 100644
--- 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 d24e5377da8..e22b4d20a00 100644
--- 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