Re: [PATCH] RC5 and Intel's ICC

[perl5.git] / hints / dec_osf.sh

diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh
index db4b147..114aca1 100644 (file)
--- a/hints/dec_osf.sh
+++ b/hints/dec_osf.sh
@@ -225,6 +225,9 @@ libswanted="`echo $libswanted | sed -e 's/ ndbm / /'`"
 # the basic lddlflags used always
 lddlflags='-shared -expect_unresolved "*"'
 
+# Intentional leading tab.
+       myosvers="`/usr/sbin/sizer -v 2>/dev/null || uname -r`"
+
 # Fancy compiler suites use optimising linker as well as compiler.
 # <spider@Orb.Nashua.NH.US>
 case "`uname -r`" in
@@ -234,7 +237,7 @@ case "`uname -r`" in
 *)            if $test "X$optimize" = "X$undef"; then
                       lddlflags="$lddlflags -msym"
               else
-                 case "`/usr/sbin/sizer -v`" in
+                 case "$myosvers" in
                  *4.0D*)
                      # QAR 56761: -O4 + .so may produce broken code,
                      # fixed in 4.0E or better.
@@ -252,6 +255,10 @@ esac
 # Yes, the above loses if gcc does not use the system linker.
 # If that happens, let me know about it. <jhi@iki.fi>
 
+# Because there is no other handy way to recognize 3.X.
+case "`uname -r`" in
+*3.*)  ccflags="$ccflags -DDEC_OSF1_3_X" ;;
+esac
 
 # If debugging or (old systems and doing shared)
 # then do not strip the lib, otherwise, strip.
@@ -286,7 +293,7 @@ esac
 # emulate_eaccess().
 
 # Fixed in V5.0A.
-case "`/usr/sbin/sizer -v`" in
+case "$myosvers" in
 *5.0[A-Z]*|*5.[1-9]*|*[6-9].[0-9]*)
        : ok
        ;;
@@ -341,13 +348,8 @@ EOF
        esac
 
        case "$usemymalloc" in
-       ''|'n') usemymalloc='n'
-               ;;
-       *)      # The FILLCHECK_DEADBEEF() are failing.
-               case "$ccflags" in
-               *-DFILL_CHECK_DEFAULT=*) ;;
-               *) ccflags="$ccflags -DFILL_CHECK_DEFAULT=0" ;;
-               esac
+       '')
+               usemymalloc='n'
                ;;
        esac
        # These symbols are renamed in <time.h> so
@@ -365,7 +367,7 @@ cat > UU/uselongdouble.cbu <<'EOCBU'
 # after it has prompted the user for whether to use long doubles.
 case "$uselongdouble" in
 $define|true|[yY]*)
-       case "`/usr/sbin/sizer -v`" in
+       case "$myosvers" in
        *[1-4].0*)      cat >&4 <<EOF
 
 ***
@@ -417,7 +419,7 @@ UGLY
 esac
 EOCBU
 
-case "`/usr/sbin/sizer -v`" in
+case "$myosvers" in
 *[1-4].0*) d_modfl=undef ;; # must wait till 5.0
 esac