Changeset 123

Timestamp:

May 12, 2003, 12:48:43 PM (22 years ago)

Author:

zap

Message:

Started the work for re-designing the EMX C runtime library to not require
EMX.DLL. The new design is projected to be as follows:

• all emx syscalls are replaced with the routines from the old sys.lib library which is now compilable in both a.out and OMF formats.
• the sys.a library should be made replaceable and selectable by some gcc switch (e.g. -msyslib=emx would link with emx.a instead of sys.a which would give almost full backward compatibility with emx).
• All C functions names were renamed to not contain the starting underscore (e.g. fopen and not _fopen). The underscored aliases will be added later with the c_alias library (which will be generated automatically from all public symbols of libc; any exported symbol that do not start with an underscore will be given an underscored alias unless such a symbol is already defined).

Also a lot of updates to the building system. It is now much faster (thanks
to Knut's suggestion of using ash's builtin echo).
Also re-wrote thunk1.asm and thunk2.asm to GAS format; this removes the need
for MASM and makes it possible to use 16-bit functions in a.out programs
without the need for EMX.DLL.
Also made a lot of small changes I don't remember now.

Location:

trunk/src/emx

Files:

• Makefile (modified) (11 diffs, 1 prop)
• build.txt (modified) (4 diffs, 1 prop)
• common.smak (modified) (5 diffs, 1 prop)
• include/ansidecl.h (added)
• include/ctype.h (modified) (1 diff, 1 prop)
• include/demangle.h (added)
• include/dyn-string.h (added)
• include/emx/fnmatch.h (added)
• include/fibheap.h (added)
• include/floatformat.h (added)
• include/fnmatch.h (modified) (1 diff, 1 prop)
• include/getopt.h (modified) (3 diffs, 1 prop)
• include/hashtab.h (added)
• include/libiberty.h (added)
• include/malloc.h (modified) (1 prop)
• include/math.h (modified) (1 prop)
• include/md5.h (added)
• include/objalloc.h (added)
• include/obstack.h (added)
• include/partition.h (added)
• include/safe-ctype.h (added)
• include/sort.h (added)
• include/splay-tree.h (added)
• include/stddef.h (modified) (1 prop)
• include/stdio.h (modified) (1 prop)
• include/stdlib.h (modified) (1 prop)
• include/string.h (modified) (1 prop)
• include/symcat.h (added)
• include/sys/errno.h (modified) (1 prop)
• include/sys/fcntl.h (modified) (1 prop)
• include/sys/process.h (modified) (1 prop)
• include/sys/stat.h (modified) (1 diff, 1 prop)
• include/sys/types.h (modified) (1 diff, 1 prop)
• include/sys/wait.h (modified) (1 prop)
• include/ternary.h (added)
• include/time.h (modified) (1 prop)
• include/unistd.h (modified) (1 prop)
• include/xregex.h (added)
• include/xregex2.h (added)
• mklib.smak (modified) (1 diff, 1 prop)
• src/emxbind/emxbind.smak (modified) (1 diff, 1 prop)
• src/emxexp/cplus-de.c (deleted)
• src/emxexp/emxexp.smak (modified) (1 diff, 1 prop)
• src/emximp/emximp.smak (modified) (1 diff, 1 prop)
• src/emxload/emximp.smak (deleted)
• src/emxload/emxload.smak (added)
• src/emxomf/emxomf.smak (modified) (1 diff, 1 prop)
• src/emxstack/emxstack.smak (modified) (1 diff, 1 prop)
• src/emxtsf/emxtsf.smak (modified) (1 diff, 1 prop)
• src/ld/ld.c (modified) (16 diffs, 1 prop)
• src/ld/ld.smak (modified) (1 diff, 1 prop)
• src/lib/app/app.smak (modified) (2 diffs, 1 prop)
• src/lib/emxload/emxload.smak (added)
• src/lib/emxload/emxloadl.c (modified) (2 diffs, 1 prop)
• src/lib/emxload/emxloadr.c (modified) (1 diff, 1 prop)
• src/lib/end/end.smak (modified) (1 diff, 1 prop)
• src/lib/io/_imphand.c (modified) (1 diff, 1 prop)
• src/lib/io/access.c (modified) (1 diff, 1 prop)
• src/lib/io/chmod.c (modified) (1 diff, 1 prop)
• src/lib/io/chsize.c (modified) (1 diff, 1 prop)
• src/lib/io/close.c (modified) (1 diff, 1 prop)
• src/lib/io/creat.c (modified) (1 diff, 1 prop)
• src/lib/io/dup.c (modified) (1 diff, 1 prop)
• src/lib/io/dup2.c (modified) (1 diff, 1 prop)
• src/lib/io/eadread.c (modified) (1 diff, 1 prop)
• src/lib/io/eadwrite.c (modified) (1 diff, 1 prop)
• src/lib/io/eaget.c (modified) (1 diff, 1 prop)
• src/lib/io/eaput.c (modified) (1 diff, 1 prop)
• src/lib/io/eof.c (modified) (1 diff, 1 prop)
• src/lib/io/fcloseal.c (modified) (1 diff, 1 prop)
• src/lib/io/fcntl.c (modified) (1 diff, 1 prop)
• src/lib/io/fdopen.c (modified) (1 diff, 1 prop)
• src/lib/io/fgetchar.c (modified) (1 diff, 1 prop)
• src/lib/io/fileleng.c (modified) (1 diff, 1 prop)
• src/lib/io/flock.c (modified) (1 diff, 1 prop)
• src/lib/io/flushall.c (modified) (1 diff, 1 prop)
• src/lib/io/fputchar.c (modified) (1 diff, 1 prop)
• src/lib/io/fstat.c (modified) (1 diff, 1 prop)
• src/lib/io/fsync.c (modified) (1 diff, 1 prop)
• src/lib/io/ftruncat.c (modified) (1 diff, 1 prop)
• src/lib/io/getw.c (modified) (1 diff, 1 prop)
• src/lib/io/io.smak (modified) (1 diff, 1 prop)
• src/lib/io/ioctl.c (modified) (1 diff, 1 prop)
• src/lib/io/isatty.c (modified) (1 diff, 1 prop)
• src/lib/io/lseek.c (modified) (1 diff, 1 prop)
• src/lib/io/mkstemp.c (modified) (1 diff, 1 prop)
• src/lib/io/mktemp.c (modified) (1 diff, 1 prop)
• src/lib/io/open.c (modified) (1 diff, 1 prop)
• src/lib/io/pclose.c (modified) (1 diff, 1 prop)
• src/lib/io/pipe.c (modified) (1 diff, 1 prop)
• src/lib/io/popen.c (modified) (1 diff, 1 prop)
• src/lib/io/putw.c (modified) (1 diff, 1 prop)
• src/lib/io/read.c (modified) (1 diff, 1 prop)
• src/lib/io/readv.c (modified) (1 diff, 1 prop)
• src/lib/io/select.c (modified) (1 diff, 1 prop)
• src/lib/io/setbuffe.c (modified) (1 diff, 1 prop)
• src/lib/io/setmode.c (modified) (1 diff, 1 prop)
• src/lib/io/snprintf.c (modified) (1 diff, 1 prop)
• src/lib/io/sopen.c (modified) (1 diff, 1 prop)
• src/lib/io/stat.c (modified) (1 diff, 1 prop)
• src/lib/io/tell.c (modified) (1 diff, 1 prop)
• src/lib/io/truncate.c (modified) (1 diff, 1 prop)
• src/lib/io/ttyname.c (modified) (1 diff, 1 prop)
• src/lib/io/umask.c (modified) (1 diff, 1 prop)
• src/lib/io/unlink.c (modified) (1 diff, 1 prop)
• src/lib/io/utime.c (modified) (1 diff, 1 prop)
• src/lib/io/utimes.c (modified) (1 diff, 1 prop)
• src/lib/io/vsnprint.c (modified) (1 diff, 1 prop)
• src/lib/io/vsscanf.c (modified) (1 diff, 1 prop)
• src/lib/io/write.c (modified) (1 diff, 1 prop)
• src/lib/io/writev.c (modified) (1 diff, 1 prop)
• src/lib/libc.smak (modified) (3 diffs, 1 prop)
• src/lib/math/math.smak (modified) (1 diff, 1 prop)
• src/lib/misc/386/int86.s (modified) (1 diff, 1 prop)
• src/lib/misc/386/setjmp.s (modified) (2 diffs, 1 prop)
• src/lib/misc/386/sigsetjm.s (modified) (3 diffs, 1 prop)
• src/lib/misc/abort.c (modified) (4 diffs, 1 prop)
• src/lib/misc/alarm.c (modified) (1 diff, 1 prop)
• src/lib/misc/brk.c (modified) (1 diff, 1 prop)
• src/lib/misc/chdir.c (modified) (1 diff, 1 prop)
• src/lib/misc/cuserid.c (modified) (1 diff, 1 prop)
• src/lib/misc/dirent.c (modified) (6 diffs, 1 prop)
• src/lib/misc/dtread.c (modified) (1 diff, 1 prop)
• src/lib/misc/fnmatch.c (modified) (2 diffs, 1 prop)
• src/lib/misc/fpathcon.c (modified) (1 diff, 1 prop)
• src/lib/misc/ftw.c (modified) (1 diff, 1 prop)
• src/lib/misc/getcwd.c (modified) (1 diff, 1 prop)
• src/lib/misc/getegid.c (modified) (1 diff, 1 prop)
• src/lib/misc/geteuid.c (modified) (1 diff, 1 prop)
• src/lib/misc/getgid.c (modified) (1 diff, 1 prop)
• src/lib/misc/getgrgid.c (modified) (1 diff, 1 prop)
• src/lib/misc/getgrnam.c (modified) (1 diff, 1 prop)
• src/lib/misc/getgroup.c (modified) (1 diff, 1 prop)
• src/lib/misc/getlogin.c (modified) (1 diff, 1 prop)
• src/lib/misc/getopt.c (modified) (1 diff, 1 prop)
• src/lib/misc/getpages.c (modified) (1 diff, 1 prop)
• src/lib/misc/getpass.c (modified) (1 diff, 1 prop)
• src/lib/misc/getpgrp.c (modified) (1 diff, 1 prop)
• src/lib/misc/getpwnam.c (modified) (1 diff, 1 prop)
• src/lib/misc/getpwuid.c (modified) (1 diff, 1 prop)
• src/lib/misc/getuid.c (modified) (1 diff, 1 prop)
• src/lib/misc/getvol.c (modified) (1 diff, 1 prop)
• src/lib/misc/getwd.c (modified) (1 diff, 1 prop)
• src/lib/misc/glob.c (modified) (7 diffs, 1 prop)
• src/lib/misc/mkdir.c (modified) (1 diff, 1 prop)
• src/lib/misc/os2bad.c (modified) (1 diff, 1 prop)
• src/lib/misc/pathconf.c (modified) (1 diff, 1 prop)
• src/lib/misc/perror.c (modified) (1 diff, 1 prop)
• src/lib/misc/pwd.c (modified) (2 diffs, 1 prop)
• src/lib/misc/rmdir.c (modified) (1 diff, 1 prop)
• src/lib/misc/sbrk.c (modified) (1 diff, 1 prop)
• src/lib/misc/scrsize.c (modified) (1 diff, 1 prop)
• src/lib/misc/searchen.c (modified) (2 diffs, 1 prop)
• src/lib/misc/setgid.c (modified) (1 diff, 1 prop)
• src/lib/misc/setpgid.c (modified) (1 diff, 1 prop)
• src/lib/misc/setsid.c (modified) (1 diff, 1 prop)
• src/lib/misc/setuid.c (modified) (1 diff, 1 prop)
• src/lib/misc/sleep.c (modified) (1 diff, 1 prop)
• src/lib/misc/sleep2.c (modified) (1 diff, 1 prop)
• src/lib/misc/sysconf.c (modified) (1 diff, 1 prop)
• src/lib/misc/syserr.c (modified) (2 diffs, 1 prop)
• src/lib/misc/syserrno.c (modified) (1 diff, 1 prop)
• src/lib/misc/uflags.c (modified) (1 diff, 1 prop)
• src/lib/misc/ulimit.c (modified) (1 diff, 1 prop)
• src/lib/misc/uname.c (modified) (1 diff, 1 prop)
• src/lib/moddef/moddef.smak (modified) (1 diff, 1 prop)
• src/lib/omflib/omflib.smak (modified) (1 diff, 1 prop)
• src/lib/process/386/_errno.s (modified) (2 diffs, 1 prop)
• src/lib/process/386/gettid.s (modified) (1 diff, 1 prop)
• src/lib/process/386/thread.s (modified) (2 diffs, 1 prop)
• src/lib/process/execl.c (modified) (2 diffs, 1 prop)
• src/lib/process/execle.c (modified) (2 diffs, 1 prop)
• src/lib/process/execlp.c (modified) (2 diffs, 1 prop)
• src/lib/process/execlpe.c (modified) (2 diffs, 1 prop)
• src/lib/process/execv.c (modified) (1 diff, 1 prop)
• src/lib/process/execve.c (modified) (1 diff, 1 prop)
• src/lib/process/execvp.c (modified) (1 diff, 1 prop)
• src/lib/process/execvpe.c (modified) (1 diff, 1 prop)
• src/lib/process/fmutex.c (modified) (3 diffs, 1 prop)
• src/lib/process/fork.c (modified) (1 diff, 1 prop)
• src/lib/process/getpid.c (deleted)
• src/lib/process/getppid.c (deleted)
• src/lib/process/kill.c (deleted)
• src/lib/process/pause.c (deleted)
• src/lib/process/profil.c (deleted)
• src/lib/process/raise.c (deleted)
• src/lib/process/sigactio.c (deleted)
• src/lib/process/sigbsd.c (deleted)
• src/lib/process/signal.c (deleted)
• src/lib/process/sigpendi.c (deleted)
• src/lib/process/sigprocm.c (deleted)
• src/lib/process/sigsuspe.c (deleted)
• src/lib/process/sigsysv.c (deleted)
• src/lib/process/spawnl.c (modified) (2 diffs, 1 prop)
• src/lib/process/spawnle.c (modified) (2 diffs, 1 prop)
• src/lib/process/spawnlp.c (modified) (2 diffs, 1 prop)
• src/lib/process/spawnlpe.c (modified) (2 diffs, 1 prop)
• src/lib/process/spawnv.c (modified) (1 diff, 1 prop)
• src/lib/process/spawnve.c (deleted)
• src/lib/process/spawnvp.c (modified) (1 diff, 1 prop)
• src/lib/process/spawnvpe.c (modified) (2 diffs, 1 prop)
• src/lib/process/system.c (modified) (1 diff, 1 prop)
• src/lib/process/wait.c (deleted)
• src/lib/process/waitpid.c (deleted)
• src/lib/startup/386/crt0.s (modified) (4 diffs, 1 prop)
• src/lib/startup/386/crt1.s (modified) (3 diffs, 1 prop)
• src/lib/startup/386/dll0.s (modified) (3 diffs, 1 prop)
• src/lib/startup/386/res0.s (deleted)
• src/lib/startup/ctor.c (deleted)
• src/lib/startup/dtor.c (deleted)
• src/lib/startup/gmon.c (modified) (9 diffs, 1 prop)
• src/lib/str/memccpy.c (modified) (1 diff, 1 prop)
• src/lib/str/memicmp.c (modified) (1 diff, 1 prop)
• src/lib/str/strdup.c (modified) (1 diff, 1 prop)
• src/lib/str/strerror.c (modified) (1 diff, 1 prop)
• src/lib/str/stricmp.c (modified) (1 diff, 1 prop)
• src/lib/str/strlwr.c (modified) (2 diffs, 1 prop)
• src/lib/str/strnicmp.c (modified) (1 diff, 1 prop)
• src/lib/str/strnset.c (modified) (1 diff, 1 prop)
• src/lib/str/strrev.c (modified) (1 diff, 1 prop)
• src/lib/str/strset.c (modified) (1 diff, 1 prop)
• src/lib/str/strtok.c (modified) (1 diff, 1 prop)
• src/lib/str/strupr.c (modified) (2 diffs, 1 prop)
• src/lib/sys/386/thunk0.asm (deleted)
• src/lib/sys/386/thunk0.s (added)
• src/lib/sys/386/thunk1.asm (deleted)
• src/lib/sys/386/thunk1.s (added)
• src/lib/sys/__ftime.c (modified) (1 diff, 1 prop)
• src/lib/sys/__getdrive.c (modified) (1 diff, 1 prop)
• src/lib/sys/__init.c (modified) (1 diff, 1 prop)
• src/lib/sys/__mkdir.c (modified) (1 diff, 1 prop)
• src/lib/sys/__rmdir.c (modified) (1 diff, 1 prop)
• src/lib/sys/__spawnve.c (added)
• src/lib/sys/filesys.c (modified) (1 diff, 1 prop)
• src/lib/sys/p2t.c (modified) (1 diff, 1 prop)
• src/lib/sys/pause.c (modified) (1 diff, 1 prop)
• src/lib/sys/sigaction.c (modified) (1 diff, 1 prop)
• src/lib/sys/spawnve.c (modified) (2 diffs, 1 prop)
• src/lib/sys/sys.smak (added)
• src/lib/sys/syscalls.h (modified) (1 diff, 1 prop)
• src/lib/time/ftime.c (modified) (1 diff, 1 prop)
• src/lib/time/gettimeo.c (modified) (1 diff, 1 prop)
• src/lib/time/localtim.c (modified) (1 diff, 1 prop)
• src/lib/time/mktime.c (modified) (1 diff, 1 prop)
• src/lib/time/settimeo.c (modified) (2 diffs, 1 prop)
• src/lib/time/strptime.c (modified) (1 diff, 1 prop)
• src/lib/time/time.c (modified) (1 diff, 1 prop)
• src/lib/time/times.c (modified) (2 diffs, 1 prop)
• src/lib/time/tzset.c (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/regexp/regexp.smak (modified) (1 diff, 1 prop)

trunk/src/emx/Makefile

@@ -23 +23 @@
 OUT = out/
 # Base installation directory
-INS = out/install/
+INS = out/$(MODE)/install/
 # CPU type (pretend we are portable ;-)
 CPU = 386
+# The object file format to use for tools (emxomf, ld and friends)
+TOOLFMT.dbg = aout
+TOOLFMT.opt = omf
+TOOLFMT = $(TOOLFMT.$(MODE))
 
 # Use ash.exe which is quite fast (comparable to cmd.exe) but has more features
@@ -44 +48 @@
 CC = gcc -c
 # The C compiler flags
-CFLAGS = -Wall -Iinclude -Isrc/include $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
+CFLAGS.INC = -Iinclude -Isrc/include
+CFLAGS = -Wall -mstack-arg-probe -Zmt $(CFLAGS.INC) $(CFLAGS.$(MODE)) $(CFLAGS.KIND)
 # The additional C compiler flags for different build modes
 CFLAGS.opt = -s -O3 -fomit-frame-pointer
@@ -50 +55 @@
 CFLAGS.aout =
 CFLAGS.omf = -Zomf
-CFLAGS.st =
-CFLAGS.mt = -Zmt
 CFLAGS.prof = -pg
 # The object files are put in subdirectory objectformat-targetkind,
@@ -63 +66 @@
 LD = gcc
 # Linker flags
-LDFLAGS = $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND)
+LDFLAGS = -Zmt $(LDFLAGS.$(MODE)) $(LDFLAGS.KIND)
 # Linker flags for different build modes
 LDFLAGS.opt = -s
@@ -69 +72 @@
 LDFLAGS.aout =
 LDFLAGS.omf = -Zomf -Zsys -Zsmall-conv -Zlinker /PM:VIO
-LDFLAGS.st =
-LDFLAGS.mt = -Zmt
-LDFLAGS.stp = -pg
-LDFLAGS.mtp = -pg -Zmt
+LDFLAGS.prof = -pg
 # Linker flags for different kinds of target
 LDFLAGS.KIND = $(foreach x,$(subst -, ,$(firstword $(subst /, ,$(subst $.,,$@)))),$(LDFLAGS.$x))
@@ -88 +88 @@
 ARFLAGS = crs
 DO.LIBRARY = $(AR) $(ARFLAGS) $@ $(^O)
+
+# How to create dependencies
+MAKEDEP = makedep
+MAKEDEPFLAGS = $(CFLAGS.INC)
+DO.DEPS = $(MAKEDEP) $(MAKEDEPFLAGS) \
+  -I$(subst $(SPACE), -I,$(sort $(dir $^))) -p$(@D)/ -c -S -f$@ $^
+
+# How to convert an a.out file to the OMF format
+DO.AOUT2OMF = emxomf $(strip $1 -o) $@ $<
 
 # How to filter just the object files from $^
@@ -109 +118 @@
 SEP := ==========================================================================
 
-# How to remove a file
+# How to remove one or more files without questions
 RM = rm -f $1
+# How to remove one or more directories without questions
+RMDIR = rm -rf $1
+# How to copy several files to a directory
+CP = cp $1 $2
 # Miscelaneous tools
 MKDIR = mkdir.exe -p $1
@@ -117 +130 @@
 ECHOIZE = $(subst $$,\$$,$1$(strip $(subst $(SPACE)$(COMMA),$(COMMA),$(foreach x,2 3 4 5 6 7 8 9,$(if $($x),$(COMMA) $($x))))))
 # How to output a text string (with appended newline)
-# bird: skip the .exe and ash will use internal echo implementation which is way faster
-#ECHO = echo.exe "$(call ECHOIZE,$1,$2,$3,$4,$5,$6,$7,$8,$9)"
 ECHO = echo "$(call ECHOIZE,$1,$2,$3,$4,$5,$6,$7,$8,$9)"
 # Same but append the text to a file (given with first argument)
-# bird: skip the .exe and ash will use internal echo implementation which is way faster
-#FECHO = echo.exe "$(call ECHOIZE,$2,$3,$4,$5,$6,$7,$8,$9)" >> "$1"
 FECHO = echo "$(call ECHOIZE,$2,$3,$4,$5,$6,$7,$8,$9)" >> "$1"
 # How to replace the source file extension with a .o extension
@@ -145 +154 @@
 # Build rules (_@_ replaced by name of generated makefile)
 RULES :=
-
-.PHONY: default help all clean install
+# The list of dependency files
+TARGDEPEND :=
+
+.PHONY: default help all clean install cleandep cleandepend dep depend depdone
 .SUFFIXES:
-.SUFFIXES: .c .cpp .asm .s .o .exe .dll .a .lib
+.SUFFIXES: .c .cpp .asm .s .o .exe .dll .a .lib .obj
 
 # Default target
@@ -172 +183 @@
         @$(call ECHO,    clean - remove all generated files (remove all built files))
         @$(call ECHO,    install - generate a installation tree in $(INS))
+        @$(call ECHO,    dep - generate dependency files for all changed targets)
+        @$(call ECHO,    cleandep - remove all dependency file)
         @$(call ECHO,$(SEP))
         @$(call ECHO,There are a number of variables than can be set in the make)
@@ -181 +194 @@
         @$(call ECHO,$(SEP))
 
-all: $(MODULES)
+all: $(TARGDIRS) $(MODULES)
 
 clean:
-        rm -rf $(OUT)
-
-install: $(INSDIRS)
+        $(call RMDIR,$(OUT))
+
+cleandep cleandepend:
+        $(call RM,$(TARGDEPEND))
+
+dep depend:
+        @$(MAKE) --no-print-directory BUILD_DEPS=1 depdone
+
+depdone:
+        @$(call ECHO,Dependency files succesfully updated)
+
+install: all $(INSDIRS)
         $(DO.INSTALL)
 
-$(OUT) $. $(INSDIRS) $(TARGDIRS):
+$. $(INSDIRS) $(TARGDIRS):
         $(call MKDIR,$@)
 
-# bird: add rule for generating the rules.
-rules: rules-rm $(OUT)genrules.smak
-rules-rm:
-        @$(call RM,$(OUT)genrules.smak)
-        
-#$(OUT)genrules.smak: $(OUT) Makefile $(SUBMAK)
-# bird: depeding on $(OUT) make it unstable.
-$(OUT)genrules.smak: Makefile $(SUBMAK)
-        $(call MKDIR,$(@D))
-        @$(call ECHO,Please wait, rebuilding make rules $@ ...)
+$(OUT)genrules.smak: $(SUBMAK) # Makefile $(wildcard *.smak)
+        @$(call MKDIR,$(OUT))
+        @$(call ECHO,Please wait, rebuilding make rules ...)
         @$(call RM,$@)
         @$(call FECHO,$@,# Autogenerated file -- DO NOT EDIT!)
         @$(subst _@,$@,$(RULES))
 
+# The general a.out -> OMF conversion rule for object files
+$.omf/%.obj: $.aout/%.o
+        $(call DO.AOUT2OMF)
+
+# The general a.out -> OMF conversion rule for libraries
+$.omf%.lib: $.aout%.a
+        $(call DO.AOUT2OMF)
+
 -include $(OUT)genrules.smak
-

trunk/src/emx/build.txt

@@ -95 +95 @@
   'make help' in the module list section.
 
+.MDEP - (optional) module dependencies. This is useful if current module
+  requires another module to be built first (e.g. a library).
+
 .TARGET - The name of target (e.g. executable or library file name without dir).
   For example: .TARGET=myfile.exe
@@ -100 +103 @@
 .TKIND - (optional) The kind of target. It can consist of up to three
   components, the first one defines the object file format (omf or aout,
-  if not defined defaults to omf), the second defines the threadness
-  (st or mt, defaults to st), third can be 'prof' to build in profiling mode.
-  Example: .TKIND=omf st prof
+  if not defined defaults to omf), the second can be 'prof' to build in
+  profiling mode.
+  Example: .TKIND=omf prof
 
 .TDEP - Dependencies for target (not built from a source file). For example,
@@ -141 +144 @@
 mklib.smak - this builder creates a library. It defines all rules required
   for building all object files and then runs the librarian which binds all
-  object files together in a single library.
+  object files together in a single library. Besides, if the file format is
+  a.out, it also defines a target called '$(.MODULE)@omf' (e.g. for module
+  zzz it also defines a module called zzz@omf) which will build the OMF
+  library from its a.out counterpart by using emxomf.
 
 Here is a simple example of a submakefile that will build a simple helloworld
@@ -195 +201 @@
 files from a single source file they are put under different output directories
 (e.g. single-threaded OMF object files go into $(OUT)/omf-st/ directory while
-multi-threaded a.out object files with profiling go into $(OUT)/aout-mt-prof/
+multi-threaded a.out object files with profiling go into $(OUT)/aout-prof/
 directory). This way, you can have several targets that are built from the
 same source files with different compilation options.

trunk/src/emx/common.smak

@@ -19 +19 @@
 .tmp := omf
 endif # neq ($(findstring aout,$(.TKIND)),)
-ifneq ($(findstring mt,$(.TKIND)),)
-.tmp += mt
-else
-.tmp += st
-endif # neq ($(findstring mt,$(.TKIND)),)
 ifneq ($(findstring prof,$(.TKIND)),)
 .tmp += prof
@@ -29 +24 @@
 .TKIND := $(.tmp)
 .TKIND.DIR := $(subst $(SPACE),-,$(.TKIND))/
-.tmp :=
+
+ifdef .TARGET
 
 # .TARG is same as .TARGET except that it has a st/ or mt/ prefix
@@ -35 +31 @@
 
 ifdef .INSDIR
-DO.INSTALL += cp.exe $.$(.TARG) $(INS)$(.INSDIR)$(.TARGET)$(NL)
+DO.INSTALL += $(call CP,$.$(.TARG),$(INS)$(.INSDIR)$(.TARGET))$(NL)
 INSDIRS += $(INS)$(.INSDIR)
 endif # def .INSDIR
+
+# We know how to create dependency files for .c and .cpp files
+.tmp := $(strip $(filter %.c,$(.TSRC)) $(filter %.cpp,$(.TSRC)))
+ifdef .tmp
+# Read the dependency file
+-include $.$(.TKIND.DIR)dep-$(.TARGET).smak
+
+TARGDEPEND += $.$(.TKIND.DIR)dep-$(.TARGET).smak
+
+ifdef BUILD_DEPS
+# How to build the dependency file
+$.$(.TKIND.DIR)dep-$(.TARGET).smak: $(.tmp)
+        $(DO.DEPS)
+endif # BUILD_DEPS
+endif # def .tmp
+
+endif # def .TARGET
 
 # If module has any source files, find respective object file names
@@ -47 +60 @@
 TARGDIRS += $(.DIRS)
 
+ifdef .MDEP
+$(.MODULE): $(.MDEP)
+.MDEP :=
+endif
+
+ifdef .MODULE
 $(.MODULE): $(.DIRS) $.$(.TARG)
+endif
 
 # Remove the names of files for which we already generated build rules
@@ -61 +81 @@
 BUILD.RULES += $(.TSRC)
 .TSRC := $(filter-out $(.OBJS),$(subst :, ,$(.TSRC)))
-
-#.TSRC := $(foreach x,$(.TSRC),$(if $(findstring $(call OBJFILE,$x):$x,$(BUILD.RULES)),,$x))
-#BUILD.RULES += $(foreach x,$(.TSRC),$(if $(findstring $(call OBJFILE,$x):$x,$(BUILD.RULES)),,$(call OBJFILE,$x):$x))
 
 # Generate compilation rules for C files

trunk/src/emx/include/ctype.h

@@ -46 +46 @@
 #else
 
-#define isalnum(c)  ((_ctype+1)[c] & (_UPPER|_LOWER|_DIGIT))
-#define isalpha(c)  ((_ctype+1)[c] & (_UPPER|_LOWER))
-#define iscntrl(c)  ((_ctype+1)[c] & (_CNTRL))
-#define isdigit(c)  ((_ctype+1)[c] & (_DIGIT))
-#define isgraph(c)  ((_ctype+1)[c] & (_PUNCT|_UPPER|_LOWER|_DIGIT))
-#define islower(c)  ((_ctype+1)[c] & (_LOWER))
-#define isprint(c)  ((_ctype+1)[c] & (_PRINT))
-#define ispunct(c)  ((_ctype+1)[c] & (_PUNCT))
-#define isspace(c)  ((_ctype+1)[c] & (_SPACE))
-#define isupper(c)  ((_ctype+1)[c] & (_UPPER))
-#define isxdigit(c) ((_ctype+1)[c] & (_XDIGIT))
+#define isalnum(c)  ((_ctype+1)[(unsigned char)c] & (_UPPER|_LOWER|_DIGIT))
+#define isalpha(c)  ((_ctype+1)[(unsigned char)c] & (_UPPER|_LOWER))
+#define iscntrl(c)  ((_ctype+1)[(unsigned char)c] & (_CNTRL))
+#define isdigit(c)  ((_ctype+1)[(unsigned char)c] & (_DIGIT))
+#define isgraph(c)  ((_ctype+1)[(unsigned char)c] & (_PUNCT|_UPPER|_LOWER|_DIGIT))
+#define islower(c)  ((_ctype+1)[(unsigned char)c] & (_LOWER))
+#define isprint(c)  ((_ctype+1)[(unsigned char)c] & (_PRINT))
+#define ispunct(c)  ((_ctype+1)[(unsigned char)c] & (_PUNCT))
+#define isspace(c)  ((_ctype+1)[(unsigned char)c] & (_SPACE))
+#define isupper(c)  ((_ctype+1)[(unsigned char)c] & (_UPPER))
+#define isxdigit(c) ((_ctype+1)[(unsigned char)c] & (_XDIGIT))
 
 int (isalnum)(int);

trunk/src/emx/include/fnmatch.h

@@ -1 @@
-/* fnmatch.h (emx+gcc) */
+/* Copyright 1991, 1992, 1993, 1996 Free Software Foundation, Inc.
 
-#ifndef _FNMATCH_H
-#define _FNMATCH_H
+NOTE: The canonical source of this file is maintained with the GNU C Library.
+Bugs can be reported to bug-glibc@prep.ai.mit.edu.
 
-#if defined (__cplusplus)
+This program is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 2, or (at your option) any
+later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, 59 Temple Place - Suite 330,
+Boston, MA 02111-1307, USA.  */
+
+#ifndef _FNMATCH_H
+
+#define _FNMATCH_H      1
+
+#ifdef  __cplusplus
 extern "C" {
 #endif
 
-/* POSIX.2 */
-
-#define FNM_NOMATCH        1
-
-#define FNM_NOESCAPE       16
-#define FNM_PATHNAME       32
-#define FNM_PERIOD         64
-
-int fnmatch (__const__ char *, __const__ char *, int);
+#if defined (__cplusplus) || (defined (__STDC__) && __STDC__)
+#undef  __P
+#define __P(args)       args
+#else /* Not C++ or ANSI C.  */
+#undef  __P
+#define __P(args)       ()
+/* We can get away without defining `const' here only because in this file
+   it is used only inside the prototype for `fnmatch', which is elided in
+   non-ANSI C where `const' is problematical.  */
+#endif /* C++ or ANSI C.  */
 
 
-#if !defined (_POSIX_SOURCE) || defined (_WITH_UNDERSCORE)
+/* We #undef these before defining them because some losing systems
+   (HP-UX A.08.07 for example) define these in <unistd.h>.  */
+#undef  FNM_PATHNAME
+#undef  FNM_NOESCAPE
+#undef  FNM_PERIOD
 
-/* emx extensions */
+/* Bits set in the FLAGS argument to `fnmatch'.  */
+#define FNM_PATHNAME    (1 << 0) /* No wildcard can ever match `/'.  */
+#define FNM_NOESCAPE    (1 << 1) /* Backslashes don't quote special chars.  */
+#define FNM_PERIOD      (1 << 2) /* Leading `.' is matched only explicitly.  */
 
-#define _FNM_MATCH         0
-#define _FNM_ERR           2
-
-#define _FNM_STYLE_MASK    15
-
-#define _FNM_POSIX         0
-#define _FNM_OS2           1
-#define _FNM_DOS           2
-
-#define _FNM_IGNORECASE    128
-#define _FNM_PATHPREFIX    256
-
-int _fnmatch (__const__ char *, __const__ char *, int);
-
+#if !defined (_POSIX_C_SOURCE) || _POSIX_C_SOURCE < 2 || defined (_GNU_SOURCE)
+#define FNM_FILE_NAME   FNM_PATHNAME /* Preferred GNU name.  */
+#define FNM_LEADING_DIR (1 << 3) /* Ignore `/...' after a match.  */
+#define FNM_CASEFOLD    (1 << 4) /* Compare without regard to case.  */
 #endif
 
+/* Value returned by `fnmatch' if STRING does not match PATTERN.  */
+#define FNM_NOMATCH     1
 
-#if defined (__cplusplus)
+/* Match STRING against the filename pattern PATTERN,
+   returning zero if it matches, FNM_NOMATCH if not.  */
+extern int fnmatch __P ((const char *__pattern, const char *__string,
+                         int __flags));
+
+#ifdef  __cplusplus
 }
 #endif
 
-#endif /* not _FNMATCH_H */
+#endif /* fnmatch.h */

trunk/src/emx/include/getopt.h

@@ -1 +1 @@
 /* Declarations for getopt.
-   Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc.
+   Copyright 1989, 1990, 1991, 1992, 1993, 1994, 1996, 1997, 1998, 2000
+   Free Software Foundation, Inc.
 
    NOTE: The canonical source of this file is maintained with the GNU C Library.
@@ -100 +101 @@
 
 #if defined (__STDC__) && __STDC__
-#ifdef __GNU_LIBRARY__
+/* HAVE_DECL_* is a three-state macro: undefined, 0 or 1.  If it is
+   undefined, we haven't run the autoconf check so provide the
+   declaration without arguments.  If it is 0, we checked and failed
+   to find the declaration so provide a fully prototyped one.  If it
+   is 1, we found it so don't provide any declaration at all.  */
+#if defined (__GNU_LIBRARY__) || (defined (HAVE_DECL_GETOPT) && !HAVE_DECL_GETOPT)
 /* Many other libraries have conflicting prototypes for getopt, with
    differences in the consts, in stdlib.h.  To avoid compilation
@@ -106 +112 @@
 extern int getopt (int argc, char *const *argv, const char *shortopts);
 #else /* not __GNU_LIBRARY__ */
+# if !defined (HAVE_DECL_GETOPT) && !defined (__cplusplus)
 extern int getopt ();
+# endif
 #endif /* __GNU_LIBRARY__ */
 extern int getopt_long (int argc, char *const *argv, const char *shortopts,

trunk/src/emx/include/sys/stat.h

@@ -5 +5 @@
 
 #if !defined (_SYS_TYPES_H)
-#warning <sys/stat.h> requires <sys/types.h>
+ #warning <sys/stat.h> requires <sys/types.h>
 #include <sys/types.h>
 #endif

trunk/src/emx/include/sys/types.h

@@ -63 +63 @@
 #if !defined (FD_SETSIZE)
 #define FD_SETSIZE      256
-#elif FD_SETSIZE < 256
-#error FD_SETSIZE must be at least 256
+#else
+#if FD_SETSIZE < 256
+ #error FD_SETSIZE must be at least 256
+#endif
 #endif
 

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)
+endif # neq ($(findstring aout,$(.TKIND)),)
+
 include comend.smak

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

@@ -1 +1 @@
 .MODULE := emxbind
 .MDESC  := Build a OS/2 LX executable/dll from linked a.out module
+.MDEP   := moddef@omf
 .INSDIR := bin/
 
 .TARGET := emxbind.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := $(wildcard src/emxbind/*.c)
 .TCF    := -DLIST_OPT=1

trunk/src/emx/src/emxexp/emxexp.smak

@@ -1 +1 @@
 .MODULE := emxexp
 .MDESC  := Generate a list of DLL export entries
+.MDEP   := omflib@omf
 .INSDIR := bin/
 
 .TARGET := emxexp.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := $(wildcard src/emxexp/*.c)
-.TLDF   := -liberty -lomflib
+.TDEP   := @O@omflib$A
+.TLDF   := -liberty
 include mkexe.smak

trunk/src/emx/src/emximp/emximp.smak

@@ -1 +1 @@
 .MODULE := emximp
 .MDESC  := Import library management tool
+.MDEP   := omflib@omf moddef@omf
 .INSDIR := bin/
 
 .TARGET := emximp.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := $(wildcard src/emximp/*.c)
-.TLDF   := -lomflib -lmoddef
+.TDEP   := @O@omflib$A @O@moddef$A
 include mkexe.smak

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
 
 .TARGET := emxomf.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := $(addprefix src/emxomf/,emxomf.c stabshll.c grow.c)
-.TLDF   := -lomflib
+.TDEP   := @O@omflib$A
 include mkexe.smak
 
 .TARGET := emxomfar.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := src/emxomf/emxomfar.c
-.TLDF   := -lomflib
+.TDEP   := @O@omflib$A
 include mkexe.smak
 
 .TARGET := emxomfld.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := src/emxomf/emxomfld.c
-.TLDF   := -lmoddef
+.TDEP   := @O@moddef$A
 include mkexe.smak
 
 .TARGET := emxaout.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := $(addprefix src/emxomf/,emxaout.c grow.c)
 include mkexe.smak
 
 .TARGET := listomf.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := src/emxomf/listomf.c
 include mkexe.smak

trunk/src/emx/src/emxstack/emxstack.smak

@@ -4 +4 @@
 
 .TARGET := emxstack.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := $(wildcard src/emxstack/*.c)
 include mkexe.smak

trunk/src/emx/src/emxtsf/emxtsf.smak

@@ -1 +1 @@
 .MODULE := emxtsf
 .MDESC  := Simplify construction of .TSF files
+.MDEP   := moddef@omf
 .INSDIR := bin/
 
 .TARGET := emxtsf.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := $(wildcard src/emxtsf/*.c)
 .TLDF   := -lmoddef

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

@@ -29 +29 @@
 #include <process.h>        /* for running emxbind */
 #include <errno.h>
+#include <utime.h>
 #endif /* __EMX__ */
+#include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -81 +83 @@
 #define FIXSETBUG
 
+extern int DosCopy (char *, char *, int);
 #endif /* EMX */
 
@@ -1109 +1112 @@
 
 int parse ();
-void do_warnings ();
 void initialize_text_start ();
 void initialize_data_start ();
@@ -1132 +1134 @@
 char *get_file_name ();
 symbol *getsym (), *getsym_soft ();
+void do_warnings ();
 #ifdef EMX /* emxbind */
 void check_exe (void);
@@ -1144 +1147 @@
 #ifdef __EMX__
   _response (&argc, &argv);
+  _wildcard (&argc, &argv);
 #endif /* __EMX__ */
   page_size = getpagesize ();
@@ -1822 +1826 @@
 
   perror_file (entry);
+  /* NOTREACHED */
   return -1;
 }
@@ -2877 +2882 @@
 /* Handle a subentry for a file with no __.SYMDEF. */
 
-void process_subentry (desc, subentry, entry, prev_addr)
+void
+process_subentry (desc, subentry, entry, prev_addr)
      int desc;
      register struct file_entry *subentry;
@@ -3051 +3057 @@
 {
   register int i;
-  int setv_fill_count = 0;
+  int setv_fill_count;
 
   if (trace_files)
@@ -3433 +3439 @@
   fprintf (outfile, "\nFiles:\n\n");
 
-  each_file (describe_file_sections, (int)outfile);
+  each_file (describe_file_sections, outfile);
 
   fprintf (outfile, "\nGlobal symbols:\n\n");
@@ -3451 +3457 @@
     }
 
-  each_file (list_file_locals, (int)outfile);
+  each_file (list_file_locals, outfile);
 }
 
@@ -3868 +3874 @@
   struct line_debug_entry *text_scan, *data_scan;
   int i;
-  char *errfmt, *file_name = NULL;
-  int line_number = -1;
+  char *errfmt, *file_name;
+  int line_number;
   int dont_allow_symbol_name;
 
@@ -4016 +4022 @@
     return;
 
-  each_file (do_file_warnings, (int)outfile);
+  each_file (do_file_warnings, outfile);
 
   if (list_unresolved_refs || list_multiple_defs)
@@ -4041 +4047 @@
 initialize_a_out_text_start ()
 {
-  int magic = 0;
+  int magic;
 
   switch (output_style)
@@ -5043 +5049 @@
         {
           char execname[512];
-          _execname((char *)&execname, sizeof(execname));
-          strcpy(_getname((char *)&execname), "ldstub.bin");
+          _execname(execname, sizeof (execname));
+          strcpy(_getname(execname), "ldstub.bin");
           /* Copy stub into file */
-          if (DosCopy((char *)&execname, touch_filename, 4))
+          if (DosCopy(execname, touch_filename, 4))
           {
             errno = EACCES;
@@ -5719 +5725 @@
 
 #ifdef EMX
-          if (symtype = symptr->defined != (N_IMP1 | N_EXT))
+          if ((symtype = symptr->defined) != (N_IMP1 | N_EXT))
 #endif
             symtype = symptr->defined & ~N_EXT;
@@ -5883 +5889 @@
   /* Write the local symbols defined by the various files.  */
 
-  each_file (write_file_syms, (int)&syms_written);
+  each_file (write_file_syms, &syms_written);
   file_close ();
 

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

@@ -6 +6 @@
 
 .TARGET := ld.exe
+.TKIND  := $(TOOLFMT)
 .TSRC   := $(wildcard src/ld/*.c)
+.TCF    := -DEMX
 .TLDF   := -liberty
 include mkexe.smak

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

@@ -2 +2 @@
 .MDESC  := EMX.DLL 'replacement' for statically linked programs
 
-# Build four kinds of library c_app: single-threaded, multi-threaded,
-# single-threaded profile and multi-threaded profile
+# Build two kinds of library: aout and aout-profile.
+# The OMF libraries will be derived from them.
 
-.TKIND  := aout st
+.TKIND  := aout
 .TARGET := c_app$A
 .TSRC.386 := $(addprefix 386/,crt2.s crt3.s emxio.s inp8.s inp16.s inp32.s \
@@ -14 +14 @@
 .TCF.src/lib/app/stdio.c := -D_NFILES=40
 .TCF.src/lib/app/iodata.c := -D_NFILES=40
-.INSDIR = lib/$(filter st mt,$(.TKIND))/
+.INSDIR = lib/
 .TKEEP  := 1
 include mklib.smak
 
-.TKIND  := aout mt
-.TKEEP  := 1
+.TKIND  := aout prof
+.TARGET := c_app_p$A
 include mklib.smak
-
-.TKIND  := aout st prof
-.TARGET := c_app_p$A
-.TKEEP  := 1
-include mklib.smak
-
-.TKIND  := aout mt prof
-include mklib.smak

trunk/src/emx/src/lib/emxload/emxloadl.c

@@ -8 +8 @@
 int _emxload_list_start (void)
 {
-  if (_osmode != OS2_MODE)
-    return -1;
   if (_emxload_do_connect (FALSE) != 0)
     return -1;
@@ -25 +23 @@
   answer ans;
 
-  if (_osmode != OS2_MODE || buf_size == 0)
+  if (buf_size == 0)
     return -1;
   if (_emxload_do_receive (&ans) != 0)

trunk/src/emx/src/lib/emxload/emxloadr.c

@@ -144 +144 @@
   int result;
 
-  if (_osmode != OS2_MODE)
-    return -1;
   switch (req_code)
     {

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

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

trunk/src/emx/src/lib/io/_imphand.c

@@ -8 +8 @@
 #include <emx/syscalls.h>
 
-int _fmode_bin;
+extern int _fmode_bin;
 
 int _imphandle (int handle)

trunk/src/emx/src/lib/io/access.c

@@ -8 +8 @@
 #include <emx/syscalls.h>
 
-int _access (const char *name, int mode)
+int access (const char *name, int mode)
 {
   int a, slash;

trunk/src/emx/src/lib/io/chmod.c

@@ -7 +7 @@
 #include <emx/syscalls.h>
 
-int _chmod (const char *name, int pmode)
+int chmod (const char *name, int pmode)
 {
   int attr, rc;

trunk/src/emx/src/lib/io/chsize.c

@@ -7 +7 @@
 #include <emx/syscalls.h>
 
-int _chsize (int handle, long length)
+int chsize (int handle, long length)
 {
   long n;

trunk/src/emx/src/lib/io/close.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 
-int _close (int handle)
+int close (int handle)
 {
   if (_fd_flags (handle) == NULL)

trunk/src/emx/src/lib/io/creat.c

@@ -4 +4 @@
 #include <fcntl.h>
 
-int _creat (const char *name, int pmode)
+int creat (const char *name, int pmode)
 {
   return _open (name, O_WRONLY|O_TRUNC|O_CREAT, pmode);

trunk/src/emx/src/lib/io/dup.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 
-int _dup (int handle)
+int dup (int handle)
 {
   int new, *pflags1, *pflags2, *pla1, *pla2;

trunk/src/emx/src/lib/io/dup2.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 
-int _dup2 (int handle1, int handle2)
+int dup2 (int handle1, int handle2)
 {
   int *pflags1, *pflags2, *pla1, *pla2;

trunk/src/emx/src/lib/io/eadread.c

@@ -66 +66 @@
 
   _ead_clear (ead);
-  if (_osmode != OS2_MODE)
-    {
-      if (path != NULL)
-        {
-          if (_access (path, 0) != 0)
-            return -1;
-        }
-      else
-        {
-          if (_tell (handle) == -1)
-            return -1;
-        }
-      return 0;
-    }
   gd.gea_alloc = sizeof (GEA2LIST);
   gd.gea_ptr = malloc (gd.gea_alloc);

trunk/src/emx/src/lib/io/eadwrite.c

@@ -51 +51 @@
 int _ead_write (_ead ead, const char *path, int handle, int flags)
 {
-  if (_osmode != OS2_MODE)
-    return 0;
   if (!(flags & _EAD_MERGE))
     {

trunk/src/emx/src/lib/io/eaget.c

@@ -26 +26 @@
   dst->size = 0;
   dst->value = NULL;
-  if (_osmode != OS2_MODE)
-    {
-      if (path != NULL)
-        {
-          if (_access (path, 0) != 0)
-            return -1;
-        }
-      else
-        {
-          if (_tell (handle) == -1)
-            return -1;
-        }
-      return 0;
-    }
   if (path != NULL)
     {

trunk/src/emx/src/lib/io/eaput.c

@@ -18 +18 @@
   int len, size;
 
-  if (_osmode != OS2_MODE)
-    return 0;
   len = strlen (name);
   size = sizeof (FEA2LIST) + len + src->size;

trunk/src/emx/src/lib/io/eof.c

@@ -5 +5 @@
 #include <emx/io.h>
 
-int _eof (int handle)
+int eof (int handle)
 {
   int *pflags;

trunk/src/emx/src/lib/io/fcloseal.c

@@ -4 +4 @@
 #include <emx/io.h>
 
-int _fcloseall (void)
+int fcloseall (void)
 {
   int i, n, start;

trunk/src/emx/src/lib/io/fcntl.c

@@ -60 +60 @@
 
 
-int _fcntl (int handle, int request, ...)
+int fcntl (int handle, int request, ...)
 {
   va_list va;

trunk/src/emx/src/lib/io/fdopen.c

@@ -12 +12 @@
 /* Bug: doesn't check for compatible modes (O_ACCMODE) */
 
-FILE *_fdopen (int handle, const char *mode)
+FILE *fdopen (int handle, const char *mode)
 {
   char ok, bt;

trunk/src/emx/src/lib/io/fgetchar.c

@@ -3 +3 @@
 #include <stdio.h>
 
-int _fgetchar (void)
+int fgetchar (void)
 {
   return getchar ();

trunk/src/emx/src/lib/io/fileleng.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-long _filelength (int handle)
+long filelength (int handle)
 {
   long cur, n;

trunk/src/emx/src/lib/io/flock.c

@@ -5 +5 @@
 #include <emx/io.h>
 
-int _flock (int handle, int operation)
+int flock (int handle, int operation)
 {
   if (_fd_flags (handle) == NULL)

trunk/src/emx/src/lib/io/flushall.c

@@ -5 +5 @@
 #include <sys/rmutex.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <emx/io.h>
 
-int _flushall (void)
+int flushall (void)
 {
   int i, n;

trunk/src/emx/src/lib/io/fputchar.c

@@ -3 +3 @@
 #include <stdio.h>
 
-int _fputchar (int c)
+int fputchar (int c)
 {
   return putchar (c);

trunk/src/emx/src/lib/io/fstat.c

@@ -8 +8 @@
 #include <emx/syscalls.h>
 
-int _fstat (int handle, struct stat *buffer)
+int fstat (int handle, struct stat *buffer)
 {
   int rc;

trunk/src/emx/src/lib/io/fsync.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-int _fsync (int handle)
+int fsync (int handle)
 {
   return __fsync (handle);

trunk/src/emx/src/lib/io/ftruncat.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 
-int _ftruncate (int handle, long length)
+int ftruncate (int handle, long length)
 {
   int *pflags;

trunk/src/emx/src/lib/io/getw.c

@@ -3 +3 @@
 #include <stdio.h>
 
-int _getw (FILE *stream)
+int getw (FILE *stream)
 {
   int x;

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

@@ -1 +1 @@
 libc.TSRC += $(wildcard src/lib/io/*.c)
+
+# Build some object files separately (not included in libraries)
+.MODULE :=
+.TKIND  := aout
+.TSRC.386 := src/lib/io/386/binmode.s
+.TSRC   := $(.TSRC.$(CPU))
+include common.smak
+
+.OBJS += $(patsubst %.o,%.obj,$(subst /aout/,/omf/,$(.OBJS)))
+.DIRS := $(sort $(dir $(.OBJS)))
+TARGDIRS += $(.DIRS)
+
+DO.INSTALL += $(call CP,$(.OBJS) $(INS)lib/)$(NL)
+
+libc: $(.DIRS) $(.OBJS)
+
+include comend.smak

trunk/src/emx/src/lib/io/ioctl.c

@@ -14 +14 @@
 #define FIONBIO         0x667e
 
-int _ioctl (int handle, int request, ...)
+int ioctl (int handle, int request, ...)
 {
   va_list va;

trunk/src/emx/src/lib/io/isatty.c

@@ -5 +5 @@
 #include <emx/io.h>
 
-int _isatty (int handle)
+int isatty (int handle)
 {
   int *pflags;

trunk/src/emx/src/lib/io/lseek.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 
-long _lseek (int handle, long offset, int origin)
+long lseek (int handle, long offset, int origin)
 {
   int *pflags, *pla;

trunk/src/emx/src/lib/io/mkstemp.c

@@ -7 +7 @@
 #include <errno.h>
 
-int _mkstemp (char *string)
+int mkstemp (char *string)
 {
   int fd, pid, n;

trunk/src/emx/src/lib/io/mktemp.c

@@ -6 +6 @@
 #include <errno.h>
 
-char *_mktemp (char *string)
+char *mktemp (char *string)
 {
   int pid, n, saved_errno;
   char *s;
 
-  pid = _getpid ();
+  pid = getpid ();
   s = strchr (string, 0);
   n = 0;

trunk/src/emx/src/lib/io/open.c

@@ -6 +6 @@
 #include <emx/io.h>
 
-int _open (const char *name, int oflag, ...)
+int open (const char *name, int oflag, ...)
 {
   va_list va;

trunk/src/emx/src/lib/io/pclose.c

@@ -6 +6 @@
 #include <emx/io.h>
 
-int _pclose (FILE *stream)
+int pclose (FILE *stream)
 {
   int rc, write_mode;

trunk/src/emx/src/lib/io/pipe.c

@@ -7 +7 @@
 #include <emx/syscalls.h>
 
-int _fmode_bin;
+extern int _fmode_bin;
 int _pipe_size;
 
-int _pipe (int *two_handles)
+int pipe (int *two_handles)
 {
   int *pflags1, *pflags2;

trunk/src/emx/src/lib/io/popen.c

@@ -82 +82 @@
 
 
-FILE *_popen (const char *command, const char *mode)
+FILE *popen (const char *command, const char *mode)
 {
   int ph[2];

trunk/src/emx/src/lib/io/putw.c

@@ -3 +3 @@
 #include <stdio.h>
 
-int _putw (int x, FILE *stream)
+int putw (int x, FILE *stream)
 {
   return (fwrite (&x, sizeof (x), 1, stream) == 1 ? x : EOF);

trunk/src/emx/src/lib/io/read.c

@@ -37 +37 @@
 
 
-int _read (int handle, void *buf, size_t nbyte)
+int read (int handle, void *buf, size_t nbyte)
 {
   int n, *pflags, *pla;

trunk/src/emx/src/lib/io/readv.c

@@ -10 +10 @@
 #include <sys/uio.h>
 
-int _readv (int handle, const struct iovec *iov, int iovcnt)
+int readv (int handle, const struct iovec *iov, int iovcnt)
 {
   int i, n;

trunk/src/emx/src/lib/io/select.c

@@ -12 +12 @@
 #define MIN(a,b) (((a) < (b)) ? (a) : (b))
 
-int _select (int nfds, fd_set *readfds, fd_set *writefds,
+int select (int nfds, fd_set *readfds, fd_set *writefds,
              fd_set *exceptfds, struct timeval *timeout)
 {

trunk/src/emx/src/lib/io/setbuffe.c

@@ -3 +3 @@
 #include <stdio.h>
 
-int _setbuffer (FILE *stream, char *buffer, size_t size)
+int setbuffer (FILE *stream, char *buffer, size_t size)
 {
   return setvbuf (stream, buffer, (buffer != NULL ? _IOFBF : _IONBF), size);

trunk/src/emx/src/lib/io/setmode.c

@@ -6 +6 @@
 #include <emx/io.h>
 
-int _setmode (int handle, int mode)
+int setmode (int handle, int mode)
 {
   int old_mode, *pflags;

trunk/src/emx/src/lib/io/snprintf.c

@@ -6 +6 @@
 #include <emx/io.h>
 
-int _snprintf (char *buffer, size_t n, const char *format, ...)
+int snprintf (char *buffer, size_t n, const char *format, ...)
 {
   va_list arg_ptr;

trunk/src/emx/src/lib/io/sopen.c

@@ -5 +5 @@
 #include <emx/io.h>
 
-int _sopen (const char *name, int oflag, int shflag, ...)
+int sopen (const char *name, int oflag, int shflag, ...)
 {
   va_list va;

trunk/src/emx/src/lib/io/stat.c

@@ -13 +13 @@
 #include <emx/syscalls.h>
 
-int _stat (const char *name, struct stat *buffer)
+int stat (const char *name, struct stat *buffer)
 {
   int rc, slash;

trunk/src/emx/src/lib/io/tell.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 
-long _tell (int handle)
+long tell (int handle)
 {
   int *pflags, *pla;

trunk/src/emx/src/lib/io/truncate.c

@@ -4 +4 @@
 #include <fcntl.h>
 
-int _truncate (char *name, long length)
+int truncate (char *name, long length)
 {
   int handle, result;
 
-  handle = _open (name, O_RDWR);
+  handle = open (name, O_RDWR);
   if (handle == -1)
     return -1;
   result = _ftruncate (handle, length);
-  _close (handle);
+  close (handle);
   return result;
 }

trunk/src/emx/src/lib/io/ttyname.c

@@ -5 +5 @@
 #include <emx/thread.h>
 
-char *_ttyname (int handle)
+char *ttyname (int handle)
 {
 #if defined (__MT__)

trunk/src/emx/src/lib/io/umask.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-int _umask (int pmode)
+int umask (int pmode)
 {
   return __umask (pmode);

trunk/src/emx/src/lib/io/unlink.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-int _unlink (const char *name)
+int unlink (const char *name)
 {
   return __remove (name);       /* There are no links */

trunk/src/emx/src/lib/io/utime.c

@@ -7 +7 @@
 #include <emx/syscalls.h>
 
-int _utime (const char *name, const struct utimbuf *times)
+int utime (const char *name, const struct utimbuf *times)
 {
   struct timeval tv[2];

trunk/src/emx/src/lib/io/utimes.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 
-int _utimes (const char *name, const struct timeval *tvp)
+int utimes (const char *name, const struct timeval *tvp)
 {
   struct timeval tv[2];

trunk/src/emx/src/lib/io/vsnprint.c

@@ -5 +5 @@
 #include <emx/io.h>
 
-int _vsnprintf (char *buffer, size_t n, const char *format, va_list arg_ptr)
+int vsnprintf (char *buffer, size_t n, const char *format, va_list arg_ptr)
 {
   FILE trick;

trunk/src/emx/src/lib/io/vsscanf.c

@@ -3 +3 @@
 #include <stdio.h>
 #include <stdarg.h>
+#include <string.h>
 #include <limits.h>
 #include <emx/io.h>

trunk/src/emx/src/lib/io/write.c

@@ -137 +137 @@
 
 
-int _write (int handle, const void *buf, size_t nbyte)
+int write (int handle, const void *buf, size_t nbyte)
 {
   int n, *pflags;

trunk/src/emx/src/lib/io/writev.c

@@ -10 +10 @@
 #include <sys/uio.h>
 
-int _writev (int handle, const struct iovec *iov, int iovcnt)
+int writev (int handle, const struct iovec *iov, int iovcnt)
 {
   int i, n;

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

@@ -3 +3 @@
 # Utility function used in second-level submakefiles
 # Creates four versions of object file name for all kinds of outputs.
-.MVER = $(foreach x,aout-st aout-mt aout-st-prof aout-mt-prof,$.$x/src/lib/$1)
+.MVER = $(foreach x,aout aout-prof,$.$x/src/lib/$1)
 
 # First of all, include all second-level libc submakefiles
@@ -14 +14 @@
 .MDESC  := The C library
 
-.TKIND  := aout st
+.TKIND  := aout
 .TARGET := c$A
 .TSRC   := $(libc.TSRC.$(CPU)) $(libc.TSRC)
-.TDEP   := $(libc.TDEP)
-.INSDIR = lib/$(filter st mt,$(.TKIND))/
+.TDEP   := $(libc.TDEP.$(CPU)) $(libc.TDEP)
+.INSDIR = lib/
 .TKEEP  := 1
 include mklib.smak
 
-.TKIND  := aout mt
-.TKEEP  := 1
-include mklib.smak
-
-.TKIND  := aout st prof
+.TKIND  := aout prof
 .TARGET := c_p$A
-.TKEEP  := 1
-include mklib.smak
-
-.TKIND  := aout mt prof
 include mklib.smak
 
@@ -38 +30 @@
 libc.TSRC.$(CPU) :=
 libc.TSRC :=
+libc.TDEP.$(CPU) :=
 libc.TDEP :=

trunk/src/emx/src/lib/math/math.smak

@@ -1 +1 @@
 libc.TSRC.386 += $(wildcard src/lib/math/386/*.s)
 libc.TSRC += $(wildcard src/lib/math/*.c)
+
+# Virtual targets, e.g. compiled from same input files but with different opts
+libc.TDEP.386 += $(addprefix @O@src/lib/math/386/, copysigf.o copysigl.o \
+  fpclassf.o fpclassl.o isfinf.o isfinl.o isnanf.o isnanl.o isnormf.o \
+  isnorml.o nextaftf.o nextaftl.o signbitf.o signbitl.o acosl.o asinl.o \
+  atanl.o atan2l.o ceill.o cosl.o coshl.o expl.o fabsl.o floorl.o fmodl.o \
+  frexpl.o fxaml.o hypotl.o ldexpl.o logl.o log10l.o modfl.o powl.o rintl.o \
+  sinl.o sinhl.o sqrtl.o tanl.o tanhl.o truncl.o)
+
+$(call .MVER,math/%f.o): src/lib/math/%.s
+        $(call DO.COMPILE.s, -DFLOAT)
+$(call .MVER,math/%l.o): src/lib/math/%.s
+        $(call DO.COMPILE.s, -DLONG_DOUBLE)

trunk/src/emx/src/lib/misc/386/int86.s

@@ -27 +27 @@
         movl    5*4(%ebx), %edi
         movl    1*4(%ebx), %ebx
-        call    (%esp)                  /* "call %esp" is undefined */
+        call    *(%esp)                 /* "call %esp" is undefined */
         movl    %ebx, 1*4(%esp)
         movl    9*4(%esp), %ebx         /* out_regs */

trunk/src/emx/src/lib/misc/386/setjmp.s

@@ -30 +30 @@
         movl    0*4(%esp), %eax         /* return address */
         movl    %eax, J_EIP(%edx)
-        cmpb    $0, __osmode            /* OS/2? */
-        je      1f                      /* No -> skip */
         fs
         movl    0, %eax                 /* Exception handler */
         movl    %eax, J_XCP(%edx)
-1:      xorl    %eax, %eax
+        xorl    %eax, %eax
         EPILOGUE(setjmp)
 
@@ -44 +42 @@
 _longjmp:
         PROFILE_NOFRAME
-        cmpb    $0, __osmode            /* OS/2? */
-        je      2f                      /* No -> skip */
         movl    1*4(%esp), %eax         /* there */
         pushl   J_XCP(%eax)
         call    ___unwind2              /* unwind signal handlers */
         addl    $4, %esp
-2:      movl    1*4(%esp), %edx         /* there */
+        movl    1*4(%esp), %edx         /* there */
         movl    2*4(%esp), %eax         /* n */
         testl   %eax, %eax

trunk/src/emx/src/lib/misc/386/sigsetjm.s

@@ -32 +32 @@
         movl    0*4(%esp), %eax         /* return address */
         movl    %eax, J_EIP(%edx)
-        cmpb    $0, __osmode            /* OS/2? */
-        je      1f                      /* No -> skip */
         fs
         movl    0, %eax                 /* Exception handler */
         movl    %eax, J_XCP(%edx)
-1:      movl    2*4(%esp), %eax         /* savemask */
+        movl    2*4(%esp), %eax         /* savemask */
         movl    %eax, J_SAVE(%edx)
         testl   %eax, %eax
-        je      2f
+        je      1f
         leal    J_MASK(%edx), %eax
         pushl   %eax                    /* oset */
@@ -47 +45 @@
         call    __sigprocmask
         addl    $12, %esp
-2:      xorl    %eax, %eax
+1:      xorl    %eax, %eax
         EPILOGUE(_sigsetjmp)
 
@@ -65 +63 @@
         call    __sigprocmask
         addl    $12, %esp
-1:      cmpb    $0, __osmode            /* OS/2? */
-        je      2f                      /* No -> skip */
-        movl    1*4(%esp), %eax         /* there */
+1:      movl    1*4(%esp), %eax         /* there */
         pushl   J_XCP(%eax)
         call    ___unwind2              /* unwind signal handlers */
         addl    $4, %esp
-2:      movl    1*4(%esp), %edx         /* there */
+        movl    1*4(%esp), %edx         /* there */
         movl    2*4(%esp), %eax         /* n */
         testl   %eax, %eax
-        jne     3f
+        jne     2f
         incl    %eax
-3:      movl    J_EBX(%edx), %ebx
+2:      movl    J_EBX(%edx), %ebx
         movl    J_ESI(%edx), %esi
         movl    J_EDI(%edx), %edi

trunk/src/emx/src/lib/misc/abort.c

@@ -15 +15 @@
      and SIGABRT is not blocked: do not yet call _cleanup(). */
 
-  if (_sigaction (SIGABRT, NULL, &act) == 0
+  if (sigaction (SIGABRT, NULL, &act) == 0
       && act.sa_handler != SIG_IGN && act.sa_handler != SIG_DFL
-      && _sigemptyset (&set) == 0
-      && _sigprocmask (SIG_SETMASK, NULL, &set) == 0
-      && _sigismember (&set, SIGABRT) == 0)
+      && sigemptyset (&set) == 0
+      && sigprocmask (SIG_SETMASK, NULL, &set) == 0
+      && sigismember (&set, SIGABRT) == 0)
     {
       /* Raise SIGABRT.  Note that this is not guaranteed to terminate
@@ -30 +30 @@
 
   act.sa_handler = SIG_DFL;
-  _sigemptyset (&act.sa_mask);
+  sigemptyset (&act.sa_mask);
   act.sa_flags = 0;
-  _sigaction (SIGABRT, &act, NULL);
+  sigaction (SIGABRT, &act, NULL);
 
   /* Clean up the C library only once. */
@@ -41 +41 @@
   /* Unblock SIGABRT. */
 
-  _sigemptyset (&set);
-  _sigaddset (&set, SIGABRT);
-  _sigprocmask (SIG_UNBLOCK, &set, NULL);
+  sigemptyset (&set);
+  sigaddset (&set, SIGABRT);
+  sigprocmask (SIG_UNBLOCK, &set, NULL);
 
   /* Raise SIGABRT again. */
@@ -51 +51 @@
   /* This should not get reached. */
 
-  _exit (3);
+  exit (3);
 }

trunk/src/emx/src/lib/misc/alarm.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-unsigned _alarm (unsigned sec)
+unsigned alarm (unsigned sec)
 {
   return __alarm (sec);

trunk/src/emx/src/lib/misc/brk.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-void *_brk (void *addr)
+void *brk (void *addr)
 {
   return __brk (addr);

trunk/src/emx/src/lib/misc/chdir.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 
-int _chdir (const char *name)
+int chdir (const char *name)
 {
   size_t len;

trunk/src/emx/src/lib/misc/cuserid.c

@@ -5 +5 @@
 #include <string.h>
 
-char *_cuserid (char *buffer)
+char *cuserid (char *buffer)
 {
   static char tmp_name[L_cuserid];

trunk/src/emx/src/lib/misc/dirent.c

@@ -37 +37 @@
     const char *base);
 
-int _closedir (DIR *dirp)
+int closedir (DIR *dirp)
 {
   free_dircontents (dirp->dd_contents);
@@ -45 +45 @@
 
 
-struct dirent *_readdir (DIR *dirp)
+struct dirent *readdir (DIR *dirp)
 {
   if (dirp->dd_cp == NULL)
@@ -65 +65 @@
 
 
-void _seekdir (DIR *dirp, long off)
+void seekdir (DIR *dirp, long off)
 {
   long i;
@@ -83 +83 @@
 
 
-void _rewinddir (DIR *dirp)
+void rewinddir (DIR *dirp)
 {
   _seekdir (dirp, 0L);
@@ -89 +89 @@
 
 
-long _telldir (DIR *dirp)
+long telldir (DIR *dirp)
 {
   return dirp->dd_loc;
@@ -95 +95 @@
 
 
-DIR *_opendir (const char *name)
+DIR *opendir (const char *name)
 {
   struct stat statb;

trunk/src/emx/src/lib/misc/dtread.c

@@ -170 +170 @@
   data.dir_pass = 1;
   if (strcmp (mask, "*.*") == 0
-      || (_osmode == OS2_MODE && strcmp (mask, "*") == 0))
+      || (strcmp (mask, "*") == 0))
     data.dir_pass = 0;
   data.attr = A_HIDDEN | A_SYSTEM;

trunk/src/emx/src/lib/misc/fnmatch.c

@@ -3 +3 @@
 #include <string.h>
 #include <ctype.h>
-#include <fnmatch.h>
+#include <emx/fnmatch.h>
 #include <sys/nls.h>
 
@@ -592 +592 @@
 /* This is the public entrypoint, with signed arguments. */
 
-int _fnmatch (const char *mask, const char *name, int flags)
+int fnmatch (const char *mask, const char *name, int flags)
 {
   return _fnmatch_unsigned (mask, name, flags);

trunk/src/emx/src/lib/misc/fpathcon.c

@@ -7 +7 @@
 /* Return the POSIX.1  minimum values, for now. */
 
-long _fpathconf (int handle, int name)
+long fpathconf (int handle, int name)
 {
   switch (name)

trunk/src/emx/src/lib/misc/ftw.c

@@ -66 +66 @@
 
 
-int _ftw (const char *path,
-          int (*fn)(const char *name, const struct stat *stat_ptr, int flag),
-          int depth)
+int ftw (const char *path,
+         int (*fn)(const char *name, const struct stat *stat_ptr, int flag),
+         int depth)
 {
   struct stat st;

trunk/src/emx/src/lib/misc/getcwd.c

@@ -7 +7 @@
 #include <emx/syscalls.h>
 
-char *_getcwd (char *buffer, size_t size)
+char *getcwd (char *buffer, size_t size)
 {
   char tmp[MAXPATHLEN+1];

trunk/src/emx/src/lib/misc/getegid.c

@@ -4 +4 @@
 #include <sys/types.h>
 
-gid_t _getegid (void)
+gid_t getegid (void)
 {
   return 0;

trunk/src/emx/src/lib/misc/geteuid.c

@@ -4 +4 @@
 #include <sys/types.h>
 
-uid_t _geteuid (void)
+uid_t geteuid (void)
 {
   return 0;

trunk/src/emx/src/lib/misc/getgid.c

@@ -4 +4 @@
 #include <sys/types.h>
 
-gid_t _getgid (void)
+gid_t getgid (void)
 {
   return 0;

trunk/src/emx/src/lib/misc/getgrgid.c

@@ -7 +7 @@
 /* Dummy function */
 
-struct group *_getgrgid (gid_t gid)
+struct group *getgrgid (gid_t gid)
 {
   static struct group tmp_grp;

trunk/src/emx/src/lib/misc/getgrnam.c

@@ -7 +7 @@
 /* Dummy function */
 
-struct group *_getgrnam (const char *name)
+struct group *getgrnam (const char *name)
 {
   static struct group tmp_grp;

trunk/src/emx/src/lib/misc/getgroup.c

@@ -4 +4 @@
 #include <sys/types.h>
 
-int _getgroups (int gidsetsize, gid_t grouplist [])
+int getgroups (int gidsetsize, gid_t grouplist [])
 {
   return 0;

trunk/src/emx/src/lib/misc/getlogin.c

@@ -6 +6 @@
 #include <unistd.h>
 
-char *_getlogin (void)
+char *getlogin (void)
 {
   static char tmp_name[L_cuserid];

trunk/src/emx/src/lib/misc/getopt.c

@@ -34 +34 @@
 /* Note: `argv' is not const as GETOPT_ANY reorders argv[]. */
 
-int _getopt (int argc, char * argv[], const char *opt_str)
+int getopt (int argc, char * argv[], const char *opt_str)
 {
   char c, *q;

trunk/src/emx/src/lib/misc/getpages.c

@@ -3 +3 @@
 #include <stdlib.h>
 
-int _getpagesize (void)
+int getpagesize (void)
 {
   return 4096;

trunk/src/emx/src/lib/misc/getpass.c

@@ -3 +3 @@
 #include <unistd.h>
 
-char *_getpass (const char *prompt)
+char *getpass (const char *prompt)
 {
   return _getpass2 (prompt, 1);

trunk/src/emx/src/lib/misc/getpgrp.c

@@ -5 +5 @@
 #include <sys/types.h>
 
-pid_t _getpgrp (void)
+pid_t getpgrp (void)
 {
-  return _getpid ();
+  return getpid ();
 }

trunk/src/emx/src/lib/misc/getpwnam.c

@@ -9 +9 @@
 /* Dummy function */
 
-struct passwd *_getpwnam (const char *name)
+struct passwd *getpwnam (const char *name)
 {
   if (name == NULL)

trunk/src/emx/src/lib/misc/getpwuid.c

@@ -8 +8 @@
 /* Dummy function */
 
-struct passwd *_getpwuid (uid_t uid)
+struct passwd *getpwuid (uid_t uid)
 {
   return _getpw (uid, NULL);

trunk/src/emx/src/lib/misc/getuid.c

@@ -4 +4 @@
 #include <sys/types.h>
 
-uid_t _getuid (void)
+uid_t getuid (void)
 {
   return 0;

trunk/src/emx/src/lib/misc/getvol.c

@@ -25 +25 @@
     return NULL;
 
-  if (_osmode == OS2_MODE)
-    {
-      ULONG rc;
-      FSINFO fsinfo;
+  ULONG rc;
+  FSINFO fsinfo;
 
-      memset (&fsinfo, 0, sizeof (fsinfo));
-      rc = DosQueryFSInfo (drive - 'A' + 1, FSIL_VOLSER, &fsinfo,
-                           sizeof (fsinfo));
-      if (rc != 0)
-        return NULL;
-      strcpy (result, fsinfo.vol.szVolLabel);
-    }
-  else
-    {
-      static struct _find find;
-      char mask[7];
+  memset (&fsinfo, 0, sizeof (fsinfo));
+  rc = DosQueryFSInfo (drive - 'A' + 1, FSIL_VOLSER, &fsinfo,
+                       sizeof (fsinfo));
+  if (rc != 0)
+    return NULL;
+  strcpy (result, fsinfo.vol.szVolLabel);
 
-      mask[0] = drive;
-      strcpy (mask + 1, ":\\*.*");
-      if (__findfirst (mask, _A_VOLID, &find) != 0)
-        return NULL;
-      strcpy (result, find.name);
-    }
   return result;
 }

trunk/src/emx/src/lib/misc/getwd.c

@@ -7 +7 @@
 #include <emx/syscalls.h>
 
-char *_getwd (char *buffer)
+char *getwd (char *buffer)
 {
   if (buffer == NULL)

trunk/src/emx/src/lib/misc/glob.c

@@ -5 +5 @@
 #include <errno.h>
 #include <unistd.h>
-#include <fnmatch.h>
+#include <alloca.h>
+#include <emx/fnmatch.h>
 #include <glob.h>
 #include <sys/types.h>
@@ -115 +116 @@
   /* TODO: Optimize for lpat not containing global characters. */
 
-  dir = _opendir (*base != 0 ? base : ".");
+  dir = opendir (*base != 0 ? base : ".");
   if (dir == NULL)
     {
@@ -124 +125 @@
       return 0;
     }
-  while ((ent = _readdir (dir)) != NULL)
-    {
-      if (_fnmatch (lpat, ent->d_name, fnm_flags) == 0)
+  while ((ent = readdir (dir)) != NULL)
+    {
+      if (fnmatch (lpat, ent->d_name, fnm_flags) == 0)
         {
           len = base_len + ent->d_namlen;
@@ -145 +146 @@
               if (!glob_add (pg, path))
                 {
-                  _closedir (dir);
+                  closedir (dir);
                   return GLOB_NOSPACE;
                 }
@@ -158 +159 @@
               if (r != 0)
                 {
-                  _closedir (dir);
+                  closedir (dir);
                   return r;
                 }
@@ -164 +165 @@
         }
     }
-  _closedir (dir);
+  closedir (dir);
   return 0;
 }
@@ -175 +176 @@
 
 
-int _glob (const char *pattern, int flags,
-           int (*errfun)(const char *e_path, int e_errno), glob_t *pglob)
+int glob (const char *pattern, int flags,
+          int (*errfun)(const char *e_path, int e_errno), glob_t *pglob)
 {
   struct globi g;

trunk/src/emx/src/lib/misc/mkdir.c

@@ -5 +5 @@
 #include <emx/syscalls.h>
 
-int _mkdir (const char *name, long mode)
+int mkdir (const char *name, long mode)
 {
-  mode = 0;                     /* Keep the compiler happy */
+  (void)mode;                     /* Keep the compiler happy */
   if (__mkdir (name) == 0)
     return 0;

trunk/src/emx/src/lib/misc/os2bad.c

@@ -9 +9 @@
 {
   __write (2, msg, sizeof (msg) - 1);
-  _exit (2);
+  exit (2);
 }

trunk/src/emx/src/lib/misc/pathconf.c

@@ -7 +7 @@
 /* Return the POSIX.1  minimum values, for now. */
 
-long _pathconf (const char *path, int name)
+long pathconf (const char *path, int name)
 {
   switch (name)

trunk/src/emx/src/lib/misc/perror.c

@@ -14 +14 @@
     }
   if (e >= 0 && e < _sys_nerr)
-    fputs (_sys_errlist[e], stderr);
+    fputs (sys_errlist[e], stderr);
   else
     fprintf (stderr, "Unknown error %d", e);

trunk/src/emx/src/lib/misc/pwd.c

@@ -58 +58 @@
 
 
-struct passwd *_getpwent (void)
+struct passwd *getpwent (void)
 {
   return NULL;                  /* End of /etc/passwd reached */
@@ -64 +64 @@
 
 
-void _setpwent (void)
+void setpwent (void)
 {
 }
 
 
-void _endpwent (void)
+void endpwent (void)
 {
 }

trunk/src/emx/src/lib/misc/rmdir.c

@@ -5 +5 @@
 #include <emx/syscalls.h>
 
-int _rmdir (const char *name)
+int rmdir (const char *name)
 {
   if (__rmdir (name) == 0)

trunk/src/emx/src/lib/misc/sbrk.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-void *_sbrk (int incr)
+void *sbrk (int incr)
 {
   return __sbrk (incr);

trunk/src/emx/src/lib/misc/scrsize.c

@@ -3 +3 @@
 #include <emx/syscalls.h>
 
-void _scrsize (int *dst)
+void scrsize (int *dst)
 {
   __scrsize (dst);

trunk/src/emx/src/lib/misc/searchen.c

@@ -12 +12 @@
   
   strcpy (path, file);
-  if (_access (path, 4) == 0)
+  if (access (path, 4) == 0)
     return;
   list = getenv (var);
@@ -30 +30 @@
               path[i++] = '\\';
             strcpy (path+i, file);
-            if (_access (path, 4) == 0)
+            if (access (path, 4) == 0)
               return;
           }

trunk/src/emx/src/lib/misc/setgid.c

@@ -5 +5 @@
 #include <sys/types.h>
 
-int _setgid (gid_t gid)
+int setgid (gid_t gid)
 {
   if (gid != 0)

trunk/src/emx/src/lib/misc/setpgid.c

@@ -5 +5 @@
 #include <sys/types.h>
 
-int _setpgid (pid_t pid, pid_t pgid)
+int setpgid (pid_t pid, pid_t pgid)
 {
   errno = ENOSYS;

trunk/src/emx/src/lib/misc/setsid.c

@@ -5 +5 @@
 #include <sys/types.h>
 
-pid_t _setsid (void)
+pid_t setsid (void)
 {
   errno = EPERM;

trunk/src/emx/src/lib/misc/setuid.c

@@ -5 +5 @@
 #include <sys/types.h>
 
-int _setuid (uid_t uid)
+int setuid (uid_t uid)
 {
   if (uid != 0)

trunk/src/emx/src/lib/misc/sleep.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-unsigned _sleep (unsigned sec)
+unsigned sleep (unsigned sec)
 {
   return __sleep (sec);

trunk/src/emx/src/lib/misc/sleep2.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-unsigned _sleep2 (unsigned millisec)
+unsigned sleep2 (unsigned millisec)
 {
   return __sleep2 (millisec);

trunk/src/emx/src/lib/misc/sysconf.c

@@ -8 +8 @@
 /* Return the POSIX.1  minimum values, for now. */
 
-long _sysconf (int name)
+long sysconf (int name)
 {
   switch (name)

trunk/src/emx/src/lib/misc/syserr.c

@@ -1 +1 @@
 /* syserr.c (emx+gcc) -- Copyright (c) 1990-1998 by Eberhard Mattes */
 
-const char * const _sys_errlist[] =
+const char * const sys_errlist[] =
 {
   /*  0 EZERO          */ "Error 0",
@@ -72 +72 @@
 };
 
-const int _sys_nerr = sizeof (_sys_errlist) / sizeof (_sys_errlist[0]);
+const int sys_nerr = sizeof (sys_errlist) / sizeof (sys_errlist[0]);

trunk/src/emx/src/lib/misc/syserrno.c

@@ -3 +3 @@
 #include <emx/syscalls.h>
 
-int _syserrno (void)
+int syserrno (void)
 {
   return __syserrno ();

trunk/src/emx/src/lib/misc/uflags.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 
-int _uflags (int mask, int new_bits)
+int uflags (int mask, int new_bits)
 {
   return __uflags (mask, new_bits);

trunk/src/emx/src/lib/misc/ulimit.c

@@ -7 +7 @@
 #include <emx/syscalls.h>
 
-long _ulimit (int cmd, ...)
+long ulimit (int cmd, ...)
 {
   va_list arg_ptr;

trunk/src/emx/src/lib/misc/uname.c

@@ -9 +9 @@
 #define CHR(x)       (char)((x)+'0')
 
-int _uname (struct utsname *name)
+int uname (struct utsname *name)
 {
   char *host;
-  int dos;
 
-  dos = (_osmode == DOS_MODE && _osmajor < 10);
   host = getenv ("HOSTNAME");
   if (host == NULL)
     host = "standalone";
 
-  SET (sysname, (dos ? "MS-DOS" : "OS/2"));
+  SET (sysname, ("OS/2"));
   SET (nodename, host);
   SET (release, "1");
-  name->version[0] = (dos ? CHR (_osmajor) : CHR (_osmajor / 10));
+  name->version[0] = (CHR (_osmajor / 10));
   name->version[1] = '.';
   name->version[2] = CHR (_osminor / 10);

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

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

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

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

trunk/src/emx/src/lib/process/386/_errno.s

@@ -14 +14 @@
 __errno:
 __errno_fun:
-        cmpb    $0, __osmode            /* _osmode == DOS_MODE? */
-        je      1f                      /* Yes -> */
         fs
         movl    12, %eax                /* ptib2 */
@@ -21 +19 @@
         movl    __thread_tab(,%eax,4), %eax
 /       addl    $0, %eax                /* address of errno */
-Lreturn:EPILOGUE(_errno)
-
-        ALIGN
-
-1:      movl    __thread_tab+4, %eax
-/       addl    $0, %eax                /* address of errno */
-        jmp     Lreturn
+        EPILOGUE(_errno)
 
 #else

trunk/src/emx/src/lib/process/386/gettid.s

@@ -10 +10 @@
 
 __gettid:
-        cmpb    $0, __osmode            /* _osmode == DOS_MODE? */
-        je      1f                      /* Yes -> */
         fs
         movl    12, %eax                /* ptib2 */
         movl    0(%eax), %eax           /* TID */
-Lreturn:EPILOGUE(_gettid)
-
-        ALIGN
-1:      movl    $1, %eax
-        jmp     Lreturn
+        EPILOGUE(_gettid)

trunk/src/emx/src/lib/process/386/thread.s

@@ -12 +12 @@
 
 __thread:
-        cmpb    $0, __osmode            /* _osmode == DOS_MODE? */
-        je      1f                      /* Yes -> */
         fs
         movl    12, %eax                /* ptib2 */
@@ -19 +17 @@
         movl    __thread_tab(,%edx,4), %eax
         testl   %eax, %eax
-        jz      2f
+        jz      1f
 Lreturn:EPILOGUE(_thread)
 
         ALIGN
-1:      movl    __thread_tab+4, %eax
-        jmp     Lreturn
-
-        ALIGN
-2:      pushl   %edx
+1:      pushl   %edx
         call    ___alloc_thread
         popl    %edx

trunk/src/emx/src/lib/process/execl.c

@@ -5 +5 @@
 #include <process.h>
 
-int _execl (const char *name, const char *arg0, ...)
+int execl (const char *name, const char *arg0, ...)
 {
   va_list arg_ptr;
@@ -14 +14 @@
   /* Note: Passing `arg_ptr' to spawnv() is not portable. */
 
-  result = _spawnv (P_OVERLAY, name, (char * const *)arg_ptr);
+  result = spawnv (P_OVERLAY, name, (char * const *)arg_ptr);
   va_end (arg_ptr);
   return result;

trunk/src/emx/src/lib/process/execle.c

@@ -5 +5 @@
 #include <process.h>
 
-int _execle (const char *name, const char *arg0, ...)
+int execle (const char *name, const char *arg0, ...)
 {
   va_list arg_ptr;
@@ -20 +20 @@
   /* Note: Passing `arg_ptr' to spawnve() is not portable. */
 
-  result = _spawnve (P_OVERLAY, name, (char * const *)arg_ptr, env_ptr);
+  result = spawnve (P_OVERLAY, name, (char * const *)arg_ptr, env_ptr);
   va_end (arg_ptr);
   return result;

trunk/src/emx/src/lib/process/execlp.c

@@ -5 +5 @@
 #include <process.h>
 
-int _execlp (const char *name, const char *arg0, ...)
+int execlp (const char *name, const char *arg0, ...)
 {
   va_list arg_ptr;
@@ -14 +14 @@
   /* Note: Passing `arg_ptr' to spawnvp() is not portable. */
 
-  result = _spawnvp (P_OVERLAY, name, (char * const *)arg_ptr);
+  result = spawnvp (P_OVERLAY, name, (char * const *)arg_ptr);
   va_end (arg_ptr);
   return result;

trunk/src/emx/src/lib/process/execlpe.c

@@ -5 +5 @@
 #include <process.h>
 
-int _execlpe (const char *name, const char *arg0, ...)
+int execlpe (const char *name, const char *arg0, ...)
 {
   va_list arg_ptr;
@@ -20 +20 @@
   /* Note: Passing `arg_ptr' to spawnvpe() is not portable. */
 
-  result = _spawnvpe (P_OVERLAY, name, (char * const *)arg_ptr, env_ptr);
+  result = spawnvpe (P_OVERLAY, name, (char * const *)arg_ptr, env_ptr);
   va_end (arg_ptr);
   return result;

trunk/src/emx/src/lib/process/execv.c

@@ -3 +3 @@
 #include <process.h>
 
-int _execv (const char *name, char * const argv[])
+int execv (const char *name, char * const argv[])
 {
-  return _spawnv (P_OVERLAY, name, argv);
+  return spawnv (P_OVERLAY, name, argv);
 }

trunk/src/emx/src/lib/process/execve.c

@@ -3 +3 @@
 #include <process.h>
 
-int _execve (const char *name, char * const argv[], char * const envp[])
+int execve (const char *name, char * const argv[], char * const envp[])
 {
-  return _spawnve (P_OVERLAY, name, argv, envp);
+  return spawnve (P_OVERLAY, name, argv, envp);
 }

trunk/src/emx/src/lib/process/execvp.c

@@ -3 +3 @@
 #include <process.h>
 
-int _execvp (const char *name, char * const argv[])
+int execvp (const char *name, char * const argv[])
 {
-  return _spawnvp (P_OVERLAY, name, argv);
+  return spawnvp (P_OVERLAY, name, argv);
 }

trunk/src/emx/src/lib/process/execvpe.c

@@ -3 +3 @@
 #include <process.h>
 
-int _execvpe (const char *name, char * const argv[], char * const envp[])
+int execvpe (const char *name, char * const argv[], char * const envp[])
 {
-  return _spawnvpe (P_OVERLAY, name, argv, envp);
+  return spawnvpe (P_OVERLAY, name, argv, envp);
 }

trunk/src/emx/src/lib/process/fmutex.c

@@ -16 +16 @@
 {
   sem->fs = _FMS_AVAILABLE;
-  if (_osmode == DOS_MODE)
-    return 0;
   return DosCreateEventSem (NULL, (PHEV)&sem->hev,
                             (flags & _FMC_SHARED) ? DC_SEM_SHARED : 0,
@@ -26 +24 @@
 unsigned _fmutex_open (_fmutex *sem)
 {
-  if (_osmode == DOS_MODE)
-    return 0;
   return DosOpenEventSem (NULL, (PHEV)&sem->hev);
 }
@@ -34 +30 @@
 unsigned _fmutex_close (_fmutex *sem)
 {
-  if (_osmode == DOS_MODE)
-    return 0;
   return DosCloseEventSem (sem->hev);
 }

trunk/src/emx/src/lib/process/fork.c

@@ -6 +6 @@
 extern void _rmutex_fork (void);
 
-int _fork (void)
+int fork (void)
 {
   int pid;

trunk/src/emx/src/lib/process/spawnl.c

@@ -5 +5 @@
 #include <process.h>
 
-int _spawnl (int mode, const char *name, const char *arg0, ...)
+int spawnl (int mode, const char *name, const char *arg0, ...)
 {
   va_list arg_ptr;
@@ -14 +14 @@
   /* Note: Passing `arg_ptr' to spawnv() is not portable. */
 
-  result = _spawnv (mode, name, (char * const *)arg_ptr);
+  result = spawnv (mode, name, (char * const *)arg_ptr);
   va_end (arg_ptr);
   return result;

trunk/src/emx/src/lib/process/spawnle.c

@@ -5 +5 @@
 #include <process.h>
 
-int _spawnle (int mode, const char *name, const char *arg0, ...)
+int spawnle (int mode, const char *name, const char *arg0, ...)
 {
   va_list arg_ptr;
@@ -20 +20 @@
   /* Note: Passing `arg_ptr' to spawnve() is not portable. */
 
-  result = _spawnve (mode, name, (char * const *)arg_ptr, env_ptr);
+  result = spawnve (mode, name, (char * const *)arg_ptr, env_ptr);
   va_end (arg_ptr);
   return result;

trunk/src/emx/src/lib/process/spawnlp.c

@@ -5 +5 @@
 #include <process.h>
 
-int _spawnlp (int mode, const char *name, const char *arg0, ...)
+int spawnlp (int mode, const char *name, const char *arg0, ...)
 {
   va_list arg_ptr;
@@ -14 +14 @@
   /* Note: Passing `arg_ptr' to spawnvp() is not portable. */
 
-  result = _spawnvp (mode, name, (char * const *)arg_ptr);
+  result = spawnvp (mode, name, (char * const *)arg_ptr);
   va_end (arg_ptr);
   return result;

trunk/src/emx/src/lib/process/spawnlpe.c

@@ -5 +5 @@
 #include <process.h>
 
-int _spawnlpe (int mode, const char *name, const char *arg0, ...)
+int spawnlpe (int mode, const char *name, const char *arg0, ...)
 {
   va_list arg_ptr;
@@ -20 +20 @@
   /* Note: Passing `arg_ptr' to spawnvpe() is not portable. */
 
-  result = _spawnvpe (mode, name, (char * const *)arg_ptr, env_ptr);
+  result = spawnvpe (mode, name, (char * const *)arg_ptr, env_ptr);
   va_end (arg_ptr);
   return result;

trunk/src/emx/src/lib/process/spawnv.c

@@ -4 +4 @@
 #include <process.h>
 
-int _spawnv (int mode, const char *name, char * const argv[])
+int spawnv (int mode, const char *name, char * const argv[])
 {
-  return _spawnve (mode, name, argv, NULL);
+  return spawnve (mode, name, argv, NULL);
 }

trunk/src/emx/src/lib/process/spawnvp.c

@@ -4 +4 @@
 #include <process.h>
 
-int _spawnvp (int mode, const char *name, char * const argv[])
+int spawnvp (int mode, const char *name, char * const argv[])
 {
-  return _spawnvpe (mode, name, argv, NULL);
+  return spawnvpe (mode, name, argv, NULL);
 }

trunk/src/emx/src/lib/process/spawnvpe.c

@@ -2 +2 @@
 
 #include <stdlib.h>
+#include <string.h>
 #include <process.h>
 #include <errno.h>
 
-int _spawnvpe (int mode, const char *name, char * const argv[],
-               char * const envp[])
+int spawnvpe (int mode, const char *name, char * const argv[],
+              char * const envp[])
 {
   char exe[512];
@@ -20 +21 @@
   if (_path (path, exe) != 0)
     return -1;
-  return _spawnve (mode, path, argv, envp);
+  return spawnve (mode, path, argv, envp);
 }

trunk/src/emx/src/lib/process/system.c

@@ -23 +23 @@
     return _access (sh, 0) == 0;
   if (*name == 0)
-    rc = _spawnlp (P_WAIT, sh, sh, (char *)0);
+    rc = spawnlp (P_WAIT, sh, sh, (char *)0);
   else
     {
       base = _getname (sh);
-      if (_stricmp (base, "cmd.exe") == 0 || _stricmp (base, "4os2.exe") == 0
-          || _stricmp (base, "command.com") == 0
-          || _stricmp (base, "4dos.com") == 0)
+      if (stricmp (base, "cmd.exe") == 0
+       || stricmp (base, "4os2.exe") == 0
+       || stricmp (base, "command.com") == 0
+       || stricmp (base, "4dos.com") == 0)
         opt = "/c";
       else
         opt = "-c";
-      rc = _spawnlp (P_WAIT, sh, sh, opt, name, (char *)0);
+      rc = spawnlp (P_WAIT, sh, sh, opt, name, (char *)0);
     }
   return rc;

trunk/src/emx/src/lib/startup/386/crt0.s

@@ -13 +13 @@
 __text:
         push    $__data
-#if defined (OMF)
         call    __emx_init
-#else
-        call    __dos_init
-#endif
         jmp     __init
 
 ___syscall:
-#if defined (OMF)
         call    __emx_syscall
-#else
-        call    __dos_syscall
-#endif
         ret
 
@@ -55 +47 @@
 
 __data:
-#if defined (OMF)
-        .long   0
-        .long   0
-        .long   0
-        .long   0
-        .long   0
-        .long   0
-#else
-        .long   __text
-        .long   __etext
-        .long   __data
-        .long   __edata
-        .long   __edata
-        .long   __end
-#endif
 __heap_base:
         .long   0                       /* heap base address */
@@ -80 +57 @@
         .long   0                       /* stack base address */
         .long   0                       /* stack end address */
-#if defined (OMF)
         .long   0x02000002              /* flags: application, OMF */
-#else
-        .long   0x02000000              /* flags: application */
-#endif
         .long   0                       /* reserved */
         .long   0                       /* reserved */
@@ -92 +65 @@
 / first element of vector (N_SETA|N_EXT == 21)
 
-#if defined (OMF)
 __os2dll:
         .long   0, 0
-#else
-        .stabs  "__os2dll", 21, 0, 0, 0xffffffff
-#endif
+/       .stabs  "__os2dll", 21, 0, 0, 0xffffffff
 
         .stabs  "___CTOR_LIST__", 21, 0, 0, 0xffffffff

trunk/src/emx/src/lib/startup/386/crt1.s

@@ -14 +14 @@
         .globl  _errno
 #endif
-        .globl  __osmode
         .globl  __emx_env
         .globl  __emx_vcmp
@@ -37 +36 @@
         movl    %eax, __emx_vprt
         movb    $0, __emx_vprt+4
-        testl   $0x200, %edx
-        setne   __osmode
         EPILOGUE(_entry2)
 
@@ -46 +43 @@
 _errno: .long   0
 #endif
-__osmode:       .byte 1                         /* OS2_MODE = 1 */
         .comm   __emx_rev, 4
         .comm   __emx_env, 4

trunk/src/emx/src/lib/startup/386/dll0.s

@@ -13 +13 @@
 __text:
         push    $__data
-#if defined (OMF)
         call    __emx_init
-#else
-        call    __dos_init
-#endif
         jmp     __init
 
 
 ___syscall:
-#if defined (OMF)
         call    __emx_syscall
-#else
-        call    __dos_syscall
-#endif
         ret
 
@@ -61 +53 @@
         .long   0                       /* stack base address */
         .long   0                       /* stack end address */
-#if defined (OMF)
         .long   0x02000003              /* flags: DLL, OMF */
-#else
-        .long   0x02000001              /* flags: DLL */
-#endif
         .long   0                       /* reserved */
         .long   0                       /* reserved */
@@ -73 +61 @@
 / first element of vector (N_SETA|N_EXT == 21)
 
-#if defined (OMF)
 __os2dll:
         .long   0, 0
-#else
-        .stabs  "__os2dll", 21, 0, 0, 0xffffffff
-#endif
+/       .stabs  "__os2dll", 21, 0, 0, 0xffffffff
 
         .stabs  "___CTOR_LIST__", 21, 0, 0, 0xffffffff

trunk/src/emx/src/lib/startup/gmon.c

@@ -32 +32 @@
  */
 
-#ifndef lint
-static char sccsid[] = "@(#)gmon.c      5.3 (Berkeley) 5/22/91";
-#endif /* not lint */
-
-#if 0
-#include <unistd.h>
-
-#endif
-#ifdef DEBUG
 #include <stdio.h>
-#endif
-
-#ifdef EMX
 #include <stdlib.h>
 #include <fcntl.h>
-#endif /* EMX */
+#include <unistd.h>
+#include <io.h>
 
 #include "gmon.h"
 
-#ifndef EMX
-extern mcount() asm ("mcount");
-extern char *minbrk asm ("minbrk");
-#endif /* not EMX */
-
-    /*
-     *  froms is actually a bunch of unsigned shorts indexing tos
-     */
+/*
+ *      froms is actually a bunch of unsigned shorts indexing tos
+ */
 static int              profiling = 3;
 static unsigned short   *froms;
@@ -70 +54 @@
 static char     *sbuf;
 static int      s_scale;
-    /* see profil(2) where this is describe (incorrectly) */
+/* see profil(2) where this is describe (incorrectly) */
 #define         SCALE_1_TO_1    0x10000L
 
 #define MSG "No space for profiling buffer(s)\n"
 
+/* Forward definition */
+void moncontrol();
+
+void
 monstartup(lowpc, highpc)
     char        *lowpc;
@@ -119 +107 @@
         return;
     }
-#ifndef EMX
-    minbrk = sbrk(0);
-#endif /* not EMX */
     tos[0].link = 0;
     sbuf = buffer;
@@ -133 +118 @@
     o = highpc - lowpc;
     if( monsize < o )
-#ifndef hp300
         s_scale = ( (float) monsize / o ) * SCALE_1_TO_1;
-#else /* avoid floating point */
-    {
-        int quot = o / monsize;
-
-        if (quot >= 0x10000)
-                s_scale = 1;
-        else if (quot >= 0x100)
-                s_scale = 0x10000 / quot;
-        else if (o >= 0x800000)
-                s_scale = 0x1000000 / (o / (monsize >> 8));
-        else
-                s_scale = 0x1000000 / ((o << 8) / monsize);
-    }
-#endif
     else
         s_scale = SCALE_1_TO_1;
@@ -154 +124 @@
 }
 
+void
 _mcleanup()
 {
@@ -164 +135 @@
 
     moncontrol(0);
-    fd = creat( "gmon.out" , 0666 );
-    if ( fd < 0 ) {
+    fd = open ("gmon.out" , O_WRONLY | O_TRUNC | O_CREAT | O_BINARY, 0666);
+    if (fd < 0) {
         perror( "mcount: gmon.out" );
         return;
     }
-#ifdef EMX
-    setmode (fd, O_BINARY);
-#endif /* EMX */
 #   ifdef DEBUG
         fprintf( stderr , "[mcleanup] sbuf 0x%x ssiz %d\n" , sbuf , ssiz );
-#   endif DEBUG
+#   endif /* DEBUG */
     write( fd , sbuf , ssiz );
     endfrom = s_textsize / (HASHFRACTION * sizeof(*froms));
@@ -187 +155 @@
                         "[mcleanup] frompc 0x%x selfpc 0x%x count %d\n" ,
                         frompc , tos[toindex].selfpc , tos[toindex].count );
-#           endif DEBUG
+#           endif /* DEBUG */
             rawarc.raw_frompc = (unsigned long) frompc;
             rawarc.raw_selfpc = (unsigned long) tos[toindex].selfpc;
@@ -197 +165 @@
 }
 
-#ifdef EMX
+void
 _mcount()
-#else /* not EMX */
-mcount()
-#endif /* not EMX */
 {
-        register char                   *selfpc;
-        register unsigned short         *frompcindex;
-        register struct tostruct        *top;
-        register struct tostruct        *prevtop;
-        register long                   toindex;
-
+    register char *selfpc;
+    register unsigned short *frompcindex;
+    register struct tostruct *top;
+    register struct tostruct *prevtop;
+    register long toindex;
+
+    /*
+     *  find the return address for mcount,
+     *  and the return address for mcount's caller.
+     */
+
+    /* selfpc = pc pushed by mcount call.
+       This identifies the function that was just entered.  */
+    selfpc = (void *) __builtin_return_address (0);
+    /* frompcindex = pc in preceding frame.
+       This identifies the caller of the function just entered.  */
+    frompcindex = (void *) __builtin_return_address (1);
+    /*
+     *  check that we are profiling
+     *  and that we aren't recursively invoked.
+     */
+    if (profiling) {
+        goto out;
+    }
+
+    /* Profile thread 1 only. */
+    if (_gettid () != 1)
+        goto out;
+
+    profiling++;
+    /*
+     *  check that frompcindex is a reasonable pc value.
+     *  for example:    signal catchers get called from the stack,
+     *                  not from text space.  too bad.
+     */
+    frompcindex = (unsigned short *)((long)frompcindex - (long)s_lowpc);
+    if ((unsigned long)frompcindex > s_textsize) {
+        goto done;
+    }
+    frompcindex =
+        &froms[((long)frompcindex) / (HASHFRACTION * sizeof(*froms))];
+    toindex = *frompcindex;
+    if (toindex == 0) {
         /*
-         *      find the return address for mcount,
-         *      and the return address for mcount's caller.
+         *      first time traversing this arc
          */
-
-        /* selfpc = pc pushed by mcount call.
-           This identifies the function that was just entered.  */
-        selfpc = (void *) __builtin_return_address (0);
-        /* frompcindex = pc in preceding frame.
-           This identifies the caller of the function just entered.  */
-        frompcindex = (void *) __builtin_return_address (1);
+        toindex = ++tos[0].link;
+        if (toindex >= tolimit) {
+            goto overflow;
+        }
+        *frompcindex = toindex;
+        top = &tos[toindex];
+        top->selfpc = selfpc;
+        top->count = 1;
+        top->link = 0;
+        goto done;
+    }
+    top = &tos[toindex];
+    if (top->selfpc == selfpc) {
         /*
-         *      check that we are profiling
-         *      and that we aren't recursively invoked.
+         *      arc at front of chain; usual case.
          */
-        if (profiling) {
-                goto out;
-        }
-#ifdef EMX
-        /* Profile thread 1 only. */
-        if (_gettid () != 1)
-                goto out;
-#endif /* EMX */
-        profiling++;
+        top->count++;
+        goto done;
+    }
+    /*
+     *  have to go looking down chain for it.
+     *  top points to what we are looking at,
+     *  prevtop points to previous top.
+     *  we know it is not at the head of the chain.
+     */
+    for (; /* goto done */; ) {
+        if (top->link == 0) {
+            /*
+             *  top is end of the chain and none of the chain
+             *  had top->selfpc == selfpc.
+             *  so we allocate a new tostruct
+             *  and link it to the head of the chain.
+             */
+            toindex = ++tos[0].link;
+            if (toindex >= tolimit) {
+                goto overflow;
+            }
+            top = &tos[toindex];
+            top->selfpc = selfpc;
+            top->count = 1;
+            top->link = *frompcindex;
+            *frompcindex = toindex;
+            goto done;
+        }
         /*
-         *      check that frompcindex is a reasonable pc value.
-         *      for example:    signal catchers get called from the stack,
-         *                      not from text space.  too bad.
+         *      otherwise, check the next arc on the chain.
          */
-        frompcindex = (unsigned short *)((long)frompcindex - (long)s_lowpc);
-        if ((unsigned long)frompcindex > s_textsize) {
-                goto done;
-        }
-        frompcindex =
-            &froms[((long)frompcindex) / (HASHFRACTION * sizeof(*froms))];
-        toindex = *frompcindex;
-        if (toindex == 0) {
-                /*
-                 *      first time traversing this arc
-                 */
-                toindex = ++tos[0].link;
-                if (toindex >= tolimit) {
-                        goto overflow;
-                }
-                *frompcindex = toindex;
-                top = &tos[toindex];
-                top->selfpc = selfpc;
-                top->count = 1;
-                top->link = 0;
-                goto done;
-        }
-        top = &tos[toindex];
+        prevtop = top;
+        top = &tos[top->link];
         if (top->selfpc == selfpc) {
-                /*
-                 *      arc at front of chain; usual case.
-                 */
-                top->count++;
-                goto done;
-        }
-        /*
-         *      have to go looking down chain for it.
-         *      top points to what we are looking at,
-         *      prevtop points to previous top.
-         *      we know it is not at the head of the chain.
-         */
-        for (; /* goto done */; ) {
-                if (top->link == 0) {
-                        /*
-                         *      top is end of the chain and none of the chain
-                         *      had top->selfpc == selfpc.
-                         *      so we allocate a new tostruct
-                         *      and link it to the head of the chain.
-                         */
-                        toindex = ++tos[0].link;
-                        if (toindex >= tolimit) {
-                                goto overflow;
-                        }
-                        top = &tos[toindex];
-                        top->selfpc = selfpc;
-                        top->count = 1;
-                        top->link = *frompcindex;
-                        *frompcindex = toindex;
-                        goto done;
-                }
-                /*
-                 *      otherwise, check the next arc on the chain.
-                 */
-                prevtop = top;
-                top = &tos[top->link];
-                if (top->selfpc == selfpc) {
-                        /*
-                         *      there it is.
-                         *      increment its count
-                         *      move it to the head of the chain.
-                         */
-                        top->count++;
-                        toindex = prevtop->link;
-                        prevtop->link = top->link;
-                        top->link = *frompcindex;
-                        *frompcindex = toindex;
-                        goto done;
-                }
-
-        }
+            /*
+             *  there it is.
+             *  increment its count
+             *  move it to the head of the chain.
+             */
+            top->count++;
+            toindex = prevtop->link;
+            prevtop->link = top->link;
+            top->link = *frompcindex;
+            *frompcindex = toindex;
+            goto done;
+        }
+    }
 done:
-        profiling--;
-        /* and fall through */
+    profiling--;
+    /* and fall through */
 out:
-        return;         /* normal return restores saved registers */
+    return;             /* normal return restores saved registers */
 
 overflow:
-        profiling++; /* halt further profiling */
-#   define      TOLIMIT "mcount: tos overflow\n"
-        write(2, TOLIMIT, sizeof(TOLIMIT));
-        goto out;
+    profiling++; /* halt further profiling */
+#define TOLIMIT "mcount: tos overflow\n"
+    write(2, TOLIMIT, sizeof(TOLIMIT));
+    goto out;
 }
 
@@ -331 +295 @@
  *      all the data structures are ready.
  */
+void
 moncontrol(mode)
     int mode;

trunk/src/emx/src/lib/str/memccpy.c

@@ -3 +3 @@
 #include <string.h>
 
-void *_memccpy (void *s1, const void *s2, int c, size_t n)
+void *memccpy (void *s1, const void *s2, int c, size_t n)
 {
   size_t i;

trunk/src/emx/src/lib/str/memicmp.c

@@ -4 +4 @@
 #include <ctype.h>
 
-int _memicmp (const void *s1, const void *s2, size_t n)
+int memicmp (const void *s1, const void *s2, size_t n)
 {
   size_t i;

trunk/src/emx/src/lib/str/strdup.c

@@ -4 +4 @@
 #include <stdlib.h>
 
-char *_strdup (const char *string)
+char *strdup (const char *string)
 {
   char *p;

trunk/src/emx/src/lib/str/strerror.c

@@ -19 +19 @@
 #endif
       memcpy (result, msg, sizeof (msg) - 1);
-      _itoa (errnum, result + sizeof (msg) - 1, 10);
+      itoa (errnum, result + sizeof (msg) - 1, 10);
       return result;
     }

trunk/src/emx/src/lib/str/stricmp.c

@@ -4 +4 @@
 #include <ctype.h>
 
-int _stricmp (const char *string1, const char *string2)
+int stricmp (const char *string1, const char *string2)
 {
   int d;

trunk/src/emx/src/lib/str/strlwr.c

@@ -4 +4 @@
 #include <ctype.h>
 
-char *_strlwr (char *string)
+char *strlwr (char *string)
 {
   unsigned char *p;
@@ -10 +10 @@
   for (p = (unsigned char *)string; *p != 0; ++p)
     if (isupper (*p))
-      *p = (unsigned char)_tolower (*p);
+      *p = (unsigned char)tolower (*p);
   return string;
 }

trunk/src/emx/src/lib/str/strnicmp.c

@@ -4 +4 @@
 #include <ctype.h>
 
-int _strnicmp (const char *string1, const char *string2, size_t count)
+int strnicmp (const char *string1, const char *string2, size_t count)
 {
   int d;

trunk/src/emx/src/lib/str/strnset.c

@@ -3 +3 @@
 #include <string.h>
 
-char *_strnset (char *string, int c, size_t count)
+char *strnset (char *string, int c, size_t count)
 {
   char *dst;

trunk/src/emx/src/lib/str/strrev.c

@@ -3 +3 @@
 #include <string.h>
 
-char *_strrev (char *string)
+char *strrev (char *string)
 {
   char *p, *q, c;

trunk/src/emx/src/lib/str/strset.c

@@ -3 +3 @@
 #include <string.h>
 
-char *_strset (char *string, int c)
+char *strset (char *string, int c)
 {
   char *dst;

trunk/src/emx/src/lib/str/strtok.c

@@ -12 +12 @@
 #define next (tp->_th_strtok_ptr)
 #else
-    static unsigned char *next = NULL;
+  static unsigned char *next = NULL;
 #endif
   if (string1 != NULL)

trunk/src/emx/src/lib/str/strupr.c

@@ -4 +4 @@
 #include <ctype.h>
 
-char *_strupr (char *string)
+char *strupr (char *string)
 {
   unsigned char *p;
@@ -10 +10 @@
   for (p = (unsigned char *)string; *p != 0; ++p)
     if (islower (*p))
-      *p = (unsigned char)_toupper (*p);
+      *p = (unsigned char)toupper (*p);
   return string;
 }

trunk/src/emx/src/lib/sys/__ftime.c

@@ -21 +21 @@
   tm.tm_year = now.year - 1900;
   tm.tm_isdst = -1;             /* unknown */
-  ptr->time = (time_t)_mktime (&tm);
+  ptr->time = (time_t)mktime (&tm);
   ptr->millitm = now.hundredths * 10;
   ptr->timezone = now.timezone;

trunk/src/emx/src/lib/sys/__getdrive.c

@@ -19 +19 @@
     }
 }
-

trunk/src/emx/src/lib/sys/__init.c

@@ -4 +4 @@
 #include <os2emx.h>
 #include <string.h>
+#include <alloca.h>
 #include <sys/builtin.h>
 #include <sys/fmutex.h>

trunk/src/emx/src/lib/sys/__mkdir.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 #include "syscalls.h"
-
 
 int __mkdir (const char *name)

trunk/src/emx/src/lib/sys/__rmdir.c

@@ -4 +4 @@
 #include <emx/syscalls.h>
 #include "syscalls.h"
-
 
 int __rmdir (const char *name)

trunk/src/emx/src/lib/sys/filesys.c

@@ -4 +4 @@
 #include <errno.h>
 #include <os2emx.h>
+#include <alloca.h>
 #include <emx/syscalls.h>
 #include "syscalls.h"

trunk/src/emx/src/lib/sys/p2t.c

@@ -18 +18 @@
   tm.tm_year = d.year + 1980 - 1900;
   tm.tm_isdst = -1;             /* unknown */
-  return _mktime (&tm);
+  return mktime (&tm);
 }

trunk/src/emx/src/lib/sys/pause.c

@@ -4 +4 @@
 #include <os2emx.h>
 #include <emx/syscalls.h>
+#include <errno.h>
 #include "syscalls.h"
 
-void __pause (void)
+int pause (void)
 {
   while (DosSleep (0xffffffff) == 0)
     ;
+  errno = EINTR;
+  return -1;
 }

trunk/src/emx/src/lib/sys/sigaction.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 #include "syscalls.h"
-
 
 int __sigaction (int signo, const struct sigaction *iact,

trunk/src/emx/src/lib/sys/spawnve.c

@@ -1 @@
-/* sys/spawnve.c (emx+gcc) -- Copyright (c) 1992-1996 by Eberhard Mattes */
+/* spawnve.c (emx+gcc) -- Copyright (c) 1990-1996 by Eberhard Mattes */
 
 #include <stdlib.h>
@@ -5 +5 @@
 #include <process.h>
 #include <errno.h>
-#define INCL_DOSPROCESS
-#include <os2emx.h>
+#include <alloca.h>
+#include <emx/startup.h>
 #include <emx/syscalls.h>
-#include "syscalls.h"
 
-/* Note: We are allowed to call _trealloc() as this module is not used
-   in an .a library. */
+int spawnve (int mode, const char *name, char * const argv[],
+               char * const envp[])
+{
+  struct _new_proc np;
+  int i, size, n;
+  const char * const *p;
+  char *d;
+  char exe[512];
 
-#define ADD(n) do { \
-  while (arg_size + n > arg_alloc) \
-    { \
-      arg_alloc += 512; \
-      arg_buf = _trealloc (arg_buf, arg_alloc); \
-      if (arg_buf == NULL) \
-        { \
-          errno = ENOMEM; \
-          return -1; \
-        } \
-      arg_ptr = arg_buf + arg_size; \
-    } \
-  arg_size += n; } while (0)
+  /* Kludge alert: Unfortunately, the `mode' member was made only 16
+     bits wide originally.  Bit 15 is used to indicate that the
+     `mode2' member is used, which holds the upper 16 bits of MODE.
+     This allows using emx 0.8 applications with emx 0.9 as emx
+     doesn't look at `mode2' unless bit 15 of `mode' is set.  Of
+     course, this fails if an (old) application program sets bit 15 of
+     MODE. */
 
+  np.mode = (unsigned short)(mode | 0x8000);
+  np.mode2 = (unsigned short)((unsigned)mode >> 16);
 
-int __spawnve (struct _new_proc *np)
-{
-  ULONG rc;
-  ULONG exec_flag, mode;
-  RESULTCODES res;
-  char obj[40], *arg_ptr, *arg_buf;
-  char *pgm_name, *base;
-  const char *src, *s;
-  size_t arg_size, arg_alloc, len;
-  int i, quote, bs, method;
-
-  arg_buf = NULL; arg_alloc = 0; arg_size = 0; arg_ptr = NULL;
-
-  mode = np->mode;
-  if (np->mode & 0x8000)
-    mode |= np->mode2 << 16;
-
-  switch (mode & 0xff)
+  if (envp == NULL) envp = _environ;
+  if (strlen (name) >= sizeof (exe) - 4)
     {
-    case P_WAIT:
-      exec_flag = EXEC_SYNC;
-      break;
-    case P_NOWAIT:
-      exec_flag = EXEC_ASYNCRESULT;
-      break;
-    case P_OVERLAY:
-      exec_flag = EXEC_ASYNC;
-      break;
-    default:
-      errno = EINVAL;
+      errno = ENAMETOOLONG;
       return -1;
     }
-  pgm_name = alloca (strlen ((const char *)np->fname_off) + 5);
-  strcpy (pgm_name, (const char *)np->fname_off);
-  _defext (pgm_name, "exe");
-  base = _getname (pgm_name);
-  method = 0;
-  if (stricmp (base, "cmd.exe") == 0 || stricmp (base, "4os2.exe") == 0)
-    method = 1;
-  src = (const char *)np->arg_off;
-  if (np->arg_count > 0)
+  strcpy (exe, name);
+  _defext (exe, "exe");
+  np.fname_off = (unsigned long)exe;
+  size = 1; n = 0;
+  for (p = (const char * const *)envp; *p != NULL; ++p)
     {
-      ++src;                    /* skip flags byte */
-      len = strlen (src) + 1;
-      ADD (len);
-      memcpy (arg_ptr, src, len);
-      arg_ptr += len; src += len;
+      ++n; size += 1 + strlen (*p);
     }
-  for (i = 1; i < np->arg_count; ++i)
+  d = alloca (size);
+  np.env_count = n; np.env_size = size;
+  np.env_off = (unsigned long)d;
+  for (p = (const char * const *)envp; *p != NULL; ++p)
     {
-      if (i > 1)
-        {
-          ADD (1);
-          *arg_ptr++ = ' ';
-        }
-      ++src;                    /* skip flags byte */
-      quote = FALSE;
-      if (*src == 0)
-        quote = TRUE;
-      else if (mode & P_QUOTE)
-        {
-          if (src[0] == '@' && src[1] != 0)
-            quote = TRUE;
-          else
-            for (s = src; *s != 0; ++s)
-              if (*s == '?' || *s == '*')
-                {
-                  quote = TRUE;
-                  break;
-                }
-        }
-      if (!quote)
-        for (s = src; *s != 0; ++s)
-          if (*s == ' ' || *s == '\t' || (*s == '"' && method == 1))
-            {
-              quote = TRUE;
-              break;
-            }
-      if (quote)
-        {
-          ADD (1);
-          *arg_ptr++ = '"';
-        }
-      bs = 0;
-      while (*src != 0)
-        {
-          if (*src == '"' && method == 0)
-            {
-              ++bs;
-              ADD (bs);
-              memset (arg_ptr, '\\', bs); arg_ptr += bs;
-              bs = 0;
-            }
-          else if (*src == '\\' && method == 0)
-            ++bs;
-          else
-            bs = 0;
-          ADD (1);
-          *arg_ptr++ = *src;
-          ++src;
-        }
-      if (quote)
-        {
-          ADD (1+bs);
-          memset (arg_ptr, '\\', bs); arg_ptr += bs;
-          *arg_ptr++ = '"';
-        }
-      ++src;
+      i = strlen (*p);
+      memcpy (d, *p, i+1);
+      d += i+1;
     }
-  ADD (1);
-  *arg_ptr++ = 0;
-  rc = DosExecPgm (obj, sizeof (obj), exec_flag, arg_buf,
-                   (const char *)np->env_off, &res, pgm_name);
-  if (arg_buf != NULL)
-    _tfree (arg_buf);
-  if (rc != 0)
+  *d = 0;
+  size = 0; n = 0;
+  for (p = (const char * const *)argv; *p != NULL; ++p)
     {
-      _sys_set_errno (rc);
-      return -1;
+      ++n; size += 2 + strlen (*p);
     }
-  switch (mode & 0xff)
+  d = alloca (size);
+  np.arg_count = n; np.arg_size = size;
+  np.arg_off = (unsigned long)d;
+  for (p = (const char * const *)argv; *p != NULL; ++p)
     {
-    case P_WAIT:
-      return res.codeResult;
-    case P_NOWAIT:
-      return res.codeTerminate;
-    case P_OVERLAY:
-      while (1)
-        DosExit (EXIT_PROCESS, 0);
-    default:
-      errno = EINVAL;
-      return -1;
+      i = strlen (*p);
+      *d++ = _ARG_NONZERO;
+      memcpy (d, *p, i+1);
+      d += i+1;
     }
+  i = __spawnve (&np);
+  return i;
 }

trunk/src/emx/src/lib/sys/syscalls.h

@@ -52 +52 @@
    While this variable is NULL, no memory has been allocated. */
 
-struct heap_obj *_sys_top_heap_obj;
+EXTERN struct heap_obj *_sys_top_heap_obj;
 
 /* This array holds information on all the heap objects.  The heap
    objects are managed in LIFO fashion. */
 
-struct heap_obj _sys_heap_objs[MAX_HEAP_OBJS];
+EXTERN struct heap_obj _sys_heap_objs[MAX_HEAP_OBJS];
 
 /* This is the number of heap objects. */

trunk/src/emx/src/lib/time/ftime.c

@@ -6 +6 @@
 #include <emx/syscalls.h>
 
-void _ftime (struct timeb *ptr)
+void ftime (struct timeb *ptr)
 {
   time_t t_loc;
 
-  if (!_tzset_flag) _tzset ();
+  if (!_tzset_flag) tzset ();
   __ftime (ptr);
   t_loc = ptr->time;

trunk/src/emx/src/lib/time/gettimeo.c

@@ -7 +7 @@
 #include <emx/syscalls.h>
 
-int _gettimeofday (struct timeval *tp, struct timezone *tzp)
+int gettimeofday (struct timeval *tp, struct timezone *tzp)
 {
   struct timeb tb;

trunk/src/emx/src/lib/time/localtim.c

@@ -22 +22 @@
   struct tm *p;
 
-  if (!_tzset_flag) _tzset ();
+  if (!_tzset_flag) tzset ();
   lt = *t;
   isdst = _gmt2loc (&lt);

trunk/src/emx/src/lib/time/mktime.c

@@ -11 +11 @@
   int dst;
 
-  if (!_tzset_flag) _tzset ();
+  if (!_tzset_flag) tzset ();
 
-  /* _mktime() requires that tm_mon is in range.  The other members
+  /* mktime() requires that tm_mon is in range.  The other members
      are not restricted. */
 

trunk/src/emx/src/lib/time/settimeo.c

@@ -7 +7 @@
 #include <emx/syscalls.h>
 
-int _settimeofday (const struct timeval *tp, const struct timezone *tzp)
+int settimeofday (const struct timeval *tp, const struct timezone *tzp)
 {
   struct timeval local;
@@ -17 +17 @@
       return -1;
     }
-  if (!_tzset_flag) _tzset ();
+  if (!_tzset_flag) tzset ();
   t = tp->tv_sec;
   local.tv_sec = _gmt2loc (&t);

trunk/src/emx/src/lib/time/strptime.c

@@ -265 +265 @@
 
 
-char *_strptime (const char *buf, const char *format, struct tm *tm)
+char *strptime (const char *buf, const char *format, struct tm *tm)
 {
   return (char *)parse_fmt ((const unsigned char *)buf,

trunk/src/emx/src/lib/time/time.c

@@ -8 +8 @@
   struct timeb tb;
 
-  _ftime (&tb);
+  ftime (&tb);
   if (t != NULL) *t = tb.time;
   return tb.time;

trunk/src/emx/src/lib/time/times.c

@@ -7 +7 @@
 /* Note: return value overflows */
 
-long _times (struct tms *buffer)
+long times (struct tms *buffer)
 {
   struct timeval tv;
@@ -15 +15 @@
   buffer->tms_cutime = 0;
   buffer->tms_cstime = 0;
-  if (_gettimeofday (&tv, NULL) != 0)
+  if (gettimeofday (&tv, NULL) != 0)
     return -1;
   return CLK_TCK * tv.tv_sec + (CLK_TCK * tv.tv_usec) / 1000000;

trunk/src/emx/src/lib/time/tzset.c

@@ -105 +105 @@
 
 
-void _tzset (void)
+void tzset (void)
 {
   struct _tzinfo ntz;

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

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

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

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

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

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

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

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