Changeset 263

Timestamp:

May 28, 2003, 9:59:52 PM (22 years ago)

Author:

bird

Message:

-Zcrtdll hack.

File:

• trunk/src/emx/src/lib/libc.specs (modified) (4 diffs, 1 prop)

trunk/src/emx/src/lib/libc.specs

@@ -16 +16 @@
 
 *cpp:
-%(cpp_cpu) %{posix:-D_POSIX_SOURCE} %{pg:-D__GPROF__} %{Zmt*:} %{mepilogue:-D__EPILOGUE__} %{mprobe|mstack-arg-probe:-D__STACK_PROBE__} -D__cdecl=__attribute__((__cdecl__)) -D__stdcall=__attribute__((__stdcall__)) %{!ansi: -D_cdecl=__attribute__((__cdecl__)) -D_stdcall=__attribute__((__stdcall__)) -D_Cdecl=__attribute__((__cdecl__)) -D_Optlink=__attribute__((__optlink__)) -D_System=__attribute__((__system__))}
+%(cpp_cpu) %{posix:-D_POSIX_SOURCE} -D__MT__ %{Zmt*:}  %{pg:-D__GPROF__} %{mepilogue:-D__EPILOGUE__} %{mprobe|mstack-arg-probe:-D__STACK_PROBE__} -D__cdecl=__attribute__((__cdecl__)) -D__stdcall=__attribute__((__stdcall__)) %{!ansi: -D_cdecl=__attribute__((__cdecl__)) -D_stdcall=__attribute__((__stdcall__)) -D_Cdecl=__attribute__((__cdecl__)) -D_Optlink=__attribute__((__optlink__)) -D_System=__attribute__((__system__))}
 
 *cpp_options:
@@ -46 +46 @@
 
 *lib:
--lc%{p|pg:_p} %G -lc_app%{pg:_p} -lc%{p|pg:_p}
-
-# bird: better get the DLLs linking at moment.
-# -lc%{p|pg:_p} %G %{!Zdll:-lc_app%{pg:_p}} -lc%{p|pg:_p}
+-lc%{p|pg:_p} %G %{!Zdll:-lc_app%{pg:_p}} -lc%{p|pg:_p}
 
 *libgcc:
@@ -61 +58 @@
 
 *predefines:
--D__32BIT__ -D__EMX__ -D__OS2__ -D__i386__ -D__i386 -Dunix -D__MT__ -Asystem=unix -Asystem=posix
+-D__32BIT__ -D__EMX__ -D__OS2__ -D__i386__ -D__i386 -Dunix -Asystem=unix -Asystem=posix
 
 *cross_compile:
@@ -133 +130 @@
 
 *link_command:
-%{!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 %L -los2%{pg:_p} %L -los2%{pg:_p} %{Zomf:-lend}}} %{!A:%{!nostdlib:%{!nostartfiles:%E}}}}}}}}}
+%{!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}  %{!Zcrtdll*:%L} %{Zcrtdll*:-lc_dll} -los2%{pg:_p} %{Zomf:-lend}}} %{!A:%{!nostdlib:%{!nostartfiles:%E}}}}}}}}}
+
+# stage 2?
+#%{!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=*:-l%* -los2%{pg:_p}} -los2%{pg:_p} %{Zomf:-lend}}} %{!A:%{!nostdlib:%{!nostartfiles:%E}}}}}}}}}
 
 # bird: while -Zcrtdll isn't working.