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

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00a4a4b7c1edcd5473b7952478c437421ad8b596..6cbcf61e14221525610e68e3d87f86346cc28f30 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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

diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index 4fda7fd06e3e392076f97dc6a9e7e0d23a2391f9..e82a1c6d34e8eb68818164629757ddb4d567ccde 100644 (file)
--- a/gcc/config/rs6000/sysv4.h
+++ b/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