diff options
| author | Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> | 2011-12-20 12:16:43 +0000 |
|---|---|---|
| committer | Rainer Orth <ro@gcc.gnu.org> | 2011-12-20 12:16:43 +0000 |
| commit | 6b302f97203aa825fd0e46feecdd2cee47f54e75 (patch) | |
| tree | 680fa69051001e2d73f23f0545bde7ffc5bf6772 | |
| parent | f0bc5f840f8866ac73e1c5cc257f6695165c4405 (diff) | |
| download | gcc-6b302f97203aa825fd0e46feecdd2cee47f54e75.zip gcc-6b302f97203aa825fd0e46feecdd2cee47f54e75.tar.gz gcc-6b302f97203aa825fd0e46feecdd2cee47f54e75.tar.bz2 | |
Support 64-bit libgnat multilib on i?86-linux
* gcc-interface/Makefile.in (%86 linux%):
(LIBGNAT_TARGET_PAIRS_32): Split off from LIBGNAT_TARGET_PAIRS.
(LIBGNAT_TARGET_PAIRS_64): New.
(LIBGNAT_TARGET_PAIRS): Add either depending on multilib.
From-SVN: r182527
| -rw-r--r-- | gcc/ada/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 18 |
2 files changed, 22 insertions, 3 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 0533f9c..1ddb5bb 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,10 @@ +2011-12-20 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> + + * gcc-interface/Makefile.in (%86 linux%): + (LIBGNAT_TARGET_PAIRS_32): Split off from LIBGNAT_TARGET_PAIRS. + (LIBGNAT_TARGET_PAIRS_64): New. + (LIBGNAT_TARGET_PAIRS): Add either depending on multilib. + 2011-12-18 Eric Botcazou <ebotcazou@adacore.com> * gcc-interface/decl.c (gnat_to_gnu_param): Add comment about double diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index f6aac1c..2af4e74 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1102,9 +1102,21 @@ ifeq ($(strip $(filter-out %86 linux%,$(arch) $(osys))),) a-exetim.ads<a-exetim-default.ads \ s-linux.ads<s-linux.ads \ s-osinte.adb<s-osinte-posix.adb \ - system.ads<system-linux-x86.ads \ - $(ATOMICS_TARGET_PAIRS) \ - $(X86_TARGET_PAIRS) + $(ATOMICS_TARGET_PAIRS) + + LIBGNAT_TARGET_PAIRS_32 = \ + $(X86_TARGET_PAIRS) \ + system.ads<system-linux-x86.ads + + LIBGNAT_TARGET_PAIRS_64 = \ + $(X86_64_TARGET_PAIRS) \ + system.ads<system-linux-x86_64.ads + + ifeq ($(strip $(MULTISUBDIR)),/64) + LIBGNAT_TARGET_PAIRS += $(LIBGNAT_TARGET_PAIRS_64) + else + LIBGNAT_TARGET_PAIRS += $(LIBGNAT_TARGET_PAIRS_32) + endif ifeq ($(strip $(filter-out xenomai,$(THREAD_KIND))),) LIBGNAT_TARGET_PAIRS += \ |