--- gcc/config/i386/gnu.h	2018/04/24 18:23:21	1.1.1.1
+++ gcc/config/i386/gnu.h	2018/04/24 18:31:05	1.1.1.2
@@ -1,17 +1,20 @@
-/* Configuration for an i386 running GNU as the target machine.  */
+/* Configuration for an i386 running GNU with ELF as the target machine.  */
 
-/* We do want to add an underscore to the front of each user symbol.
-   i386/gas.h checks this.  */
-#define YES_UNDERSCORES
+/* This does it mostly for us.  */
+#include <i386/linux.h>
 
-#include "i386/gstabs.h"
+#undef CPP_PREDEFINES
+#define CPP_PREDEFINES GNU_CPP_PREDEFINES("i386")
 
-/* Get perform_* macros to build libgcc.a.  */
-#include "i386/perform.h"
+#undef	LINK_SPEC
+#define LINK_SPEC "-m elf_i386 %{shared:-shared} \
+  %{!shared: \
+    %{!ibcs: \
+      %{!static: \
+	%{rdynamic:-export-dynamic} \
+	%{!dynamic-linker:-dynamic-linker /lib/ld.so} \
+	%{!rpath:-rpath /lib/}} %{static:-static}}}"
 
-#undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -DMACH -Asystem(unix) -Asystem(mach) -Acpu(i386) -Amachine(i386) -D__GNU__ -D__HURD__ -Asystem(gnu)"
 
-/* Don't default to pcc-struct-return, because gcc is the only compiler, and
-   we want to retain compatibility with older gcc versions.  */
-#define DEFAULT_PCC_STRUCT_RETURN 0
+/* Get machine-independent configuration parameters for the GNU system.  */
+#include <gnu.h>