[win32] merge change#886 from maintbranch

p4raw-link: @886 on //depot/maint-5.004/perl: 6dba07070c2cb08ffbc6e00eff60e8f5fc9a7ee8

p4raw-id: //depot/win32/perl@936

6 files changed, 55 insertions, 16 deletions

diff --git a/hints/aix.sh b/hints/aix.sh
index a29466e4f8..21dc888a83 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -66,7 +66,7 @@ case "$osvers" in
 lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).exp -e _nostart -lc'
     ;;
 *) 
-lddlflags='-H512 -T512 -bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).exp -b noentry -lc'
+lddlflags='-bhalt:4 -bM:SRE -bI:$(PERL_INC)/perl.exp -bE:$(BASEEXT).exp -b noentry -lc'
 
 ;;
 esac
diff --git a/hints/bsdos.sh b/hints/bsdos.sh
index c89a0a9833..0896e264ba 100644
--- a/hints/bsdos.sh
+++ b/hints/bsdos.sh
@@ -3,7 +3,7 @@
 # hints file for BSD/OS (adapted from bsd386.sh)
 # Original by Neil Bowers <neilb@khoros.unm.edu>; Tue Oct  4 12:01:34 EDT 1994
 # Updated by Tony Sanders <sanders@bsdi.com>; Sat Aug 23 12:47:45 MDT 1997
-#     Added 3.1 with ELF dynamic libraries
+#     Added 3.1 with ELF dynamic libraries (NOT in 3.1 yet. Estimated for 4.0)
 #     SYSV IPC tested Ok so I re-enabled.
 #
 # To override the compiler on the command line:
@@ -33,6 +33,9 @@ libswanted="$*"
 glibpth="$glibpth /usr/X11/lib"
 ldflags="$ldflags -L/usr/X11/lib"
 
+# Avoid telldir prototype conflict in pp_sys.c
+pp_sys_cflags='ccflags="$ccflags -DHAS_TELLDIR_PROTOTYPE"'
+
 case "$optimize" in
 '')     optimize='-O2' ;;
 esac
@@ -85,4 +88,22 @@ case "$osvers" in
 	libswanted="Xpm Xaw Xmu Xt SM ICE Xext X11 $libswanted"
 	libswanted="rpc curses termcap $libswanted"
 	;;
+4.0*)
+	# ELF dynamic link libraries starting in 4.0 (???)
+        useshrplib='true'
+	so='so'
+	dlext='so'
+
+	case "$cc" in
+	'')	cc='cc'			# cc is gcc2 in 4.0
+		cccdlflags="-fPIC"
+		ccdlflags=" " ;;
+	esac
+
+	case "$ld" in
+	'')	ld='ld'
+		lddlflags="-shared -x $lddlflags" ;;
+	esac
+	;;
 esac
+
diff --git a/hints/hpux.sh b/hints/hpux.sh
index 9b272aef76..3e727d2d6f 100644
--- a/hints/hpux.sh
+++ b/hints/hpux.sh
@@ -43,8 +43,10 @@
 # "ext.libs" file which is *probably* messing up the order.  Often,
 # you can replace ext.libs with an empty file to fix the problem.
 #
-# If you get a message about "too much defining", you might have to
-# add the following to your ccflags: '-Wp,-H256000'
+# If you get a message about "too much defining", as may happen
+# in HPUX < 10, you might have to append a single entry to your
+# ccflags: '-Wp,-H256000'
+# NOTE: This is a single entry (-W takes the argument 'p,-H256000').
 #--------------------------------------------------------------------
 
 # Turn on the _HPUX_SOURCE flag to get many of the HP add-ons
diff --git a/hints/netbsd.sh b/hints/netbsd.sh
index 787f0f13bb..b0736bf8b0 100644
--- a/hints/netbsd.sh
+++ b/hints/netbsd.sh
@@ -41,6 +41,14 @@ case "$osvers" in
 	esac
 	;;
 esac
+# netbsd 1.3 linker warns about setr[gu]id being deprecated.
+# (setregid, setreuid, preferred?)
+case "$osvers" in
+1.3|1.3*)
+	d_setrgid="$undef"
+	d_setruid="$undef"
+	;;
+esac
 
 # netbsd had these but they don't really work as advertised, in the
 # versions listed below.  if they are defined, then there isn't a
diff --git a/hints/os2.sh b/hints/os2.sh
index 2293adf446..7a980bddce 100644
--- a/hints/os2.sh
+++ b/hints/os2.sh
@@ -23,6 +23,14 @@ if test -f $sh.exe; then sh=$sh.exe; fi
 startsh="#!$sh"
 cc='gcc'
 
+# Make denser object files and DLL
+case "X$optimize" in
+  X)
+	optimize="-O2 -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -s"
+	ld_dll_optimize="-s"
+	;;
+esac
+
 # Get some standard things (indented to avoid putting in config.sh):
  oifs="$IFS"
  IFS=" ;"
@@ -104,11 +112,11 @@ aout_obj_ext='.o'
 aout_lib_ext='.a'
 aout_ar='ar'
 aout_plibext='.a'
-aout_lddlflags='-Zdll'
+aout_lddlflags="-Zdll $ld_dll_optimize"
 if [ $emxcrtrev -ge 50 ]; then 
-    aout_ldflags='-Zexe -Zsmall-conv'
+    aout_ldflags='-Zexe -Zsmall-conv -Zstack 32000'
 else
-    aout_ldflags='-Zexe'
+    aout_ldflags='-Zexe -Zstack 32000'
 fi
 
 # To get into config.sh:
@@ -152,7 +160,7 @@ else
     else
 	d_fork='undef'
     fi
-    lddlflags='-Zdll -Zomf -Zmt -Zcrtdll'
+    lddlflags="-Zdll -Zomf -Zmt -Zcrtdll $ld_dll_optimize"
     # Recursive regmatch may eat 2.5M of stack alone.
     ldflags='-Zexe -Zomf -Zmt -Zcrtdll -Zstack 32000'
     if [ $emxcrtrev -ge 50 ]; then 
@@ -241,13 +249,6 @@ nm_opt='-p'
 d_getprior='define'
 d_setprior='define'
 
-# Make denser object files and DLL
-case "X$optimize" in
-  X)
-	optimize="-O2 -fomit-frame-pointer -malign-loops=2 -malign-jumps=2 -malign-functions=2 -s"
-	;;
-esac
-
 if [ "X$usethreads" = "X$define" ]; then
     ccflags="-Zmt $ccflags"
     cppflags="-Zmt $cppflags"  # Do we really need to set this?
diff --git a/hints/svr4.sh b/hints/svr4.sh
index 922736aa48..eb875e1707 100644
--- a/hints/svr4.sh
+++ b/hints/svr4.sh
@@ -34,9 +34,16 @@ d_lstat=define
 
 # UnixWare has a broken csh.  The undocumented -X argument to uname is probably
 # a reasonable way of detecting UnixWare.  Also in 2.1.1 the fields in
-# FILE* got renamed!
+# FILE* got renamed! Plus 1.1 can't cast large floats to 32-bit ints.
 uw_ver=`uname -v`
 uw_isuw=`uname -X 2>&1 | grep Release`
+if [ "$uw_isuw" = "Release = 4.2" ]; then
+   case $uw_ver in
+   1.1)
+      d_casti32='undef'
+      ;;
+   esac
+fi
 if [ "$uw_isuw" = "Release = 4.2MP" ]; then
    case $uw_ver in
    2.1)