From: Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
Date: Thu, 18 Nov 2010 08:32:58 +0000 (+0100)
Subject: sysv4.h (SUBTARGET_OVERRIDE_OPTIONS): Support -fpic as well as -mrelocatable at the... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=df0aaa66d995c03b120778a9bf6b033f40729257;p=gcc.git

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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00a4a4b7c1e..6cbcf61e142 100644
--- 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 4fda7fd06e3..e82a1c6d34e 100644
--- 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