Changeset 416

Timestamp:

Jul 21, 2003, 1:24:15 AM (22 years ago)

Author:

bird

Message:

#565: Ordinal exports, no _DLL_InitTerm. Link with gcc_eh.

File:

• trunk/src/emx/src/lib/libc.smak (modified) (2 diffs, 1 prop)

trunk/src/emx/src/lib/libc.smak

@@ -64 +64 @@
                 $(LIBC.DLL.OBJS) $.aout/libc.def
         $(LD) $(subst -s,,$(LDFLAGS.DLL)) -nostdlib -o __libc__ $^ \
-          -L$.aout -los2 -lgcc -lc_alias
+          -L$.aout -los2 -lgcc -lgcc_eh -lc_alias
         $(call DO.EMXBIND,-d$.aout/libc.def __libc__)
         @$(call RM,__libc__)
 ifeq ($(MODE),opt)
-        lxlite $@
+        lxlite /X /AS $@
 endif
 
@@ -74 +74 @@
         emximp -o $@ $<
 
-$.aout/libc.def: $.aout/c.a $.aout/c_app.a
+$.aout/libc-tmp.def: $.aout/c.a $.aout/c_app.a
         $(call RM,$@)
-        @$(call FECHO,$@,LIBRARY libc$(VH)$(VM))
-        @$(call FECHO,$@,DESCRIPTION \"GNU C runtime library version $(VERSION)\")
+        @$(call FECHO,$@,LIBRARY libc$(VH)$(VM) INITINSTANCE TERMINSTANCE)
+        @$(call FECHO,$@,DESCRIPTION \"Innotek C runtime library version $(VERSION)\")
+        @$(call FECHO,$@,DATA MULTIPLE)
+        @$(call FECHO,$@,CODE SHARED)
         @$(call FECHO,$@,EXPORTS)
         @$(call DO.EMXEXP)
+
+$.aout/libc.def: $.aout/libc-tmp.def src/lib/libc.def
+        cp $.aout/libc-tmp.def $@
+        krx.exe src/lib/dlllegacy.cmd -e "_DLL_InitTerm" $@ src/lib/libc.def
 
 # How libc-std.h can be auto-generated.