If OSF/rose, make -pic-extern always do shared libs, even if -pic-none was used.

From-SVN: r7742

diff --git a/gcc/config/i386/osfelf.h b/gcc/config/i386/osfelf.h
index 12bdebec3607400b360ad8cbbc85998652e06a69..8970dfbed46963d085313ee1c9bc7e4fea18dbc5 100644 (file)
--- a/gcc/config/i386/osfelf.h
+++ b/gcc/config/i386/osfelf.h
@@ -37,7 +37,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 %{.m:  -D__LANGUAGE_OBJECTIVE_C} \
 %{!.S: -D__LANGUAGE_C %{!ansi:-DLANGUAGE_C}}"
 
-/* Turn on -mpic-extern by default (change to later use -fpic.  */
+/* Turn on -pic-extern by default for OSF/rose, -fpic for ELF.  */
 #undef  CC1_SPEC
 #define CC1_SPEC "\
 %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
@@ -45,9 +45,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 %{!mrose: %{!munderscores: %{!mno-underscores: -mno-underscores }} \
          %{!mmcount: %{!mno-mcount: %{!mmcount-ptr: -mmcount-ptr }}}} \
 %{mrose: %{!mmcount: %{!mno-mcount: %{!mmcount-ptr: -mmcount }}} \
-        %{pic-none: -mno-half-pic} \
-        %{pic-extern: } %{pic-lib: } %{pic-calls: } %{pic-names*: } \
-        %{!pic-none: -mhalf-pic }}"
+        %{pic-extern: -mhalf-pic } %{pic-lib: -mhalf-pic } \
+        %{!pic-extern: %{!pic-lib: %{pic-none: -mno-half-pic} %{!pic-none: -mhalf-pic}}} \
+        %{pic-calls: } %{pic-names*: }}"
 
 #undef ASM_SPEC
 #define ASM_SPEC       "%{v*: -v}"

diff --git a/gcc/config/i386/osfrose.h b/gcc/config/i386/osfrose.h
index 0a62a6cc9e6c5d1a488cf446bacacfe8c508feb9..f4b765519422b609a733706a4b7099c029009c91 100644 (file)
--- a/gcc/config/i386/osfrose.h
+++ b/gcc/config/i386/osfrose.h
@@ -114,7 +114,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 %{.m:  -D__LANGUAGE_OBJECTIVE_C} \
 %{!.S: -D__LANGUAGE_C %{!ansi:-DLANGUAGE_C}}"
 
-/* Turn on -pic-extern by default.  */
+/* Turn on -pic-extern by default for OSF/rose, -fpic for ELF.  */
 #undef  CC1_SPEC
 #define CC1_SPEC "\
 %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
@@ -123,9 +123,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
        %{!mmcount: %{!mno-mcount: %{!mmcount-ptr: -mmcount-ptr }}}} \
 %{!melf: %{!munderscores: %{!mno-underscores: -munderscores }} \
         %{!mmcount: %{!mno-mcount: %{!mmcount-ptr: -mmcount }}} \
-        %{pic-none: -mno-half-pic} \
-        %{pic-extern: } %{pic-lib: } %{pic-calls: } %{pic-names*: } \
-        %{!pic-none: -mhalf-pic }}"
+        %{pic-extern: -mhalf-pic } %{pic-lib: -mhalf-pic } \
+        %{!pic-extern: %{!pic-lib: %{pic-none: -mno-half-pic} %{!pic-none: -mhalf-pic}}} \
+        %{pic-calls: } %{pic-names*: }}"
 
 #undef ASM_SPEC
 #define ASM_SPEC       "%{v*: -v}"