Changeset 986

Timestamp:

Jan 11, 2004, 11:56:04 PM (22 years ago)

Author:

bird

Message:

Adjusted specs to like -shared and changed some hardcoded linker flags (gcc makefiles).

Location:

trunk/src/gcc/gcc/config/i386

Files:

• emx.h (modified) (3 diffs, 1 prop)
• t-emx (modified) (2 diffs, 1 prop)

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

@@ -295 +295 @@
   "%{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}}"
+  "%{shared:%{Zexe:%e-shared and -Zexe are incompatible}}"              \
+  "%{Zsmall-conv:%{Zcrtdll*:%e-Zsmall-conv and -Zcrtdll are incompatible}}"    \
+  "%{shared:-Zdll} %{static:-static}"                                          \
 
 /* Override how and when libgcc.a is included (%G).  */
@@ -311 +313 @@
   "-lc_alias "                                                                 \
   "%{!static:-lc_dll}"                                                         \
-  "%{static:-lc%{p|pg:_p} %{!Zdll:-lc_app%{pg:_p}}} -los2%{p|pg:_p}"           \
+  "%{static:-lc%{p|pg:_p} %{!Zdll:-lc_app%{pg:_p}}} "                          \
+  "-los2%{p|pg:_p}"
 
 /* Override the default crt0 files.  */
@@ -323 +326 @@
    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 LINK_GCC_C_SEQUENCE_SPEC "%G %L %{!Zomf:%G %L %G %L %G}"
 
 #define ENDFILE_SPEC "%{Zomf:-lend}"

trunk/src/gcc/gcc/config/i386/t-emx

@@ -23 +23 @@
         $(REXX) dllar.cmd -o $$(@D)/$(SHLIB_DLLNAME) \
         -ordinal @multilib_flags@ -nocrtdll \
-        -flags "-Zhigh-mem" \
+        -flags "-Zhigh-mem -Zomf -g" \
         -ex "___main ___do_global_* ___ctordtor* ___eh* _DLL_InitTerm" \
         -d "GNU C runtime shared library version $(gcc_version)" \
@@ -41 +41 @@
 STMP_FIXINC =
 
-# Override linker flags
-LDFLAGS = -Zexe -Zcrtdll -Zstack 1024
+# bird: this is just bs and doesn't belong here at all.
+## Override linker flags
+#LDFLAGS = -Zexe -Zcrtdll -Zstack 1024
 
 # Add the 's' flag to $AR so that we don't need ranlib