--- gcc/config/i386/linux.h	2018/04/24 18:10:27	1.1.1.1
+++ gcc/config/i386/linux.h	2018/04/24 18:17:13	1.1.1.2
@@ -20,12 +20,14 @@
 /* This is tested by i386/gas.h.  */
 #define YES_UNDERSCORES
 
+#ifndef LINUX_ELF
 #include "i386/gstabs.h"
+#endif
 
 /* Specify predefined symbols in preprocessor.  */
 
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-Dunix -Di386 -Dlinux"
+#define CPP_PREDEFINES "-Dunix -Di386 -Dlinux -Asystem(unix) -Asystem(posix) -Acpu(i386) -Amachine(i386)"
 
 #undef CPP_SPEC
 #if TARGET_CPU_DEFAULT == 2
@@ -58,7 +60,7 @@
 #endif
 
 #undef LIB_SPEC
-#define LIB_SPEC "%{g*:-lg} %{!g*:%{!p:%{!pg:-lc}}%{p:-lgmon -lc_p}%{pg:-lgmon -lc_p}}"
+#define LIB_SPEC "%{mieee-fp:-lieee} %{p:-lgmon -lc_p} %{pg:-lgmon -lc_p} %{!p:%{!pg:%{!g*:-lc} %{g*:-lg}}}"
 
 
 #undef STARTFILE_SPEC
@@ -71,7 +73,7 @@
  */
 
 #define STARTFILE_SPEC  \
-  "%{g*:crt0.o%s -static} %{!g*:%{pg:gcrt0.o%s -static} %{!pg:%{p:gcrt0.o%s -static} %{!p:crt0.o%s %{!static:%{nojump:-nojump}} %{static:-static}}}}"
+  "%{pg:gcrt0.o%s -static} %{!pg:%{p:gcrt0.o%s -static} %{!p:crt0.o%s %{g*:-static} %{!static:%{nojump:-nojump}} %{static:-static}}} -L"TOOLDIR"/lib"
 
 /*
  *The cross-compile uses this.
@@ -81,7 +83,7 @@
 #else
 
 #define STARTFILE_SPEC  \
-  "%{g*:crt0.o%s -static} %{!g*:%{pg:gcrt0.o%s -static} %{!pg:%{p:gcrt0.o%s -static} %{!p:crt0.o%s %{!static:%{nojump:-nojump}} %{static:-static}}}}"
+  "%{pg:gcrt0.o%s -static} %{!pg:%{p:gcrt0.o%s -static} %{!p:crt0.o%s %{g*:-static}%{!static:%{nojump:-nojump}} %{static:-static}}}"
 
 /*
  *The native Linux system uses this.