summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormeissner <meissner@138bc75d-0d04-0410-961f-82ee72b054a4>1996-10-28 15:17:18 +0000
committermeissner <meissner@138bc75d-0d04-0410-961f-82ee72b054a4>1996-10-28 15:17:18 +0000
commit08e8b449f9ec990422c22719f64ecbc3b85ae169 (patch)
treecb972471673f128a5d57f6341162c961003e2483
parent9cc638ff32185677c72ba625070ee29d4c35ce53 (diff)
downloadgcc-08e8b449f9ec990422c22719f64ecbc3b85ae169.tar.gz
Work with latest changes to Makefile; -fpic does not need a TOC area
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@13048 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/config/rs6000/sysv4.h7
-rw-r--r--gcc/config/rs6000/t-ppc2
-rw-r--r--gcc/config/rs6000/t-ppcgas2
3 files changed, 6 insertions, 5 deletions
diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 6954ed7292b..a734ee63ad7 100644
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -47,9 +47,10 @@ extern enum rs6000_sdata_type rs6000_sdata;
#define TARGET_REGNAMES (target_flags & MASK_REGNAMES)
#define TARGET_PROTOTYPE (target_flags & MASK_PROTOTYPE)
#define TARGET_EABI (target_flags & MASK_EABI)
-#define TARGET_TOC ((target_flags & (MASK_64BIT \
- | MASK_RELOCATABLE \
- | MASK_MINIMAL_TOC)) \
+#define TARGET_TOC ((target_flags & MASK_64BIT) \
+ || ((target_flags & (MASK_RELOCATABLE \
+ | MASK_MINIMAL_TOC)) \
+ && flag_pic > 1) \
|| DEFAULT_ABI == ABI_AIX \
|| DEFAULT_ABI == ABI_NT)
diff --git a/gcc/config/rs6000/t-ppc b/gcc/config/rs6000/t-ppc
index e8cf6674b21..13f450dbba2 100644
--- a/gcc/config/rs6000/t-ppc
+++ b/gcc/config/rs6000/t-ppc
@@ -73,7 +73,7 @@ stmp-crt-sub:
$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -c -o $(dir)/scrt0.o scrt0.c
# Install multiple versions of crt[in].o
-install-crt: stmp-crt install-dir install-multilib
+install-crt: stmp-crt installdirs install-multilib
for i in `$(GCC_FOR_TARGET) --print-multi-lib`; do \
dir=`echo $$i | sed -e 's/;.*$$//'`; \
rm -f $(libsubdir)/$${dir}/[es]crt[in0].o; \
diff --git a/gcc/config/rs6000/t-ppcgas b/gcc/config/rs6000/t-ppcgas
index 719babc5024..a57bddb313c 100644
--- a/gcc/config/rs6000/t-ppcgas
+++ b/gcc/config/rs6000/t-ppcgas
@@ -105,7 +105,7 @@ stmp-crt-sub2:
$(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -c -o $(dir)/scrt0.o scrt0.c
# Install multiple versions of ?crt[in].o
-install-crt: stmp-crt install-dir install-multilib
+install-crt: stmp-crt installdirs install-multilib
for i in `$(GCC_FOR_TARGET) --print-multi-lib`; do \
dir=`echo $$i | sed -e 's/;.*$$//'`; \
flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \