--- gcc/config/i386/osfelf.h	2018/04/24 18:16:48	1.1.1.2
+++ gcc/config/i386/osfelf.h	2018/04/24 18:30:44	1.1.1.4
@@ -16,7 +16,8 @@ GNU General Public License for more deta
 
 You should have received a copy of the GNU General Public License
 along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
 
 #include "config/i386/osfrose.h"
 
@@ -37,15 +38,17 @@ the Free Software Foundation, 675 Mass A
 %{.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 "\
-%{!melf: %{!mrose: -melf }} \
-%{!mrose: %{!munderscores: %{!mno-underscores: -mno-underscores }}} \
 %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
-%{mrose: %{pic-none: -mno-half-pic} \
-	 %{pic-extern: } %{pic-lib: } %{pic-calls: } %{pic-names*: } \
-	 %{!pic-none: -mhalf-pic }}"
+%{!melf: %{!mrose: -melf }} \
+%{!mrose: %{!munderscores: %{!mno-underscores: -mno-underscores }} \
+	  %{!mmcount: %{!mno-mcount: %{!mmcount-ptr: -mmcount-ptr }}}} \
+%{mrose: %{!mmcount: %{!mno-mcount: %{!mmcount-ptr: -mmcount }}} \
+	 %{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}"