Changeset 461

Timestamp:

Jul 28, 2003, 12:57:13 AM (22 years ago)

Author:

bird

Message:

#564: Added an optional spec for -Zomf defaults. -Zcrtdll is now default. -Zaout is accepted by both specs.

File:

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

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

@@ -245 +245 @@
 
 /******************************************************************************
- *                             - S - P - E - C - S -
+ *
+ *
+ *                            - S - P - E - C - S -
+ *                            - S - P - E - C - S -
+ *                            - S - P - E - C - S -
+ *
+ *
  ******************************************************************************/
 #if 1
-/*
- * Current default specs.
- */
+/*------------------------------------------------------------------------------
+*   Current default specs which uses aout by default.
+*-----------------------------------------------------------------------------*/
 
 /* Predefine symbols. */
@@ -288 +294 @@
   "%{!o*:-o %b%{Zdll:.dll}%{!Zdll:%{!Zexe:.exe}}} "                            \
   "%{static:%{Zcrtdll*:%e-static and -Zcrtdll are incompatible}}"              \
+  "%{Zomf:%{Zaout:%e-Zomf and -Zaout are incompatible}}"                       \
   "%{Zdll:%{Zexe:%e-Zdll and -Zexe are incompatible}}"                         \
   "%{Zsmall-conv:%{Zcrtdll*:%e-Zsmall-conv and -Zcrtdll are incompatible}}"
@@ -295 +302 @@
   "%{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}}"
+  "%{!shared-libgcc:%{!static-libgcc:%{!static*:-lgcc%v1%v2%v3}}}"             \
+  "%{!shared-libgcc:%{static-libgcc|static:-lgcc_eh -lgcc}}"
 
 /* We have a shared libgcc, but don't need this extra handling. */
@@ -304 +311 @@
 #define LIB_SPEC                                                               \
   "-lc_alias "                                                                 \
-  "%{Zcrtdll*:-lc_dll}"                                                        \
-  "%{!Zcrtdll*:-lc%{p|pg:_p} %{!Zdll:-lc_app%{pg:_p}}} -los2%{p|pg:_p}"        \
+  "%{!static:-lc_dll}"                                                         \
+  "%{static*:-lc%{p|pg:_p} %{!Zdll:-lc_app%{pg:_p}}} -los2%{p|pg:_p}"          \
 
 /* Override the default crt0 files.  */
@@ -322 +329 @@
 
 /* Override the default linker program (collect2).  */
-#define LINKER_SPEC "%{Zomf:emxomf}ld.exe"
+#define LINKER_NAME "%{Zomf:emxomf}ld.exe"
 
 
 
 #else
-/* ////////////////////////////////////////////////////////////////////////////
- * Specs which doesn't define __EMX__ (to be removed?)
- * ////////////////////////////////////////////////////////////////////////// */
+#if 1 /* disabled by above #if */
+/*------------------------------------------------------------------------------
+*   As the above specs but defaults to OMF.
+*-----------------------------------------------------------------------------*/
+
+/* 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 %{!Zaout:-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*} %{!Zaout:%{Zdll}} "                             \
+  "%{!o*:-o %b%{Zdll:.dll}%{!Zdll:%{!Zexe:.exe}}} "                            \
+  "%{static:%{Zcrtdll*:%e-static and -Zcrtdll are incompatible}}"              \
+  "%{Zomf:%{Zaout:%e-Zomf and -Zaout 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:%{!static:-lgcc%v1%v2%v3}}}"              \
+  "%{!shared-libgcc:%{static-libgcc|static:-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 "                                                                 \
+  "%{!static:-lc_dll}"                                                         \
+  "%{static:-lc%{p|pg:_p} %{!Zdll:-lc_app%{pg:_p}}} -los2%{p|pg:_p}"           \
+
+/* Override the default crt0 files.  */
+#define STARTFILE_SPEC                                                         \
+  "%{Zdll:dll0%O%{!Zaout:bj}%s}"                                               \
+  "%{!Zdll:%{pg:gcrt0%O%{!Zaout:bj}%s}"                                        \
+          "%{!pg:%{pn:gcrt0%O%{!Zaout:bj}%s}%{!pn:%{p:mcrt0%O%{!Zaout:bj}%s}%{!p:crt0%O%{!Zaout:bj}%s}}}"\
+         " %{Zbin-files:binmode%O%{!Zaout:bj}%s} %{Zsmall-conv:smallcnv%O%{!Zaout: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 %{Zaout:%G %L %G}"
+
+#define ENDFILE_SPEC "%{!Zaout:-lend}"
+
+/* Override the default linker program (collect2).  */
+#define LINKER_NAME "%{!Zaout:emxomf}ld.exe"
+
+
+
+
+#else
+/*------------------------------------------------------------------------------
+*   Older proprosal which doesn't define __EMX__ (to be removed?)
+*-----------------------------------------------------------------------------*/
 
 /* Predefine symbols `__32BIT__', `__EMX__', `i386' and __MT__ (not -Zmt). */
@@ -359 +448 @@
   "%{Zexe} %{Zstack*} %{Zmap*} %{Zomf:%{Zdll}} "                               \
   "%{!o*:-o %b%{Zdll:.dll}%{!Zdll:%{!Zexe:.exe}}} "                            \
+  "%{Zomf:%{Zaout:%e-Zomf and -Zaout are incompatible}}"                       \
   "%{static:%{Zcrtdll*:%e-static and -Zcrtdll are incompatible}}"              \
   "%{Zdll:%{Zexe:%e-Zdll and -Zexe are incompatible}}"                         \
@@ -407 +497 @@
                         "}}}}}}"
 #endif
+#endif