Integrate mainline

p4raw-id: //depot/perlio@8817

5 files changed, 14 insertions, 21 deletions

diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 32335a0bb8..e6117cf1af 100644
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -117,7 +117,7 @@ esac'
 	libc='/usr/lib32/libc.so'
 	plibpth='/usr/lib32 /lib32 /usr/ccs/lib'
 	;;
-*"cc -64")
+*"cc -64"*)
 
 	loclibpth="$loclibpth /usr/lib64"
 	libscheck='case "`/usr/bin/file $xxx`" in
@@ -162,7 +162,7 @@ esac
 
 # Settings common to both native compiler modes.
 case "$cc" in
-*"cc -n32"|*"cc -64")
+*"cc -n32"*|*"cc -64"*)
 	ld=$cc
 
 	# perl's malloc can return improperly aligned buffer
diff --git a/hints/openbsd.sh b/hints/openbsd.sh
index 2e7a433326..25781577ff 100644
--- a/hints/openbsd.sh
+++ b/hints/openbsd.sh
@@ -26,8 +26,9 @@ d_setruid=$undef
 #
 # Not all platforms support dynamic loading...
 #
-case `arch` in
-OpenBSD.alpha|OpenBSD.mips|OpenBSD.powerpc|OpenBSD.vax)
+ARCH=`arch|sed 's/^OpenBSD.//'`
+case "${ARCH}-${osvers}" in
+alpha-*|mips-*|vax-*|powerpc-2.[0-7]|m88k-*)
 	usedl=$undef
 	;;
 *)
@@ -68,7 +69,14 @@ d_suidsafe=$define
 
 # cc is gcc so we can do better than -O
 # Allow a command-line override, such as -Doptimize=-g
-test "$optimize" || optimize='-O2'
+case "$ARCH" in
+m88k)
+   optimize='-O0'
+   ;;
+*)
+   test "$optimize" || optimize='-O2'
+   ;;
+esac
 
 # This script UU/usethreads.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use threads.
diff --git a/hints/os390.sh b/hints/os390.sh
index 54787e8d9a..6f4f39b0e6 100644
--- a/hints/os390.sh
+++ b/hints/os390.sh
@@ -139,14 +139,6 @@ case "$archname" in
 '') archname="$osname" ;;
 esac
 
-# Architecture related object files.
-# ebcdic.c contains special \cX mapping code for EBCDIC char sets.
-# Prepend your preference with Configure -Darchobs=your_preference.o.
-case "$archname" in
-'') archobjs="ebcdic.o" ;;
-*) archobjs="$archobjs ebcdic.o" ;;
-esac
-
 # We have our own cppstdin script.  This is not a variable since 
 # Configure sees the presence of the script file.
 # We put system header -D definitions in so that Configure
diff --git a/hints/posix-bc.sh b/hints/posix-bc.sh
index 5c45832534..6275233992 100644
--- a/hints/posix-bc.sh
+++ b/hints/posix-bc.sh
@@ -92,10 +92,3 @@ esac
 #'') ldlibpthname=LIBPATH ;;
 #esac
 
-# Architecture related object files.
-# ebcdic.c contains special \cX mapping code for EBCDIC char sets.
-# Prepend your preference with Configure -Darchobs=your_preference.o.
-case "$archname" in
-'') archobjs="ebcdic.o" ;;
-*) archobjs="$archobjs ebcdic.o" ;;
-esac
diff --git a/hints/vmesa.sh b/hints/vmesa.sh
index 81ab6a4f44..2c95fd353f 100644
--- a/hints/vmesa.sh
+++ b/hints/vmesa.sh
@@ -24,7 +24,7 @@ d_access='define'
 d_alarm='define'
 d_archlib='define'
 # randbits='15'
-archobjs="ebcdic.o vmesa.o"
+archobjs="vmesa.o"
 d_attribut='undef'
 d_bcmp='define'
 d_bcopy='define'