Changeset 1737

Timestamp:

Dec 13, 2004, 2:32:38 AM (20 years ago)

Author:

bird

Message:

fixing -shared.

File:

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

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

@@ -325 +325 @@
 /* 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}}} "                            \
+  "%{Zexe} %{Zstack*} %{Zmap*} %{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}}"                       \
   "%{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}}"    \
-  "%{shared:-Zdll} %{static:-static}"                                          \
+  "%{Zsmall-conv:%{Zcrtdll*:%e-Zsmall-conv and -Zcrtdll are incompatible}}"
 
 /* Override how and when libgcc.a is included (%G).  */
@@ -356 +355 @@
   "-lc_alias "                                                                 \
   "%{!static:-lc_dll}"                                                         \
-  "%{static:-lc%{p|pg:_p}_s %{!Zdll:-lc_app%{pg:_p}}} "                        \
+  "%{static:-lc%{p|pg:_p}_s %{!Zdll:%{!shared:-lc_app%{pg:_p}}}} "             \
   "-los2%{p|pg:_p}"
 
@@ -363 +362 @@
 #define STARTFILE_SPEC                                                         \
   "%{Zno-high-mem:}%{Zfork:}%{Zunix:}"                                         \
-  "%{Zdll:dll0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%O%{Zomf:bj}%s}" \
-  "%{!Zdll:%{pg:gcrt0%O%{Zomf:bj}%s}"                                          \
+  "%{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}%O%{Zomf:bj}%s}}}" \
+                      "%{!p:crt0%{Zhigh-mem:hi}%{Zno-fork:nofork}%{Zno-unix:noux}%O%{Zomf:bj}%s}}}}" \
   " %{Zbin-files:binmode%O%{Zomf:bj}%s}"                                       \
   " %{Zsmall-conv:smallcnv%O%{Zomf:bj}%s}}"