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

From-SVN: r13048

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)
 

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; \

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'`; \