Changeset 156

Timestamp:

May 16, 2003, 9:27:59 AM (22 years ago)

Author:

zap

Message:

o Modified makefiles so that os2.a builds correctly (with Vio, Kbd and friends,

not just from the import files).

o Moved os2.smak to the os2_386 directory (tcp32dll.imp will go into socket.a).
o Added the rules into libc.smak to build libc##.dll (finally it links without

errors! Don't know if it works, though ;-)

o Fixed emxbind so that it doesn't add underscores to exported symbols (taken

from the EXPORTS section of a .def file).

o Fixed emxexp so that it doesn't remove underscores from symbol names.
o Fixed all references to OS/2 functions to not contain an initial underscore

(since they are _System now).

o Added one builder makefile: mkimplib.smak, and two auxiliary submakefiles:

mkomflib.smak (included from both mklib and mkimplib), and a version.smak
that contains the version number, description and copyright for libc.

o Made a lot of small changes in order to remove duplicate symbols in libc.dll.
o Added sys/settime.c which was missing in EMX's -Zomf -Zsys variant.

Location:

trunk/src/emx

Files:

• Makefile (modified) (7 diffs, 1 prop)
• build.txt (modified) (1 diff, 1 prop)
• comend.smak (modified) (2 diffs, 1 prop)
• common.smak (modified) (4 diffs, 1 prop)
• include/os2thunk.h (modified) (1 diff, 1 prop)
• mklib.smak (modified) (1 diff, 1 prop)
• src/emxbind/emxbind.h (modified) (1 diff, 1 prop)
• src/emxbind/emxbind.smak (modified) (1 diff, 1 prop)
• src/emxbind/export.c (modified) (2 diffs, 1 prop)
• src/emxbind/fixup.c (modified) (3 diffs, 1 prop)
• src/emxbind/map.c (modified) (2 diffs, 1 prop)
• src/emxbind/os2stub.bin (added)
• src/emxexp/emxexp.c (modified) (2 diffs, 1 prop)
• src/emxload/emxload.smak (modified) (2 diffs, 1 prop)
• src/emxomf/emxomf.c (modified) (2 diffs, 1 prop)
• src/emxomf/emxomf.smak (modified) (2 diffs, 1 prop)
• src/ld/ld.c (modified) (1 diff, 1 prop)
• src/ld/ld.smak (modified) (2 diffs, 1 prop)
• src/lib/alias/alias.smak (modified) (2 diffs, 1 prop)
• src/lib/alias/aliasfuncs.awk (modified) (2 diffs, 1 prop)
• src/lib/app/app.smak (modified) (2 diffs, 1 prop)
• src/lib/app/stdio.c (modified) (1 diff, 1 prop)
• src/lib/end/end.smak (modified) (1 diff, 1 prop)
• src/lib/io/io.smak (modified) (1 diff, 1 prop)
• src/lib/libc.smak (modified) (3 diffs, 1 prop)
• src/lib/misc/core.c (deleted)
• src/lib/moddef/moddef.smak (modified) (1 diff, 1 prop)
• src/lib/omflib/omflib.smak (modified) (1 diff, 1 prop)
• src/lib/os2.smak (deleted)
• src/lib/os2_386/code2.s (modified) (2 diffs, 1 prop)
• src/lib/os2_386/code3.s (modified) (2 diffs, 1 prop)
• src/lib/os2_386/os2.smak (added)
• src/lib/startup/startup.smak (modified) (1 diff, 1 prop)
• src/lib/sys/386/thunk0.s (modified) (1 diff, 1 prop)
• src/lib/sys/386/thunk1.s (modified) (2 diffs, 1 prop)
• src/lib/sys/386/unwind.s (modified) (1 diff, 1 prop)
• src/lib/sys/__fork.c (added)
• src/lib/sys/__select.c (added)
• src/lib/sys/__settime.c (added)
• src/lib/sys/__ttyname.c (added)
• src/lib/sys/core.c (added)
• src/lib/sys/sys.smak (modified) (1 diff, 1 prop)
• src/libend/end.smak (modified) (1 diff, 1 prop)
• src/libmoddef/moddef.smak (modified) (1 diff, 1 prop)
• src/libomflib/omflib.smak (modified) (1 diff, 1 prop)
• src/libos2/code2.s (modified) (2 diffs, 1 prop)
• src/libos2/code3.s (modified) (2 diffs, 1 prop)
• src/libos2/os2.smak (added)
• src/regexp/regexp.smak (modified) (1 diff, 1 prop)

trunk/src/emx/Makefile

@@ -7 +7 @@
 #
 # Author: Andrew Zabolotny <zap@cobra.ru>
+# $Id$
 #
 # All Rights Reserved
@@ -67 +68 @@
 # Linker flags
 LDFLAGS = -Zmt $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND)
+LDFLAGS.DLL = $(LDFLAGS) -Zdll
 # Linker flags for different build modes
 LDFLAGS.opt = -s
@@ -76 +78 @@
 LDFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(LDFLAGS.$x))
 # How to link a .exe file
-DO.LINK.exe = $(LD) $(strip $(LDFLAGS) $1) -o $@ $(^O) $(^DEF) $(^LIB)
+DO.LINK.exe = $(LD) $(strip $(LDFLAGS) $(filter-out -l%,$1)) -o $@ $(^O) $(^LIB) $(filter -l%,$1)
+# How to link a .dll file
+DO.LINK.dll = $(LD) $(strip $(LDFLAGS.DLL) $(filter-out -l%,$1)) -o $@ $(^O) $(^DEF) $(^LIB) $(filter -l%,$1)
+
+# emxbind tool
+EMXBIND = $(if $(wildcard $./$(TOOLFMT)/emxbind$E),$.$(TOOLFMT)/)emxbind$E
+# emxbind flags
+EMXBINDFLAGS = -q $(EMXBINDFLAGS.$(MODE))
+EMXBINDFLAGS.opt = -s
+EMXBINDFLAGS.dbg =
+# Flags for emxbind
+DO.EMXBIND = $(EMXBIND) $(EMXBINDFLAGS) -o $@ $1
 
 # The macro assembler
@@ -87 +100 @@
 AR = $(if $(findstring .lib,$@),emxomf)ar
 ARFLAGS = crs
-DO.LIBRARY = $(AR) $(ARFLAGS) $@ $(^O)
+DO.LIBRARY = $(call RM,$@); $(AR) $(ARFLAGS)$1 $@ $(^O)
+
+# The tool to extract exports from object files and archives
+EMXEXP = $(if $(wildcard $./$(TOOLFMT)/emxexp$E),$.$(TOOLFMT)/)emxexp$E
 
 # The tool to create import libraries
-IMPLIB = $(if $(wildcard $(IMPLIB.BUILT)),$(IMPLIB.BUILT),emximp$E)
-IMPLIB.BUILT = $./$(TOOLFMT)/emximp$E
-IMPLIBFLAGS.aout.prof = -m
-IMPLIBFLAGS.omf =
-IMPLIBFLAGS.KIND = $(foreach x, $(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))) \
-  $(subst -,.,$(firstword $(subst /, ,$(subst $.,,$@)))),$(IMPLIBFLAGS.$x))
-DO.IMPLIB = $(IMPLIB) $(IMPLIBFLAGS.KIND) -o $@ $1
+IMPLIB = $(if $(wildcard $./$(TOOLFMT)/emximp$E),$.$(TOOLFMT)/)emximp$E
+IMPLIBFLAGS.prof = -m
+IMPLIBFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(IMPLIBFLAGS.$x))
+DO.IMPLIB = $(IMPLIB) -o $@ $(strip $1 $(IMPLIBFLAGS.KIND)) $(^I)\
+  $(if $(^O),$(NL)$(AR) rs $@ $(^O))
 
 # How to create dependencies
@@ -112 +126 @@
 # How to filter just the object files from $^
 ^O = $(filter %.o,$^)
+# Just the .imp files from $^
+^I = $(filter %.imp,$^)
 # How to filter just the .def files from $^
 ^DEF = $(filter %.def,$^)
@@ -177 +193 @@
 
 #------------ Submakefiles ------------
-SUBMAK := $(wildcard src/*/*.smak)
+SUBMAK := version.smak $(wildcard src/*/*.smak)
 
 # Include all submakefiles
@@ -189 +205 @@
 help:
         @$(call ECHO,$(SEP))
-        @$(call ECHO,Welcome to GNU C for OS/2 runtime build system!)
+        @$(call ECHO,Welcome to $(PACKAGE) build system!)
+        @$(call ECHO,$(COPYRIGHT))
         @$(call ECHO,To build something, type 'make {target} {vars}', where {target} is one of:)
         @$(call ECHO,    all - build all available modules)

trunk/src/emx/build.txt

@@ -96 +96 @@
 
 .MDEP - (optional) module dependencies. This is useful if current module
-  requires another module to be built first (e.g. a library).
+  requires another module to be built first (e.g. a library). It usually
+  contains the name of another module (e.g. .MDEP := os2).
 
 .TARGET - The name of target (e.g. executable or library file name without dir).

trunk/src/emx/comend.smak

@@ -4 +4 @@
 # Clear local variables so that we don't incidentally
 # get a wrong value in a different module
+ifndef .TKEEP
 .OBJS :=
 .DIRS :=
 .TARG :=
-
-# Clear all target-specific variables
-ifndef .TKEEP
 .TARGET :=
 .TKIND :=
@@ -16 +14 @@
 .TCF :=
 .TDEP :=
+.IMPS :=
 endif
 

trunk/src/emx/common.smak

@@ -28 +28 @@
 .TKIND := $(.tmp)
 .TKIND.DIR := $(subst $(SPACE),-,$(.TKIND))/
+.DIRS :=
 
 ifdef .TARGET
@@ -33 +34 @@
 # .TARG is same as .TARGET except that it has a st/ or mt/ prefix
 .TARG := $(.TKIND.DIR)$(.TARGET)
+.DIRS += $.$(.TKIND.DIR)
 
 ifdef .INSDIR
@@ -61 +63 @@
 
 .OBJS := $(addprefix $.,$(call OBJFILE,$(.TSRC)))
-.DIRS := $(sort $(dir $(.OBJS)))
-TARGDIRS += $(.DIRS)
+.DIRS += $(sort $(dir $(.OBJS)))
 
 # Remove the names of files for which we already generated build rules
@@ -97 +98 @@
 endif # def .TSRC
 
+# Add target directories to module dependencies and to overall list of dirs
+ifneq ($(.DIRS),)
+TARGDIRS += $(.DIRS)
+ifdef .MODULE
+$(.MODULE): $(.DIRS)
+endif # def .MODULE
+endif # neq ($(.DIRS),)
+
+# Add the target to the list of module dependencies
 ifdef .TARGET
-ifdef .MODULE
-$(.MODULE): $(.DIRS) $.$(.TARG)
-endif
-endif
+$(.MODULE): $.$(.TARG)
+endif # def .TARGET
 
 # Replace the special sequence in .TDEP @O@ with $.$(.TKIND.DIR)

trunk/src/emx/include/os2thunk.h

@@ -19 +19 @@
 #define _THUNK_PASCAL_FLAT(ARG)     _THUNK_PASCAL_LONG (_emx_32to16 (ARG))
 #define _THUNK_PASCAL_FAR16(ARG)    _THUNK_PASCAL_LONG (ARG)
-#define _THUNK_PASCAL_FUNCTION(FUN) _16_##FUN
+#define _THUNK_PASCAL_FUNCTION(FUN) APIENTRY _16_##FUN
 #define _THUNK_PASCAL_CALL(FUN)     _emx_thunk1 (_tb, (void *)(_16_##FUN)); })
 #define _THUNK_PASCAL_CALLI(FUN)    _emx_thunk1 (_tb, (void *)(FUN)); })

trunk/src/emx/mklib.smak

@@ -10 +10 @@
         $(call FECHO,_@,        $$(DO.LIBRARY))$(NL)
 
-# The rule for building the OMF variant of library from a.out format
-ifneq ($(findstring aout,$(.TKIND)),)
-# Remove the .a suffix from library name
-.TARGET := $(patsubst %$A,%,$(.TARGET))
-# Replace 'aout' with 'omf' in .TKIND
-.TKIND := $(subst aout,omf,$(.TKIND))
-# Compute the new output file directory
-.TKIND.DIR := $(subst $(SPACE),-,$(.TKIND))/
-# Append the .lib suffix to target name
-.TARGET := $(.TARGET)$A
-# Compute the name of target file to build
-.TARG@OMF := $(.TKIND.DIR)$(.TARGET)
-# The rule for building the xxx@omf variant of target
-.PHONY: $(.MODULE)@omf
-MODULES += $(.MODULE)@omf
-DO.INSTALL += $(call CP,$.$(.TARG@OMF),$(INS)$(.INSDIR)$(.TARGET))$(NL)
-.DIRS@OMF := $(dir $.$(.TARG@OMF))
-TARGDIRS += $(.DIRS@OMF)
-$(.MODULE)@omf: $(.MODULE) $(.DIRS@OMF) $.$(.TARG@OMF)
-# bird: Add a dependency rule to help make
-RULES += \
-        $(call FECHO,_@,$.$(.TARG@OMF): $.$(.TARG))$(NL)
-endif # neq ($(findstring aout,$(.TKIND)),)
-
+include mkomflib.smak
 include comend.smak

trunk/src/emx/src/emxbind/emxbind.h

@@ -488 +488 @@
 
 void build_sym_hash_table (void);
-struct nlist *find_symbol (const char *name, int underscore);
+struct nlist *find_symbol (const char *name);
 void sort_fixup (void);
 void create_fixup (const struct fixup *fp, int neg);

trunk/src/emx/src/emxbind/emxbind.smak

@@ -8 +8 @@
 .TSRC   := $(wildcard src/emxbind/*.c)
 .TLDF   := -lmoddef
+.TKEEP  := 1
 include mkexe.smak
+
+.TARG := $(TOOLFMT)/os2stub.bin
+DO.INSTALL += $(call CP,$.$(.TARG),$(INS)$(.INSDIR))$(NL)
+
+emxbind: $.$(.TARG)
+
+$.$(.TARG): src/emxbind/os2stub.bin
+        $(call CP,$< $@)
+
+include comend.smak

trunk/src/emx/src/emxbind/export.c

@@ -85 +85 @@
   put_grow (table, &ord16, 2);
 }
-
-#if 0
-
-/* Find the symbol NAME in the a.out symbol table of the input
-   executable.  If UNDERSCORE is true, an underscore is prepended to
-   NAME.  If the symbol is found, find_symbol() returns a pointer to
-   the symbol table entry.  Otherwise, NULL is returned. */
-
-static struct nlist *find_symbol (const char *name, int underscore)
-{
-  int i, j, n, len, ok, t;
-  const byte *s;
-
-  i = 4; len = strlen (name);
-  while (i < a_in_str_size)
-    {
-      ok = TRUE; s = name;
-      if (underscore)
-        {
-          if (str_image[i] == '_')
-            ++i;
-          else
-            ok = FALSE;
-        }
-      if (ok && memcmp (name, str_image+i, len+1) == 0)
-        {
-          n = a_in_h.sym_size / sizeof (struct nlist);
-          if (underscore) --i;
-          for (j = 0; j < n; ++j)
-            if (sym_image[j].string == i)
-              {
-                t = sym_image[j].type & ~N_EXT;
-                if (t == N_TEXT || t == N_DATA || t == N_BSS)
-                  return sym_image+j;
-              }
-        }
-      i += strlen (str_image+i) + 1;
-    }
-  return NULL;
-}
-
-#endif
 
 /* Compare two entries of an int array for qsort().  This function is
@@ -190 +148 @@
   for (i = 0; i < export_len; ++i)
     {
-      nl = find_symbol (export_data[i].internalname, TRUE);
+      nl = find_symbol (export_data[i].internalname);
       if (nl == NULL)
         error ("symbol %s undefined (EXPORTS)", export_data[i].internalname);

trunk/src/emx/src/emxbind/fixup.c

@@ -98 +98 @@
 
 
-/* Find the symbol NAME in the a.out symbol table of the input
-   executable.  If UNDERSCORE is true, an underscore is prepended to
-   NAME.  If the symbol is found, find_symbol() returns a pointer to
-   the symbol table entry.  Otherwise, NULL is returned. */
-
-struct nlist *find_symbol (const char *name, int underscore)
+/* Find the symbol NAME in the a.out symbol table of the input executable.
+   If the symbol is found, find_symbol() returns a pointer to the symbol
+   table entry.  Otherwise, NULL is returned. */
+
+struct nlist *find_symbol (const char *name)
 {
   int j, len;
@@ -109 +108 @@
 
   len = strlen (name);
-  if (underscore)
-  {
-    name1 = alloca (len + 2);
-    ((char *)name1)[0] = '_';
-    memcpy (((char *)name1) + 1, name, len + 1);
-  }
 
   for (j = sym_hash_table[sym_hash (name1)]; j != -1;
@@ -499 +492 @@
     }
   mod_idx = find_module (mod, NO_ADDR);
-  if (memcmp ("__16_", name1, 5) == 0)
+  if (memcmp ("_16_", name1, 4) == 0)
     {
       if (r->pcrel)

trunk/src/emx/src/emxbind/map.c

@@ -160 +160 @@
 {
   int i;
-
-  if (*sym_name == '_') ++sym_name;
 
   /* TODO: Use hashing. */
@@ -218 +216 @@
               grow_map_sym_table ();
               name = sym_image[i].string + str_image;
-              if (*name == '_') ++name;
               map_sym_table[map_sym_count].seg = seg;
               map_sym_table[map_sym_count].addr = addr;

trunk/src/emx/src/emxexp/emxexp.c

@@ -206 +206 @@
       {
         name = str_ptr + sym_ptr[i].string;
-        if (*name == '_')
-          ++name;
         export (name);
       }
@@ -215 +213 @@
       {
         name = str_ptr + sym_ptr[i].string;
-        if (*name == '_')
-          ++name;
         export_bss (name);
       }

trunk/src/emx/src/emxload/emxload.smak

@@ -1 +1 @@
 .MODULE := emxload
 .MDESC  := Fast loader daemon
+.MDEP   := os2
 .INSDIR := bin/
 
@@ -6 +7 @@
 .TKIND  := $(TOOLFMT)
 .TSRC   := $(wildcard src/emxload/*.c)
-.TLDF   := 
+.TDEP   := @O@os2$A
 include mkexe.smak

trunk/src/emx/src/emxomf/emxomf.c

@@ -1083 +1083 @@
         name = str_ptr + sym_ptr[i].string;
         sym_more[i].index = sym_index++;
-        if (memcmp (name, "__16_", 5) == 0)
+        if (memcmp (name, "_16_", 4) == 0)
           sym_more[i].flags |= SF_FAR16;
         add_extdef (&started, name);
@@ -1334 +1334 @@
         name = str_ptr + sym_ptr[i].string;
         sym_more[i].index = sym_index++;
-        if (memcmp (name, "__16_", 5) == 0)
+        if (memcmp (name, "_16_", 4) == 0)
           sym_more[i].flags |= SF_FAR16;
         size = sym_ptr[i].value;

trunk/src/emx/src/emxomf/emxomf.smak

@@ -2 +2 @@
 .MDESC  := a.out to OMF object file conversion utility
 .INSDIR := bin/
-.MDEP   := omflib@omf moddef@omf
+.MDEP   := omflib@omf moddef@omf os2
 
 .TARGET := emxomf.exe
@@ -19 +19 @@
 .TKIND  := $(TOOLFMT)
 .TSRC   := src/emxomf/emxomfld.c
-.TDEP   := @O@moddef$A
+.TDEP   := @O@moddef$A @O@os2$A
 include mkexe.smak
 

trunk/src/emx/src/ld/ld.c

@@ -82 +82 @@
 
 #define FIXSETBUG
-#ifdef _System
-extern int _System DosCopy (char *, char *, int);
-#else
-extern int DosCopy (char *, char *, int);
-#endif
+/* gcc will warn on __attribute__((system)) but still will compile */
+extern int __attribute__((system)) DosCopy (char *, char *, int);
 #endif /* EMX */
 

trunk/src/emx/src/ld/ld.smak

@@ -3 +3 @@
 .MODULE := ld
 .MDESC  := Old GNU ld, used for a.out linking
+.MDEP   := os2
 .INSDIR := bin/
 
@@ -9 +10 @@
 .TSRC   := $(wildcard src/ld/*.c)
 .TCF    := -DEMX
+.TDEP   := @O@os2$A
 .TLDF   := -liberty
 include mkexe.smak

trunk/src/emx/src/lib/alias/alias.smak

@@ -8 +8 @@
 .MODULE := alias
 .MDESC  := A library of underscored aliases for most C library functions
-.MDEP   := libc sys app
+.MDEP   := libc app
 .TKIND  := aout
 .INSDIR := lib/
-.TARGET := c_alias$A
+.TARGET := c_alias.a
 include common.smak
 
@@ -25 +25 @@
 # For every aliased function create a .o file containing the alias
 # and add it to the target library.
-$.$(.TARG): $.$(.TKIND.DIR)c.a $.$(.TKIND.DIR)sys.a $.$(.TKIND.DIR)c_app.a
+$.$(.TARG): $.$(.TKIND.DIR)c.a $.$(.TKIND.DIR)c_app.a
         $(call RM,$@)
         @$(foreach x,$(ALIAS.FUNCS),\

trunk/src/emx/src/lib/alias/aliasfuncs.awk

@@ -1 +1 @@
 #
-# A simple script to collect all symbols from c.a and sys.a that needs
+# A simple script to collect all symbols from c.a and c_app.a that needs
 # aliasing. All symbols beginning with _std_ get an alias without _std_
 # and an alias starting with just a '_' instead of _std_.
@@ -36 +36 @@
 BEGIN {
   gulp("out/dbg/aout/c.a");
-  gulp("out/dbg/aout/sys.a");
   gulp("out/dbg/aout/c_app.a");
 

trunk/src/emx/src/lib/app/app.smak

@@ -6 +6 @@
 
 .TKIND  := aout
-.TARGET := c_app$A
-.TSRC.386 := $(wildcard src/lib/app/386/*.s)
+.TARGET := c_app.a
+.TSRC.386 := src/lib/app/386/crt2.s
 .TSRC   := $(.TSRC.$(CPU)) $(wildcard src/lib/app/*.c)
 .TCF.src/lib/app/stdio.c := -D_NFILES=40
@@ -15 +15 @@
 include mklib.smak
 
+# Save the list of object files to link them later into libc.dll
+LIBC.DLL.OBJS += $(.OBJS)
+
 .TKIND  := aout prof
-.TARGET := c_app_p$A
+.TARGET := c_app_p.a
 include mklib.smak

trunk/src/emx/src/lib/app/stdio.c

@@ -125 +125 @@
 void _exit_streams (void)
 {
-  _flushall ();
+  flushall ();
   _rmtmp ();
 }

trunk/src/emx/src/lib/end/end.smak

@@ -2 +2 @@
 .MDESC  := The C runtime library that should be linked last
 
+.TARGET := end.lib
 .TKIND  := omf
-.TARGET := end$A
 .TSRC.386 := $(wildcard src/lib/end/386/*.asm)
 .TSRC   := $(.TSRC.$(CPU))

trunk/src/emx/src/lib/io/io.smak

@@ -18 +18 @@
 include comend.smak
 
-# bird: added dependency to help make make omf version.
+# Additional dependency to help make make omf version.
 $.omf/src/lib/io/386/binmode.obj: $.aout/src/lib/io/386/binmode.o

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

@@ -4 +4 @@
 # Creates four versions of object file name for all kinds of outputs.
 .MVER = $(foreach x,aout aout-prof,$.$x/src/lib/$1)
+
+# This is the list of object files for libc.dll (appended by some submakefiles)
+LIBC.DLL.OBJS :=
 
 # First of all, include all second-level libc submakefiles
@@ -14 +17 @@
 .MDESC  := The C library
 
-.TKIND  := aout
-.TARGET := c$A
+.TARGET := c_p.a
+.TKIND  := aout prof
 .TSRC   := $(libc.TSRC.$(CPU)) $(libc.TSRC)
 .TDEP   := $(libc.TDEP.$(CPU)) $(libc.TDEP)
@@ -22 +25 @@
 include mklib.smak
 
-.TKIND  := aout prof
-.TARGET := c_p$A
+# Build c.a last since LIBC.DLL needs .OBJS from c.a
+.TARGET := c.a
+.TKIND  := aout
+.TKEEP  := 1
 include mklib.smak
 
+#------------------------------------------------------
+# Now define the rules for building libc$(VERSION).dll
+#------------------------------------------------------
+LIBC.DLL = $.aout/libc$(VH)$(VM).dll
+
+DO.HELP.MODULES += $(call ECHO,    libc-dll - The dynamic C library (.dll))$(NL)
+
+DO.INSTALL += $(call CP,$(LIBC.DLL),$(INS)dll/)$(NL)
+INSDIRS += $(INS)dll/
+
+.PHONY: libc-dll
+all: libc-dll
+libc-dll: emxbind emxexp app alias libc os2 $(LIBC.DLL)
+
+$(LIBC.DLL): $.aout/src/lib/startup/386/dll0.o $(.OBJS) $(.DEPS) \
+                $(LIBC.DLL.OBJS) $.aout/libc.def
+        $(LD) $(LDFLAGS.DLL) -nostdlib -o __libc__ $^ \
+          -L$.aout -los2 -lgcc -lc_alias
+        $(call DO.EMXBIND,-d$.aout/libc.def __libc__)
+        @$(call RM,__libc__)
+
+$.aout/libc.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,$@,EXPORTS)
+        $(EMXEXP) -u $^ | sed -e "/^$$/d" -e "/^ *;/d" | sort -d >>$@
+
 # Forget temporary variables
+include comend.smak
 .MVER :=
 libc.TSRC.$(CPU) :=

trunk/src/emx/src/lib/moddef/moddef.smak

@@ -2 +2 @@
 .MDESC  := A library for working with .DEF files
 
+.TARGET := moddef.a
 .TKIND  := aout
-.TARGET := moddef$A
 .TSRC   := $(wildcard src/lib/moddef/*.c)
 .INSDIR = lib/

trunk/src/emx/src/lib/omflib/omflib.smak

@@ -2 +2 @@
 .MDESC  := A library for reading/writing OMF object files
 
+.TARGET := omflib.a
 .TKIND  := aout
-.TARGET := omflib$A
 .TSRC   := $(wildcard src/lib/omflib/*.c)
 .INSDIR = lib/

trunk/src/emx/src/lib/os2_386/code2.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl  _DosGetMessage
+        .globl  DosGetMessage
         .globl  __msgseg32
 
@@ -14 +14 @@
         .align  2, 0x90
 
-_DosGetMessage:
+DosGetMessage:
         PROFILE_NOFRAME
         popl    %ecx                    /* return address */
         pushl   $__msgseg32
         pushl   %ecx
-        jmp     _DosTrueGetMessage
+        jmp     DosTrueGetMessage
 
 L_tab:  .short  0x0000

trunk/src/emx/src/lib/os2_386/code3.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl  _DosQueryMessageCP
+        .globl  DosQueryMessageCP
 
-_DosQueryMessageCP:
+DosQueryMessageCP:
         PROFILE_NOFRAME
         pushl   0(%esp)
@@ -14 +14 @@
         xchgl   8(%esp), %eax
         movl    %eax, 4(%esp)
-        jmp     _DosIQueryMessageCP
+        jmp     DosIQueryMessageCP

trunk/src/emx/src/lib/startup/startup.smak

@@ -34 +34 @@
         $(call DO.AOUT2OMF,-m__text)
 
-# bird: dependencies to help stupid make.
+# Additional dependencies to help stupid make.
 $.omf/src/lib/startup/mcrt0.obj: $.aout/src/lib/startup/mcrt0.o
 $.omf/src/lib/startup/gcrt0.obj: $.aout/src/lib/startup/gcrt0.o

trunk/src/emx/src/lib/sys/386/thunk0.s

@@ -6 +6 @@
                 .p2align 2
 __emx_32to16:   movl    4(%esp),%eax
-                jmp     _DosFlatToSel
+                jmp     DosFlatToSel
 
                 .p2align 2
 __emx_16to32:   movl    4(%esp),%eax
-                jmp     _DosSelToFlat
+                jmp     DosSelToFlat

trunk/src/emx/src/lib/sys/386/thunk1.s

@@ -68 +68 @@
 
                 movl    $Lthunk16_call, %eax
-                call    _DosFlatToSel
+                call    DosFlatToSel
                 movzwl  %ax, %ecx               # %ecx = offset
                 shrl    $16, %eax               # %eax = segment
@@ -75 +75 @@
 
                 movl    %esp, %eax
-                call    _DosFlatToSel
+                call    DosFlatToSel
                 movzwl  %ax, %ecx               # %ecx = offset
                 shrl    $16, %eax               # %eax = segment

trunk/src/emx/src/lib/sys/386/unwind.s

@@ -10 +10 @@
         pushl   $L_cont
         pushl   %eax
-        call    _DosUnwindException
+        call    DosUnwindException
 L_cont: addl    $3*4, %esp
         ret

trunk/src/emx/src/lib/sys/sys.smak

@@ -1 @@
-# Build two kinds of library: aout and aout-profile.
-# The OMF libraries will be derived from them.
+libc.TSRC.386 += $(wildcard src/lib/sys/386/*.s)
+libc.TSRC += $(wildcard src/lib/sys/*.c)
 
-.MODULE := sys
-.MDESC  := System-dependent libc backend
-
-.TKIND  := aout
-.TARGET := sys$A
-.TSRC.386 := $(wildcard src/lib/sys/386/*.s)
-.TSRC   := $(.TSRC.$(CPU)) $(wildcard src/lib/sys/*.c)
 .TCF.src/lib/sys/heapsize.c := -DHEAPSIZE=0x2000000
-.INSDIR = lib/
-.TKEEP  := 1
-include mklib.smak
-
-.TKIND  := aout prof
-.TARGET := sys_p$A
-include mklib.smak

trunk/src/emx/src/libend/end.smak

@@ -2 +2 @@
 .MDESC  := The C runtime library that should be linked last
 
+.TARGET := end.lib
 .TKIND  := omf
-.TARGET := end$A
 .TSRC.386 := $(wildcard src/lib/end/386/*.asm)
 .TSRC   := $(.TSRC.$(CPU))

trunk/src/emx/src/libmoddef/moddef.smak

@@ -2 +2 @@
 .MDESC  := A library for working with .DEF files
 
+.TARGET := moddef.a
 .TKIND  := aout
-.TARGET := moddef$A
 .TSRC   := $(wildcard src/lib/moddef/*.c)
 .INSDIR = lib/

trunk/src/emx/src/libomflib/omflib.smak

@@ -2 +2 @@
 .MDESC  := A library for reading/writing OMF object files
 
+.TARGET := omflib.a
 .TKIND  := aout
-.TARGET := omflib$A
 .TSRC   := $(wildcard src/lib/omflib/*.c)
 .INSDIR = lib/

trunk/src/emx/src/libos2/code2.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl  _DosGetMessage
+        .globl  DosGetMessage
         .globl  __msgseg32
 
@@ -14 +14 @@
         .align  2, 0x90
 
-_DosGetMessage:
+DosGetMessage:
         PROFILE_NOFRAME
         popl    %ecx                    /* return address */
         pushl   $__msgseg32
         pushl   %ecx
-        jmp     _DosTrueGetMessage
+        jmp     DosTrueGetMessage
 
 L_tab:  .short  0x0000

trunk/src/emx/src/libos2/code3.s

@@ -3 +3 @@
 #include <emx/asm386.h>
 
-        .globl  _DosQueryMessageCP
+        .globl  DosQueryMessageCP
 
-_DosQueryMessageCP:
+DosQueryMessageCP:
         PROFILE_NOFRAME
         pushl   0(%esp)
@@ -14 +14 @@
         xchgl   8(%esp), %eax
         movl    %eax, 4(%esp)
-        jmp     _DosIQueryMessageCP
+        jmp     DosIQueryMessageCP

trunk/src/emx/src/regexp/regexp.smak

@@ -3 +3 @@
 .INSDIR := lib/
 
-.TARGET := regexp$A
+.TARGET := regexp.a
+.TKIND  := aout
 .TSRC   := $(wildcard src/regexp/*.c)
 include mklib.smak