--- gcc/config/i386/osfelf.h	2018/04/24 18:10:27	1.1.1.1
+++ gcc/config/i386/osfelf.h	2018/04/24 18:30:44	1.1.1.4
@@ -16,16 +16,20 @@ 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"
 
 #undef	CPP_PREDEFINES
-#define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Di386 -Asystem(unix) -Acpu(i386) -Amachine(i386)"
+#define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Di386 -Asystem(unix) -Asystem(xpg4) -Acpu(i386) -Amachine(i386)"
 
 #undef  CPP_SPEC
 #define CPP_SPEC "\
-%{!mrose: %{!mno-elf: -D__ELF__}} %{mrose: -D__ROSE__} %{mno-elf: -D__ROSE__} \
+%{mrose: -D__ROSE__ %{!pic-none: -D__SHARED__}} \
+%{!mrose: -D__ELF__ %{fpic: -D__SHARED__}} \
+%{mno-underscores: -D__NO_UNDERSCORES__} \
+%{!mrose: %{!munderscores: -D__NO_UNDERSCORES__}} \
 %{.S:	%{!ansi:%{!traditional:%{!traditional-cpp:%{!ftraditional: -traditional}}}}} \
 %{.S:	-D__LANGUAGE_ASSEMBLY %{!ansi:-DLANGUAGE_ASSEMBLY}} \
 %{.cc:	-D__LANGUAGE_C_PLUS_PLUS} \
@@ -34,25 +38,34 @@ 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: %{!mno-elf: -melf }}} \
 %{gline:%{!g:%{!g0:%{!g1:%{!g2: -g1}}}}} \
-%{pic-none:   -mno-half-pic} \
-%{fpic:	      -mno-half-pic} \
-%{fPIC:	      -mno-half-pic} \
-%{pic-lib:    -mhalf-pic} \
-%{pic-extern: -mhalf-pic} \
-%{pic-calls:  -mhalf-pic} \
-%{pic-names*: -mhalf-pic} \
-%{!pic-*: %{!fpic: %{!fPIC: -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}"
 
 #undef  LINK_SPEC
-#define LINK_SPEC      "%{noshrlib: } %{glue: }"
+#define LINK_SPEC      "%{v*: -v} \
+%{mrose:	%{!noshrlib: %{pic-none: -noshrlib} %{!pic-none: -warn_nopic}} \
+		%{nostdlib} %{noshrlib} %{glue}} \
+%{!mrose:	%{dy} %{dn} %{glue: } \
+		%{h*} %{z*} \
+		%{static:-dn -Bstatic} \
+		%{shared:-G -dy} \
+		%{symbolic:-Bsymbolic -G -dy} \
+		%{G:-G} \
+		%{!dy: %{!dn: %{!static: %{!shared: %{!symbolic: \
+			%{noshrlib: -dn } %{pic-none: -dn } \
+			%{!noshrlib: %{!pic-none: -dy}}}}}}}}"
 
 #undef TARGET_VERSION_INTERNAL
 #undef TARGET_VERSION