From: H.Merijn Brand <h.m.brand@xs4all.nl>
Date: Mon, 26 Apr 2004 15:35:23 +0000 (+0200)
Subject: usemallocwrap works on AIX, but not with vac-5
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=88567e60ed3ba016aaedace3242715b8ab2023f7;p=p5sagit%2Fp5-mst-13.2.git

usemallocwrap works on AIX, but not with vac-5
From: "H.Merijn Brand" <h.m.brand@hccnet.nl>
Subject: Re: Perl 5.8.4 "panic: memory wrap" in miniperl on AIX 5.1
Message-Id: <20040426152951.A6C4.H.M.BRAND@hccnet.nl>

p4raw-id: //depot/perl@22743
---

diff --git a/hints/aix.sh b/hints/aix.sh
index 386da4d..29f2bdc 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -39,10 +39,10 @@ case "$usemymalloc" in
     '')  usemymalloc='n' ;;
     esac
 
-# malloc wrap works
+# malloc wrap works, but not in vac-5, see later
 case "$usemallocwrap" in
-'') usemallocwrap='define' ;;
-esac
+    '') usemallocwrap='define' ;;
+    esac
 
 # Intuiting the existence of system calls under AIX is difficult,
 # at best; the safest technique is to find them empirically.
@@ -143,6 +143,9 @@ case "$cc" in
 
 	ccversion=`echo "$ccversion" | awk '{print $2}'`
 	# Redbooks state AIX-5 only supports vac-5.0.2.0 and up
+	case "$ccversion" in
+	    5*) usemallocwrap='n' ;; # panic in miniperl
+	    esac
 	;;
     esac
 
diff --git a/hints/aix_4.sh b/hints/aix_4.sh
index c1a6742..35ae781 100755
--- a/hints/aix_4.sh
+++ b/hints/aix_4.sh
@@ -111,8 +111,7 @@ cc=${cc:-cc}
 ccflags="$ccflags -D_ALL_SOURCE -D_ANSI_C_SOURCE -D_POSIX_SOURCE"
 case "$cc" in
     *gcc*) ;;
-    *) ccflags="$ccflags -qmaxmem=-1 -qnoansialias"
-       usemallocwrap='n' ;;
+    *) ccflags="$ccflags -qmaxmem=-1 -qnoansialias" ;;
     esac
 nm_opt='-B'
 
@@ -205,6 +204,9 @@ EOF
 regcomp_cflags='optimize='
 		;;
 	    esac
+	case "$ccversion" in
+	    5*) usemallocwrap='n' ;; # causes panic in miniperl
+	    esac
     esac
 # the required -bE:$installarchlib/CORE/perl.exp is added by
 # libperl.U (Configure) later.