diff options
| author | Nicolas Roche <roche@adacore.com> | 2016-10-20 11:06:21 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2016-10-20 11:06:21 +0000 |
| commit | 2e20345f137fe5116140ba78193f88dd57e2b8a6 (patch) | |
| tree | 81f18d0db5b0f21de0244813d4ea963a349523ca /gcc | |
| parent | 40cc684dce5afb2924e30a976619fd800d591d70 (diff) | |
| download | gcc-2e20345f137fe5116140ba78193f88dd57e2b8a6.zip gcc-2e20345f137fe5116140ba78193f88dd57e2b8a6.tar.gz gcc-2e20345f137fe5116140ba78193f88dd57e2b8a6.tar.bz2 | |
Makefile (x86-64/Linux): Restore missing pairs.
* gcc-interface/Makefile (x86-64/Linux): Restore missing pairs.
(x86/Darwin): Likewise.
From-SVN: r241369
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ada/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 6 |
2 files changed, 11 insertions, 0 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index a868982..1a5607f 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 d24e537..e22b4d20 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 |