diff options
| author | Eric Botcazou <ebotcazou@adacore.com> | 2017-05-12 15:55:46 +0000 |
|---|---|---|
| committer | Eric Botcazou <ebotcazou@gcc.gnu.org> | 2017-05-12 15:55:46 +0000 |
| commit | 9dd19976b1b01fd5490fe9f3e840153db8a9610b (patch) | |
| tree | e1254fa04d261a17dd6d88f9be4c1ada79194ebb /gcc/ada/gcc-interface | |
| parent | 302a0e37cfa7255c3049ec97996a050e7ade3407 (diff) | |
| download | gcc-9dd19976b1b01fd5490fe9f3e840153db8a9610b.zip gcc-9dd19976b1b01fd5490fe9f3e840153db8a9610b.tar.gz gcc-9dd19976b1b01fd5490fe9f3e840153db8a9610b.tar.bz2 | |
re PR ada/80117 (Standard'Word_Size is wrong for aarch64 ILP32)
* system-linux-arm.ads (Memory_Size): Use Long_Integer'Size
instead of Word_Size.
Revert
2017-03-28 Andreas Schwab <schwab@suse.de>
PR ada/80117
* system-linux-aarch64-ilp32.ads: New file.
* gcc-interface/Makefile.in (LIBGNAT_TARGET_PAIRS_COMMON): Rename
from LIBGNAT_TARGET_PAIRS.
(LIBGNAT_TARGET_PAIRS_32, LIBGNAT_TARGET_PAIRS_64): Define.
(LIBGNAT_TARGET_PAIRS): Use LIBGNAT_TARGET_PAIRS_COMMON, and
LIBGNAT_TARGET_PAIRS_64 or LIBGNAT_TARGET_PAIRS_32 for -mabi=lp64
or -mabi=ilp32, resp.
From-SVN: r247979
Diffstat (limited to 'gcc/ada/gcc-interface')
| -rw-r--r-- | gcc/ada/gcc-interface/Makefile.in | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in index b65ec2c..9566759 100644 --- a/gcc/ada/gcc-interface/Makefile.in +++ b/gcc/ada/gcc-interface/Makefile.in @@ -1984,7 +1984,7 @@ endif # AArch64 Linux ifeq ($(strip $(filter-out aarch64% linux%,$(target_cpu) $(target_os))),) - LIBGNAT_TARGET_PAIRS_COMMON = \ + LIBGNAT_TARGET_PAIRS = \ a-exetim.adb<a-exetim-posix.adb \ a-exetim.ads<a-exetim-default.ads \ a-intnam.ads<a-intnam-linux.ads \ @@ -2004,22 +2004,9 @@ ifeq ($(strip $(filter-out aarch64% linux%,$(target_cpu) $(target_os))),) s-taspri.ads<s-taspri-posix.ads \ g-sercom.adb<g-sercom-linux.adb \ $(ATOMICS_TARGET_PAIRS) \ - $(ATOMICS_BUILTINS_TARGET_PAIRS) - - LIBGNAT_TARGET_PAIRS_32 = \ - system.ads<system-linux-aarch64-ilp32.ads - - LIBGNAT_TARGET_PAIRS_64 = \ + $(ATOMICS_BUILTINS_TARGET_PAIRS) \ system.ads<system-linux-arm.ads - ifneq (,$(or $(filter aarch64-linux-gnu, $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multiarch)), $(filter ../lib64, $(shell $(GCC_FOR_TARGET) $(GNATLIBCFLAGS) -print-multi-os-directory)))) - LIBGNAT_TARGET_PAIRS = \ - $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_64) - else - LIBGNAT_TARGET_PAIRS = \ - $(LIBGNAT_TARGET_PAIRS_COMMON) $(LIBGNAT_TARGET_PAIRS_32) - endif - TOOLS_TARGET_PAIRS = \ mlib-tgt-specific.adb<mlib-tgt-specific-linux.adb \ indepsw.adb<indepsw-gnu.adb |