Work with latest changes to Makefile; -fpic does not need a TOC area

From-SVN: r13048

diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 6954ed7292b06d134a0c87390e7373800c52ffb2..a734ee63ad72c059edff9ac9ca7fdd3c63e1c2a9 100644 (file)
--- 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 e8cf6674b2106d76eee4bb2dbe00ac1effa629dd..13f450dbba2f91a3b3a54989e9dcdd0fd12e1536 100644 (file)
--- 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 719babc502476d9e7f82cd357b6624c4a3e9cc60..a57bddb313c974bc9dc9895ebe8cb81cdea12fff 100644 (file)
--- 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'`; \