Various tweaks to help DJGPP builds.

p4raw-id: //depot/perl@20529

diff --git a/djgpp/djgppsed.sh b/djgpp/djgppsed.sh
index 02c4416..8ce64a4 100644 (file)
--- a/djgpp/djgppsed.sh
+++ b/djgpp/djgppsed.sh
@@ -36,7 +36,7 @@ sed -e $SCC -e $SLIST -e $SFILEC -e $SCOR -e $SDEPTMP -e $SHSED makedepend.SH |t
 sed -e $SCPP t/comp/cpp.aux |tr -d '\r' >s; mv -f s t/comp/cpp.aux
 sed -e $SARGV -e $SDOTTMP t/io/argv.t >s; mv -f s t/io/argv.t
 sed -e $SABC t/io/inplace.t >s; mv -f s t/io/inplace.t
-sed -e $SDBMX -e $SDBHASH ext/GDBM_File/gdbm.t >s; mv -f s ext/GDBM_File/gdbm.t
+sed -e $SDBMX -e $SDBHASH ext/GDBM_File/t/gdbm.t >s; mv -f s ext/GDBM_File/t/gdbm.t
 sed -e $SSTAT -e $STMP2 t/op/stat.t >s; mv -f s t/op/stat.t
 sed -e $SLIST x2p/Makefile.SH |tr -d '\r' >s; mv -f s x2p/Makefile.SH
 sed -e 's=^#define.\([A-Z]\+\)_EXP.*$=#define \1_EXP djgpp_pathexp("\1")=g' config_h.SH >s; mv -f s config_h.SH

diff --git a/hints/dos_djgpp.sh b/hints/dos_djgpp.sh
index 3ae9d22..d2d0874 100644 (file)
--- a/hints/dos_djgpp.sh
+++ b/hints/dos_djgpp.sh
@@ -40,7 +40,12 @@ startperl='#!perl'
 
 case "X$optimize" in
   X)
-       optimize="-O2 -malign-loops=2 -malign-jumps=2 -malign-functions=2"
+       case "`gcc -v 2>&1|grep "gcc version"` in
+       "gcc version 3.*")
+         optimize="-O2 -falign-loops=2 -falign-jumps=2 -falign-functions=2" ;;
+       *)
+         optimize="-O2 -malign-loops=2 -malign-jumps=2 -malign-functions=2" ;;
+       esac
        ldflags='-s'
        ;;
   X*)