diff options
Diffstat (limited to 'os2')
| -rw-r--r-- | os2/Changes | 1 | ||||
| -rw-r--r-- | os2/Makefile.SHs | 21 | ||||
| -rw-r--r-- | os2/diff.configure | 8 |
3 files changed, 15 insertions, 15 deletions
diff --git a/os2/Changes b/os2/Changes index c69fb73205..146ce87142 100644 --- a/os2/Changes +++ b/os2/Changes @@ -157,3 +157,4 @@ before 5.004_02: perl -S mycmd will work. Perl will also look in the current directory first. Moreover, a bug with \; in PATH being non-separator is fixed. + diff --git a/os2/Makefile.SHs b/os2/Makefile.SHs index 32af9ccffe..493aeab8c5 100644 --- 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!' @@ -36,7 +38,7 @@ perl.imp: perl5.def 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" > $@ @@ -78,10 +80,13 @@ perl.exports: perl.exp EXTERN.h perl.h 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 @@ -100,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 diff --git a/os2/diff.configure b/os2/diff.configure index a649869d2a..39baf3ff51 100644 --- a/os2/diff.configure +++ b/os2/diff.configure @@ -51,7 +51,7 @@ case "$libs" in '') ;; *) for thislib in $libs; do -@@ -3968,6 +3976,8 @@ +@@ -3972,6 +3980,8 @@ : elif try=`./loc $thislib X $libpth`; $test -f "$try"; then : @@ -60,7 +60,7 @@ elif try=`./loc Slib$thislib$lib_ext X $xlibpth`; $test -f "$try"; then : else -@@ -4152,6 +4162,10 @@ +@@ -4156,6 +4166,10 @@ eval $xscan;\ $contains '^fprintf$' libc.list >/dev/null 2>&1; then eval $xrun @@ -203,7 +203,7 @@ dflt=`./try` case "$dflt" in [1-4][1-4][1-4][1-4]|12345678|87654321) -@@ -8707,18 +8731,18 @@ +@@ -8711,18 +8735,18 @@ $cc $ccflags -c bar1.c >/dev/null 2>&1 $cc $ccflags -c bar2.c >/dev/null 2>&1 $cc $ccflags -c foo.c >/dev/null 2>&1 @@ -227,7 +227,7 @@ else case "$ranlib" in :) ranlib='';; -@@ -8790,7 +8814,7 @@ +@@ -8794,7 +8818,7 @@ '') $echo $n ".$c" if $cc $ccflags \ $i_time $i_systime $i_systimek $sysselect $s_timeval $s_timezone \ |