--- gcc/config/i386/t-sol2	2018/04/24 18:10:27	1.1
+++ gcc/config/i386/t-sol2	2018/04/24 18:31:10	1.1.1.4
@@ -1,12 +1,8 @@
-# We need startup files for Solaris, since we don't get them with the system
-# FIXME:  Should include "gmon.o" when it is ported.
-
-EXTRA_PARTS=crt1.o crti.o crtn.o crtbegin.o crtend.o
-
 # we need to supply our own assembly versions of libgcc1.c files,
 # since the user may not have native 'cc' available
 
 LIBGCC1 = libgcc1.null
+CROSS_LIBGCC1 = libgcc1.null
 
 # gmon build rule:
 gmon.o:	$(srcdir)/config/i386/gmon-sol2.c $(GCC_PASSES) $(CONFIG_H)
@@ -26,3 +22,11 @@ crti.o: $(srcdir)/config/i386/sol2-ci.as
 crtn.o: $(srcdir)/config/i386/sol2-cn.asm
 	sed -e '/^!/d' <$(srcdir)/config/i386/sol2-cn.asm >crtn.s
 	$(AS) -o crtn.o crtn.s
+
+# We need to use -fPIC when we are using gcc to compile the routines in
+# crtstuff.c.  This is only really needed when we are going to use gcc/g++
+# to produce a shared library, but since we don't know ahead of time when
+# we will be doing that, we just always use -fPIC when compiling the
+# routines in crtstuff.c.
+
+CRTSTUFF_T_CFLAGS = -fPIC