sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Support -fpic as well as -mrelocatable at the same time.

2010-11-17  Joakim Tjernlund  <Joakim.Tjernlund@transmode.se>

	* config/rs6000/sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Support -fpic
	as well as -mrelocatable at the same time.

From-SVN: r166897

gcc/ChangeLog

+2010-11-17  Joakim Tjernlund  <Joakim.Tjernlund@transmode.se>
+
+	* config/rs6000/sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Support -fpic
+	as well as -mrelocatable at the same time.
+
 2010-11-17  Quentin Neill  <quentin.neill.gnu@gmail.com>
 
 	PR target/46422

gcc/config/rs6000/sysv4.h

@@ -223,7 +223,8 @@ do {									\
     }									\
 									\
   else if (TARGET_RELOCATABLE)						\
-    flag_pic = 2;							\
+    if (!flag_pic)							\
+      flag_pic = 2;							\
 } while (0)
 
 #ifndef RS6000_BI_ARCH