Integrate with Sarathy.

[perl5.git] / hints / irix_6.sh

diff --git a/hints/irix_6.sh b/hints/irix_6.sh
index 3344808..8be23ac 100644 (file)
--- a/hints/irix_6.sh
+++ b/hints/irix_6.sh
@@ -77,9 +77,19 @@ esac
 case "$cc" in
 *"cc -n32"*)
 
-       libscheck='case "`/usr/bin/file $xxx`" in
-*N32*) ;;
-*) xxx=/no/n32$xxx ;;
+       # If a library is requested to link against, make sure the
+       # objects in the library are of the same ABI we are compiling
+       # against. Albert Chin-A-Young <china@thewrittenword.com>
+       libscheck='case "$xxx" in
+*.a) /bin/ar p $xxx `/bin/ar t $xxx | /usr/bsd/head -1` >$$.o;
+  case "`/usr/bin/file $$.o`" in
+  *N32*) rm -f $$.o ;;
+  *) rm -f $$.o; xxx=/no/n32$xxx ;;
+  esac ;;
+*) case "`/usr/bin/file $xxx`" in
+  *N32*) ;;
+  *) xxx=/no/n32$xxx ;;
+  esac ;;
 esac'
 
        # NOTE: -L/usr/lib32 -L/lib32 are automatically selected by the linker
@@ -142,8 +152,17 @@ case "$cc" in
        ld=$cc
 
        # perl's malloc can return improperly aligned buffer
-       # usemymalloc='undef'
-malloc_cflags='ccflags="-DSTRICT_ALIGNMENT $ccflags"'
+       # which (under 5.6.0RC1) leads into really bizarre bus errors
+       # and freak test failures (lib/safe1 #18, for example),
+       # even more so with -Duse64bitall: for example lib/io_linenumtb.
+       # fails under the harness but succeeds when run separately,
+       # under make test pragma/warnings #98 fails, and lib/io_dir
+       # apparently coredumps (the last two don't happen under
+       # the harness.  Helmut Jarausch is seeing bus errors from
+        # miniperl, as was Scott Henry with snapshots from just before
+       # the RC1. --jhi
+       usemymalloc='undef'
+#malloc_cflags='ccflags="-DSTRICT_ALIGNMENT $ccflags"'
 
        nm_opt='-p'
        nm_so_opt='-p'
@@ -207,8 +226,8 @@ esac
 # Don't groan about unused libraries.
 ldflags="$ldflags -Wl,-woff,84"
 
-case "`uname -s`-`$cc -version 2>&1`" in
-IRIX64-*7.2.*) op_cflags='optimize=-O1' ;; # workaround for an optimizer bug
+case "`$cc -version 2>&1`" in
+*7.2.*) op_cflags='optimize=-O1' ;; # workaround for an optimizer bug
 esac
 
 # We don't want these libraries.