GCC + Threads on Win32 - best gcc results yet

[p5sagit/p5-mst-13.2.git] / os2 / Makefile.SHs

diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs
index b4ac75e..493aeab 100644 (file)
--- a/os2/Makefile.SHs
+++ b/os2/Makefile.SHs
@@ -19,6 +19,8 @@ AOUT_LIBPERL_DLL      = libperl_dll$aout_lib_ext
 AOUT_CCCMD_DLL = \$(CC) -DDOSISH -DOS2=2 -DEMBED -I. -DPACK_MALLOC -DDEBUGGING_MSTATS -DTWO_POT_OPTIMIZE -DPERL_EMERGENCY_SBRK
 AOUT_CLDFLAGS_DLL      = -Zexe -Zmt -Zcrtdll
 
+LD_OPT         = $optimize
+
 !GROK!THIS!
 
 $spitshell >>Makefile <<'!NO!SUBS!'
@@ -30,9 +32,13 @@ $(AOUT_LIBPERL_DLL): perl.imp perl.dll perl5.def
 
 perl.imp: perl5.def
        emximp -o perl.imp perl5.def
+       echo    'emx_calloc             emxlibcm        400     ?' >> $@
+       echo    'emx_free               emxlibcm        401     ?' >> $@
+       echo    'emx_malloc             emxlibcm        402     ?' >> $@
+       echo    'emx_realloc            emxlibcm        403     ?' >> $@
 
 perl.dll: $(obj) perl5.def perl$(OBJ_EXT)
-       $(LD) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj) $(libs) perl5.def
+       $(LD) $(LD_OPT) $(LDDLFLAGS) -o $@ perl$(OBJ_EXT) $(obj) $(libs) perl5.def
 
 perl5.def: perl.linkexp
        echo "LIBRARY 'Perl' INITINSTANCE TERMINSTANCE" > $@
@@ -50,6 +56,7 @@ perl5.def: perl.linkexp
        echo '  "dlerror"'                              >>$@
        echo '  "my_tmpfile"'                           >>$@
        echo '  "my_tmpnam"'                            >>$@
+       echo '  "my_flock"'                             >>$@
 !NO!SUBS!
 
 if [ ! -z "$myttyname" ] ; then
@@ -64,23 +71,22 @@ $spitshell >>Makefile <<'!NO!SUBS!'
 #      grep -v '"\(malloc\|realloc\|free\)"' perl.linkexp      >>$@
 
 
-# We assume here that perl is available somewhere ...
-
 perl.exports: perl.exp EXTERN.h perl.h
-       (echo '#include "EXTERN.h"'; echo '#include "perl.h"' ; \
-                       echo '#include "perl.exp"') | \
+       (echo "#include \"EXTERN.h\" \n#include \"perl.h\" \n#include \"perl.exp\"";    \
+        echo "malloc\nrealloc\ncalloc\nfree") | \
                $(CC) -DEMBED  -E - | \
                awk '{if ($$2 == "") print $$1}' | sort | uniq > $@
 
-#              perl -ne 'print if (/^#!/ .. /^#\s/) && s/^(\w+) *$$/$$1/' > $@
-
 perl.linkexp: perl.exports perl.map
        cat perl.exports perl.map | sort | uniq -d | sed -e 's/\w\+/  "\0"/' > perl.linkexp
 
-perl.map: $(obj) perl$(OBJ_EXT) miniperlmain$(OBJ_EXT)
-       $(CC) $(LARGE) $(CLDFLAGS) $(CCDLFLAGS) -o dummy.exe miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) $(obj) $(libs) -Zmap -Zlinker /map
-       awk '{if ($$3 == "") print $$2}' <dummy.map | sort | uniq > perl.map
-       rm dummy.exe dummy.map
+# We link miniperl statically, since .DLL depends on $(DYNALOADER) 
+
+perl.map miniperl: $(obj) perl$(OBJ_EXT) miniperlmain$(OBJ_EXT)
+       $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) $(obj) $(libs) -Zmap -Zlinker /map
+       awk '{if ($$3 == "") print $$2}' <miniperl.map | sort | uniq > perl.map
+       rm miniperl.map
+       @./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
 
 depend: os2ish.h dlfcn.h 
 
@@ -99,12 +105,6 @@ os2ish.h: os2/os2ish.h
 dlfcn.h: os2/dlfcn.h
        cp $< $@
 
-# We link miniperl statically, since .DLL depends on $(DYNALOADER) 
-
-miniperl: $& miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) $(obj) 
-       $(CC) $(LARGE) $(CLDFLAGS) -o miniperl miniperlmain$(OBJ_EXT) perl$(OBJ_EXT) $(obj) $(libs)
-       @./miniperl -w -Ilib -MExporter -e 0 || $(MAKE) minitest
-
 # This one is compiled OMF, so cannot fork():
 
 perl___: $& perlmain$(OBJ_EXT) $(LIBPERL) $(DYNALOADER) $(static_ext) ext.libs