aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIain Sandoe <iain@sandoe.co.uk>2020-10-25 10:11:27 +0000
committerIain Sandoe <iain@sandoe.co.uk>2020-10-25 19:20:42 +0000
commit308e40331f9d2820f8286769b5fc764671187364 (patch)
treea3cf6984a6f7c1eae55a7a3c09aff327e6bcccbb /gcc
parent47d13acbda9a5d8eb57ff169ba74857cd54108e4 (diff)
downloadgcc-308e40331f9d2820f8286769b5fc764671187364.zip
gcc-308e40331f9d2820f8286769b5fc764671187364.tar.gz
gcc-308e40331f9d2820f8286769b5fc764671187364.tar.bz2
Ada, Darwin, PowerPC : Fix bootstrap after 128 int changes.
The GNATRTL_128BIT_PAIRS/OBJS need to be added for 64bit multilibs on powerpc-darwin, and for powerpc64-darwin. gcc/ada/ChangeLog: * Makefile.rtl: Add GNATRTL_128BIT_PAIRS/OBJS for 64bit PowerPC Darwin cases.
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ada/Makefile.rtl13
1 files changed, 12 insertions, 1 deletions
diff --git a/gcc/ada/Makefile.rtl b/gcc/ada/Makefile.rtl
index 7b5b334..ba8c28c 100644
--- a/gcc/ada/Makefile.rtl
+++ b/gcc/ada/Makefile.rtl
@@ -2795,8 +2795,19 @@ ifeq ($(strip $(filter-out darwin%,$(target_os))),)
$(ATOMICS_BUILTINS_TARGET_PAIRS) \
system.ads<libgnat/system-darwin-ppc.ads
- ifeq ($(strip $(MULTISUBDIR)),/ppc64)
+ ifeq ($(strip $(filter-out powerpc64,$(target_cpu))),)
+ ifneq ($(strip $(MULTISUBDIR)),/ppc)
+ LIBGNAT_TARGET_PAIRS += $(GNATRTL_128BIT_PAIRS)
+ EXTRA_GNATRTL_NONTASKING_OBJS += $(GNATRTL_128BIT_OBJS)
+ else
+ SO_OPTS += -m32
+ endif
+ else
+ ifeq ($(strip $(MULTISUBDIR)),/ppc64)
SO_OPTS += -m64
+ LIBGNAT_TARGET_PAIRS += $(GNATRTL_128BIT_PAIRS)
+ EXTRA_GNATRTL_NONTASKING_OBJS += $(GNATRTL_128BIT_OBJS)
+ endif
endif
endif