Ticket #318: static-undefined.diff

src/gcc/gcc/config/i386/emx.h

@@ -443 +443 @@
   "%{Zexe} %{Zstack*} %{Zmap*} %{Zsym} %{Zdll} %{shared:-Zdll} %{static:-static} " \
   "%{!o*:-o %b%{Zdll|shared:.dll}%{!Zdll:%{!shared:%{!Zexe:.exe}}}} "          \
   "%{static:%{Zcrtdll*:%e-static and -Zcrtdll are incompatible}}"              \
-  "%{Zomf:%{Zaout:%e-Zomf and -Zaout are incompatible}}"                       \
+  "%{Zomf|static:%{Zaout:%e-Zomf and -Zaout are incompatible}}"                \
   "%{Zdll:%{Zexe:%e-Zdll and -Zexe are incompatible}}"                         \
   "%{shared:%{Zexe:%e-shared and -Zexe are incompatible}}"                     \
   "%{Zsmall-conv:%{Zcrtdll*:%e-Zsmall-conv and -Zcrtdll are incompatible}}"
@@ -470 +470 @@
 #define LIB_SPEC                                                               \
   "-lc_alias "                                                                 \
   "%{!static:-lc_dll}"                                                         \
-  "%{static:-lc%{p|pg:_p}_s %{!Zdll:%{!shared:-lc_app%{pg:_p}}}} "             \
+  "%{static:-lc%{p|pg:_p}_s %{!Zdll:%{!shared:-lc_app%{pg:_p}}} -lc_omf386} "  \
   "-los2%{p|pg:_p}"
 
 /* Override the default crt0 files.
    bird: we might consider kicking gcrt & mcrt stuff now... */
 #define STARTFILE_SPEC                                                         \
   "%{Zno-high-mem:}%{Zfork:}%{Zunix:}"                                         \
-  "%{Zdll|shared:dll0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%O%{Zomf:bj}%s}" \
-  "%{!Zdll:%{!shared:%{pg:gcrt0%O%{Zomf:bj}%s}"                                          \
-          "%{!pg:%{pn:gcrt0%O%{Zomf:bj}%s}"                                    \
-                "%{!pn:%{p:mcrt0%O%{Zomf:bj}%s}"                               \
-                      "%{!p:crt0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%{Zargs-wild:wild}%{Zargs-resp:resp}%O%{Zomf:bj}%s}}}}" \
-  " %{Zbin-files:binmode%O%{Zomf:bj}%s}"                                       \
-  " %{Zsmall-conv:smallcnv%O%{Zomf:bj}%s}}"
+  "%{Zdll|shared:dll0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%O%{Zomf|static:bj}%s}" \
+  "%{!Zdll:%{!shared:%{pg:gcrt0%O%{Zomf|static:bj}%s}"                         \
+          "%{!pg:%{pn:gcrt0%O%{Zomf|static:bj}%s}"                             \
+                "%{!pn:%{p:mcrt0%O%{Zomf|static:bj}%s}"                        \
+                      "%{!p:crt0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%{Zargs-wild:wild}%{Zargs-resp:resp}%O%{Zomf|static:bj}%s}}}}" \
+  " %{Zbin-files:binmode%O%{Zomf|static:bj}%s}"                                \
+  " %{Zsmall-conv:smallcnv%O%{Zomf|static:bj}%s}}"
 
 /* Prefer symbols in %L (-lc) over %G (libcAB.dll includes gcc3XY.dll).
    For the GNU linker we need to repeate everything as it doesn't
    restart the library search as the IBM and M$ linkers do. */
-#define LINK_GCC_C_SEQUENCE_SPEC        "%L %G %L %{!Zomf:%G %L %G %L %G %L}"
+#define LINK_GCC_C_SEQUENCE_SPEC        "%L %G %L %{!Zomf:%{!static:%G %L %G %L %G %L}}"
 
-#define ENDFILE_SPEC                    "%{Zomf:-lend}"
+#define ENDFILE_SPEC                    "%{Zomf|static:-lend}"
 
 /* Override the default linker program (collect2).  */
-#define LINKER_NAME                     "%{Zomf:emxomf}ld.exe"
+#define LINKER_NAME                     "%{Zomf|static:emxomf}ld.exe"