Changeset 451

Timestamp:

Jul 26, 2003, 3:10:36 AM (22 years ago)

Author:

bird

Message:

Cleaned up new specs and fixed the linking issues caused by the dllinit moving.

File:

• trunk/src/gcc/gcc/config/i386/emx.h (modified) (6 diffs, 1 prop)

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

@@ -247 +247 @@
  *                             - S - P - E - C - S -
  ******************************************************************************/
-#define __EMX__LIBCSPECS
+#if 1
+/*
+ * Current default specs.
+ */
+
+/* Predefine symbols. */
+#undef CPP_PREDEFINES
+#define CPP_PREDEFINES "-D__32BIT__ -D__EMX__ -D__OS2__ -D__i386__ -D__i386 "  \
+  "-Dunix -D__MT__ -Asystem=unix -Asystem=posix -Asystem=emx"
+
+/* Provide extra args to the C preprocessor and extra switch-translations.  */
+#undef CPP_SPEC
+#define CPP_SPEC                                                               \
+  "%(cpp_cpu) "                                                                \
+  "%{posix:-D_POSIX_SOURCE} "                                                  \
+  "%{Zmt*:} "                                                                  \
+  "%{pg:-D__GPROF__} "                                                         \
+  "%{mepilogue:-D__EPILOGUE__} "                                               \
+  "%{mprobe|mstack-arg-probe:-D__STACK_PROBE__} "                              \
+  "-D__cdecl=__attribute__((__cdecl__)) "                                      \
+  "-D__stdcall=__attribute__((__stdcall__)) "                                  \
+  "-D_Optlink=__attribute__((__optlink__)) "                                   \
+  "-D_System=__attribute__((__system__))"                                      \
+  "%{!ansi: "                                                                  \
+    "-D_cdecl=__attribute__((__cdecl__)) "                                     \
+    "-D_stdcall=__attribute__((__stdcall__)) "                                 \
+    "-D_Cdecl=__attribute__((__cdecl__)) }"
+
+/* -s to -Zstrip and -Zomf must be passed down. */
+#define ASM_SPEC "--traditional-format %{Zomf} %{s:-Zstrip}"
+
+#define ASM_DEBUG_SPEC "%{g*:--gstabs}"
+
+
+/* Here is the spec for running the linker, after compiling all files.  */
+
+/* Provide extra args to the linker and extra switch-translations.  */
+#define LINK_SPEC                                                              \
+  "%{Zexe} %{Zstack*} %{Zmap*} %{Zomf:%{Zdll}} "                               \
+  "%{!o*:-o %b%{Zdll:.dll}%{!Zdll:%{!Zexe:.exe}}} "                            \
+  "%{static:%{Zcrtdll*:%e-static and -Zcrtdll are incompatible}}"              \
+  "%{Zdll:%{Zexe:%e-Zdll and -Zexe are incompatible}}"                         \
+  "%{Zsmall-conv:%{Zcrtdll*:%e-Zsmall-conv and -Zcrtdll are incompatible}}"
+
+/* Override how and when libgcc.a is included (%G).  */
+#define LIBGCC_SPEC                                                            \
+  "%{static|static-libgcc:%{shared-libgcc:%e-static-libgcc and -shared-libgcc are incompatible}}"\
+  "%{shared-libgcc:-lgcc%v1%v2%v3}"                                            \
+  "%{!shared-libgcc:%{!static-libgcc:%{Zcrtdll*:-lgcc%v1%v2%v3}}}"             \
+  "%{!shared-libgcc:%{static-libgcc|!Zcrtdll*:-lgcc_eh -lgcc}}"
+
+/* We have a shared libgcc, but don't need this extra handling. */
+#undef ENABLE_SHARED_LIBGCC
+
+/* Override the default libraries (%L).  */
+#define LIB_SPEC                                                               \
+  "-lc_alias "                                                                 \
+  "%{Zcrtdll*:-lc_dll}"                                                        \
+  "%{!Zcrtdll*:-lc%{p|pg:_p} %{!Zdll:-lc_app%{pg:_p}}} -los2%{p|pg:_p}"        \
+
+/* Override the default crt0 files.  */
+#define STARTFILE_SPEC                                                         \
+  "%{Zdll:dll0%O%{Zomf:bj}%s}"                                                 \
+  "%{!Zdll:%{pg:gcrt0%O%{Zomf:bj}%s}"                                          \
+          "%{!pg:%{pn:gcrt0%O%{Zomf:bj}%s}%{!pn:%{p:mcrt0%O%{Zomf:bj}%s}%{!p:crt0%O%{Zomf:bj}%s}}}"\
+         " %{Zbin-files:binmode%O%{Zomf:bj}%s} %{Zsmall-conv:smallcnv%O%{Zomf:bj}%s}}"
+
+/* Set -lgcc and -lc order so all symbols are resolved correctly with
+   the GNU linker. The IBM and M$ linkers doesn't need things repeated
+   to catch the go of it.  */
+#define LINK_GCC_C_SEQUENCE_SPEC "%G %L %{!Zomf:%G %L %G}"
+
+#define ENDFILE_SPEC "%{Zomf:-lend}"
+
+/* Override the default linker program (collect2).  */
+#define LINKER_SPEC "%{Zomf:emxomf}ld.exe"
+
+
+
+#else
+/* ////////////////////////////////////////////////////////////////////////////
+ * Specs which doesn't define __EMX__ (to be removed?)
+ * ////////////////////////////////////////////////////////////////////////// */
+
 /* Predefine symbols `__32BIT__', `__EMX__', `i386' and __MT__ (not -Zmt). */
 #undef CPP_PREDEFINES
-#define CPP_PREDEFINES "-D__32BIT__ -D__EMX__ -D__OS2__ -D__i386__ -D__i386 "  \
+#define CPP_PREDEFINES "-D__32BIT__ -D__OS2__ -D__i386__ -D__i386 "  \
   "-Dunix -D__MT__ -Asystem=unix -Asystem=posix -Asystem=emx"
 
@@ -271 +354 @@
 
 /* Pass -s (as -Zstrip) to the assembler. */
-#ifdef __EMX__LIBCSPECS
-#define ASM_SPEC "--traditional-format %{Zomf} %{s:-Zstrip}"
-#else
 #define ASM_SPEC "%{Zomf} %{s:-Zstrip}"
-#endif
-
-#ifdef __EMX__LIBCSPECS
-/* bird: precautions. */
-#undef ASM_DEBUG_SPEC
-#define ASM_DEBUG_SPEC "%{g*:--gstabs}"
-#endif
-
-#ifdef __EMX__LIBCSPECS
+
 #define LINK_SPEC                                                              \
   "%{Zexe} %{Zstack*} %{Zmap*} %{Zomf:%{Zdll}} "                               \
@@ -290 +362 @@
   "%{Zdll:%{Zexe:%e-Zdll and -Zexe are incompatible}}"                         \
   "%{Zsmall-conv:%{Zcrtdll*:%e-Zsmall-conv and -Zcrtdll are incompatible}}"
-#else
-#define LINK_SPEC                                                              \
-  "%{Zexe} %{Zstack*} %{Zmap*} %{Zomf:%{Zdll}} "                               \
-  "%{!o*:-o %b%{Zdll:.dll}%{!Zdll:%{!Zexe:.exe}}} "                            \
-  "%{static:%{Zcrtdll*:%e-static and -Zcrtdll are incompatible}}"              \
-  "%{Zdll:%{Zexe:%e-Zdll and -Zexe are incompatible}}"                         \
-  "%{Zso:%{!Zsys:%e-Zso requires -Zsys}}"                                      \
-  "%{Zso:%{!Zdll:%e-Zso requires -Zdll}}"                                      \
-  "%{Zno-rte:%{!Zdll:%e-Zno-rte requires -Zdll}}"                              \
-  "%{Zno-rte:%{!Zomf:%e-Zno-rte requires -Zomf}}"                              \
-  "%{Zno-rte:%{Zsys:%e-Zno-rte and -Zsys are incompatible}}"                   \
-  "%{Zno-rte:%{Zso:%e-Zno-rte and -Zso are incompatible}}"                     \
-  "%{Zno-rte:%{Zcrtdll*:%e-Zcrtdll and -Zno-rte are incompatible}}"            \
-  "%{Zno-rte:%{Zmt:%e-Zmt and -Zno-rte are incompatible}}"                     \
-  "%{Zsys:%{Zcrtdll*:%e-Zcrtdll and -Zsys are incompatible}}"                  \
-  "%{Zsys:%{!Zomf:%e-Zsys requires -Zomf}}"                                    \
-  "%{Zsys:%{Zbsd-signals:%e-Zbsd-signals and -Zsys are incompatible}}"         \
-  "%{Zsys:%{Zsysv-signals:%e-Zsysv-signals and -Zsys are incompatible}}"       \
-  "%{Zbsd-signals:%{Zsysv-signals:%e-Zbsd-signals and -Zsysv-signals are incompatible}}" \
-  "%{Zsmall-conv:%{Zcrtdll*:%e-Zsmall-conv and -Zcrtdll are incompatible}}"
-#endif
 
 /* Actually we're using shared libgcc, but we use it a lot differently ... */
@@ -320 +371 @@
   "%{!shared-libgcc:%{static-libgcc|!Zcrtdll*:-lgcc_eh -lgcc}}"
 
-#ifdef __EMX__LIBCSPECS
-#define LIB_SPEC                                                               \
-  "-lc%{p|pg:_p} "                                                             \
-  "%G "                                                                        \
-  "%{!Zdll:-lc_app%{pg:_p}} "                                                  \
-  "-lc%{p|pg:_p}"
-#else
 #define LIB_SPEC                                                               \
   "%{p|pg:-lc_p} -lc "                                                         \
@@ -334 +378 @@
   "%G %{p|pg:-lc_p} -lc "                                                      \
   "%{Zdll:%{!Zso:%{!Zno-rte:-lc_dllrt}}}"
-#endif
-
-#ifdef __EMX__LIBCSPECS
-#define STARTFILE_SPEC                                                         \
-  "%{Zdll:dll0%O%{Zomf:bj}%s}"                                                 \
-  "%{!Zdll:%{pg:gcrt0%O%{Zomf:bj}%s}"                                          \
-          "%{!pg:%{pn:gcrt0%O%{Zomf:bj}%s}%{!pn:%{p:mcrt0%O%{Zomf:bj}%s}%{!p:crt0%O%{Zomf:bj}%s}}}"\
-         " %{Zbin-files:binmode%O%{Zomf:bj}%s} %{Zsmall-conv:smallcnv%O%{Zomf:bj}%s}}"
-#else
+
 #define STARTFILE_SPEC                                                         \
   "%{Zdll:dll0%O%{Zomf:bj}%s}"                                                 \
@@ -349 +385 @@
          " %{Zsysv-signals:sigsysv%O%{Zomf:bj}%s} %{Zbsd-signals:sigbsd%O%{Zomf:bj}%s}"\
          " %{Zbin-files:binmode%O%{Zomf:bj}%s}%{Zsmall-conv:smallcnv%O%{Zomf:bj}%s}}"
-#endif
-
-#ifdef __EMX__LIBCSPECS
-#define LINK_COMMAND_SPEC                                                      \
-"%{!fsyntax-only: "                                                            \
- "%{!c:%{!M:%{!MM:%{!E:%{!S:%{Zomf:emxomf}ld "                                 \
-                        "%l %X %{o*} %{A} %{d} %{e*} %{m} %{N} %{n} "          \
-                        "%{r} %{s} %{t} %{u*} %{x} %{z} %{Z} "                 \
-                        "%{!A:%{!nostdlib:%{!nostartfiles:%S}}} "              \
-                        "%{static:} %{L*} %D %{T*} %o "                        \
-                        "%{!nostdlib:%{!nodefaultlibs:"                        \
-                           "%G -lc_alias "                                     \
-                           "%{!Zcrtdll*:%L} %{Zcrtdll*:-lc_dll} -los2%{pg:_p} "\
-                           "-lc_alias "                                        \
-                           "%{!Zcrtdll*:%L} %{Zcrtdll*:-lc_dll} -los2%{pg:_p} "\
-                           "%{Zomf:-lend} "                                    \
-                                     "} "                                      \
-                         "} "                                                  \
-                        "%{!A:%{!nostdlib:%{!nostartfiles:%E} }}"              \
-                       "}"                                                     \
-                  "}"                                                          \
-            "}"                                                                \
-       "}"                                                                     \
-  "}"                                                                          \
- "}"
-#else
+
 #define LINK_COMMAND_SPEC                                                      \
 "%{!fsyntax-only: "                                                            \