X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/f3e3647f58abe84ab587df00172f93587eec8beb..45cbc99acbccce79a366aa4654806e11e6e67d42:/hints/aix.sh

diff --git a/hints/aix.sh b/hints/aix.sh
index bf1667b..a9d0715 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -1,25 +1,16 @@
 # hints/aix.sh
-# AIX 3.x.x hints thanks to Wayne Scott <wscott@ichips.intel.com>
-# AIX 4.1 hints thanks to Christopher Chan-Nui <channui@austin.ibm.com>.
-# AIX 4.1 pthreading by Christopher Chan-Nui <channui@austin.ibm.com> and
-#	  Jarkko Hietaniemi <jhi@iki.fi>.
-# AIX 4.3.x LP64 build by Steven Hirsch <hirschs@btv.ibm.com>
-# Merged on Mon Feb  6 10:22:35 EST 1995 by
-#   Andy Dougherty  <doughera@lafayette.edu>
 
-#
+# AIX 3 and AIX 4 are split off to aix_3.sh and aix_4.sh
+#    early Feb 2004 by H.Merijn Brand
+# please read comments in there for historic questions.
+#    many now stripped here
+
 # Contact dfavor@corridor.com for any of the following:
 #
 #    - AIX 43x and above support
 #    - gcc + threads support
 #    - socks support
 #
-# Apr 99 changes:
-#
-#    - use nm in AIX 43x and above
-#    - gcc + threads now builds
-#    [(added support for socks) Jul 99 SOCKS support rewritten]
-#
 # Notes:
 #
 #    - shared libperl support is tricky. if ever libperl.a ends up
@@ -45,29 +36,20 @@ d_setruid='undef'
 alignbytes=8
 
 case "$usemymalloc" in
-'')  usemymalloc='n' ;;
-esac
+    '')  usemymalloc='n' ;;
+    esac
+
+# malloc wrap works, but not in vac-5, see later
+case "$usemallocwrap" in
+    '') usemallocwrap='define' ;;
+    esac
 
 # Intuiting the existence of system calls under AIX is difficult,
 # at best; the safest technique is to find them empirically.
 
-# AIX 4.3.* and above default to letting Configure test if nm
-# extraction will work.
-case "$osvers" in
-   3.*|4.1.*|4.2.*)
-      case "$usenm" in
-	  '') usenm='undef'
-	  esac
-      case "$usenativedlopen" in
-	  '') usenativedlopen='false'
-	  esac
-      ;;
-   *)
-      case "$usenativedlopen" in
-	  '') usenativedlopen='true'
-	  esac
-      ;;
-esac
+case "$usenativedlopen" in
+    '') usenativedlopen='true' ;;
+    esac
 
 so="a"
 # AIX itself uses .o (libc.o) but we prefer compatibility
@@ -80,52 +62,37 @@ dlext="so"
 # environment, we can override it later.  If set for 64, the
 # 'sizeof' test sees a native 64-bit architecture and never looks back.
 case "$OBJECT_MODE" in
-32)
-    cat >&4 <<EOF
+    32) cat >&4 <<EOF
 
-You have OBJECT_MODE=32 set in the environment. 
+You have OBJECT_MODE=32 set in the environment.
 I take this as a hint you do not want to
 build for a 64-bit address space. You will be
 given the opportunity to change this later.
 EOF
-    ;;
-64)
-    cat >&4 <<EOF
+	;;
+    64) cat >&4 <<EOF
 
-You have OBJECT_MODE=64 set in the environment. 
+You have OBJECT_MODE=64 set in the environment.
 This forces a full 64-bit build.  If that is
 not what you intended, please terminate this
 program, unset it and restart.
 EOF
-    ;;
-*)  ;;
-esac
-
-# Trying to set this breaks the POSIX.c compilation
-
-# Make setsockopt work correctly.  See man page.
-# ccflags='-D_BSD=44'
+	;;
+    esac
 
 # uname -m output is too specific and not appropriate here
 case "$archname" in
-'') archname="$osname" ;;
-esac
+    '') archname="$osname" ;;
+    esac
 
 cc=${cc:-cc}
 
-case "$osvers" in
-3*) d_fchmod=undef
-    ccflags="$ccflags -D_ALL_SOURCE"
-    ;;
-*)  # These hints at least work for 4.x, possibly other systems too.
-    ccflags="$ccflags -D_ALL_SOURCE -D_ANSI_C_SOURCE -D_POSIX_SOURCE"
-    case "$cc" in
-     *gcc*) ;;
-     *) ccflags="$ccflags -qmaxmem=16384 -qnoansialias" ;;
+ccflags="$ccflags -D_ALL_SOURCE -D_ANSI_C_SOURCE -D_POSIX_SOURCE"
+case "$cc" in
+    *gcc*) ;;
+    *) ccflags="$ccflags -qmaxmem=-1 -qnoansialias" ;;
     esac
-    nm_opt='-B'
-    ;;
-esac
+nm_opt='-B'
 
 # These functions don't work like Perl expects them to.
 d_setregid='undef'
@@ -137,79 +104,51 @@ d_setreuid='undef'
 cccdlflags='none'	# All AIX code is position independent
    cc_type=xlc		# do not export to config.sh
 case "$cc" in
-*gcc*)
-   cc_type=gcc
-   ccdlflags='-Xlinker'
-   if [ "X$gccversion" = "X" ]; then
-     # Done too late in Configure if hinted
-     gccversion=`$cc --version | sed 's/.*(GCC) *//'`
-     fi
-   ;;
-*) ccversion=`lslpp -L | grep 'C for AIX Compiler$' | grep -v '\.msg\.[A-Za-z_]*\.' | awk '{print $1,$2}'`
-   case "$ccversion" in
-     '') ccversion=`lslpp -L | grep 'IBM C and C++ Compilers LUM$'`
-	 ;;
-     *.*.*.*.*.*.*)		# Ahhrgg, more than one C compiler installed
-	 first_cc_path=`which ${cc:-cc}`
-	 case "$first_cc_path" in
-	   *vac*)
-	     cc_type=vac ;;
-	   /usr/bin/cc)		# Check the symlink
-	     if [ -h $first_cc_path ] ; then
-	       ls -l $first_cc_path > reflect
-	       if grep -i vac reflect >/dev/null 2>&1 ; then
-		 cc_type=vac
-		 fi
-	       rm -f reflect
-	       fi
-	     ;;
-	   esac
-	 ccversion=`lslpp -L | grep 'C for AIX Compiler$' | grep -i $cc_type | head -1`
-	 ;;
-     vac*.*.*.*)
-         cc_type=vac
-	 ;;
-     esac
-   ccversion=`echo "$ccversion" | awk '{print $2}'`
-   case "$ccversion" in
-     3.6.6.0)
-	optimize='none'
-	;;
-     4.4.0.0|4.4.0.1|4.4.0.2)
-	cat >&4 <<EOF
-***
-*** This C compiler ($ccversion) is outdated.
-***
-*** Please upgrade to at least 4.4.0.3.
-***
-EOF
-	;;
-     5.0.0.0)
-	cat >&4 <<EOF
-***
-*** This C compiler ($ccversion) is known to have too many optimizer
-*** bugs to compile a working Perl.
-***
-*** Consider upgrading your C compiler, or getting the GNU cc (gcc).
-***
-*** Cannot continue, aborting.
-EOF
-	exit 1
+    *gcc*)
+	cc_type=gcc
+	ccdlflags='-Xlinker'
+	if [ "X$gccversion" = "X" ]; then
+	    # Done too late in Configure if hinted
+	    gccversion=`$cc -dumpversion`
+	    fi
 	;;
-     5.0.1.0)
-	cat >&4 <<EOF
-***
-*** This C compiler ($ccversion) is known to have optimizer problems
-*** when compiling regcomp.c.
-***
-*** Disabling optimization for that file but consider upgrading
-*** your C compiler.
-***
-EOF
-regcomp_cflags='optimize='
+
+    *)  ccversion=`lslpp -ql -Ou vac.C | grep -v '^Path' | head -1 | awk '{print $1,$2}'`
+	case "$ccversion" in
+	    '') ccversion=`lslpp -L | grep 'IBM C and C++ Compilers LUM$'` ;;
+
+	    *.*.*.*.*.*.*)	# Ahhrgg, more than one C compiler installed
+		first_cc_path=`which ${cc:-cc}`
+		case "$first_cc_path" in
+		    *vac*)
+			cc_type=vac ;;
+
+		    /usr/bin/cc)		# Check the symlink
+			if [ -h $first_cc_path ] ; then
+			    ls -l $first_cc_path > reflect
+			    if grep -i vac reflect >/dev/null 2>&1 ; then
+				cc_type=vac
+				fi
+			    rm -f reflect
+			    fi
+			;;
+		    esac
+		ccversion=`lslpp -L | grep 'C for AIX Compiler$' | grep -i $cc_type | head -1`
+		;;
+
+	    vac*.*.*.*)
+		cc_type=vac
+		;;
+	    esac
+
+	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
-esac
+    esac
+
 # the required -bE:$installarchlib/CORE/perl.exp is added by
 # libperl.U (Configure) later.
 
@@ -218,14 +157,11 @@ esac
 # -bI:$(PERL_INC)/perl.exp  Read the exported symbols from the perl binary
 # -bE:$(BASEEXT).exp	    Export these symbols.  This file contains only one
 #			    symbol: boot_$(EXP)	 can it be auto-generated?
-case "$osvers" in
-    3*) 
-	lddlflags="$lddlflags -H512 -T512 -bhalt:4 -bM:SRE -bI:\$(PERL_INC)/perl.exp -bE:\$(BASEEXT).exp -e _nostart -lc"
-	;;
-    *) 
-	lddlflags="$lddlflags -bhalt:4 -bM:SRE -bI:\$(PERL_INC)/perl.exp -bE:\$(BASEEXT).exp -bnoentry -lc"
-	;;
-    esac
+if test $usenativedlopen = 'true' ; then
+    lddlflags="$lddlflags -bhalt:4 -bexpall -G -bnoentry -lc"
+else
+    lddlflags="$lddlflags -bhalt:4 -bM:SRE -bI:\$(PERL_INC)/perl.exp -bE:\$(BASEEXT).exp -bnoentry -lc"
+    fi
 
 case "$use64bitall" in
     $define|true|[yY]*) use64bitint="$define" ;;
@@ -244,15 +180,17 @@ case $cc_type in
 		lddlflags=`echo "$lddlflags " | sed -e 's/ -lc / -lc128 -lc /'`
 		;;
 	    esac
+	;;
     esac
 
 case "$cc" in
-*gcc*) ;;
-cc*|xlc*) # cc should've been set by line 116 or so if empty.
+    *gcc*) ;;
+
+    cc*|xlc*) # cc should've been set by line 116 or so if empty.
 	if test ! -x /usr/bin/$cc -a -x /usr/vac/bin/$cc; then
-		case ":$PATH:" in
+	    case ":$PATH:" in
 		*:/usr/vac/bin:*) ;;
-		*) if test ! -x /QOpenSys/usr/bin/$cc; then
+		*)  if test ! -x /QOpenSys/usr/bin/$cc; then
 			# The /QOpenSys/usr/bin/$cc saves us if we are
 			# building natively in OS/400 PASE.
 			cat >&4 <<EOF
@@ -265,218 +203,166 @@ cc*|xlc*) # cc should've been set by line 116 or so if empty.
 ***
 EOF
 			exit 1
-		   fi 
-		   ;;
+			fi
+		    ;;
 		esac
-	fi
+	    fi
 	;;
-esac
+    esac
 
 case "$ldlibpthname" in
-'') ldlibpthname=LIBPATH ;;
-esac
-
-# AIX 4.2 (using latest patchlevels on 20001130) has a broken bind
-# library (getprotobyname and getprotobynumber are outversioned by
-# the same calls in libc, at least for xlc version 3...
-case "`oslevel`" in
-    4.2.1.*)
-      case "$ccversion" in    # Don't know if needed for gcc
-          3.1.4.*|5.0.2.*)    # libswanted "bind ... c ..." => "... c bind ..."
-              set `echo X "$libswanted "| sed -e 's/ bind\( .*\) \([cC]\) / \1 \2 bind /'`
-              shift
-              libswanted="$*"
-              ;;
-          esac
-      ;;
+    '') ldlibpthname=LIBPATH ;;
     esac
 
-# This script UU/usethreads.cbu will get 'called-back' by Configure 
+# This script UU/usethreads.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use threads.
 cat > UU/usethreads.cbu <<'EOCBU'
 case "$usethreads" in
-$define|true|[yY]*)
+    $define|true|[yY]*)
+	d_drand48_r='undef'
+	d_endgrent_r='undef'
+	d_endpwent_r='undef'
+	d_getgrent_r='undef'
+	d_getpwent_r='undef'
+	d_random_r='undef'
+	d_setgrent_r='undef'
+	d_setpwent_r='undef'
+	d_srand48_r='undef'
+	d_strerror_r='undef'
+
 	ccflags="$ccflags -DNEED_PTHREAD_INIT"
 	case "$cc" in
-	*gcc*)
-	    ccflags="-D_THREAD_SAFE $ccflags"
-	    echo "GCC $gccversion disabling some _r functions" >&4
-	    case "$gccversion" in
-		3*) d_drand48_r='undef'
-		    d_endgrent_r='undef'
-		    d_endpwent_r='undef'
-		    d_getgrent_r='undef'
-		    d_getpwent_r='undef'
-		    d_random_r='undef'
-		    d_srand48_r='undef'
-		    d_strerror_r='undef'
-		    ;;
-		esac
-	    ;;
-	cc_r) ;;
-	cc|xl[cC]_r) 
-	    echo >&4 "Switching cc to cc_r because of POSIX threads."
-	    # xlc_r has been known to produce buggy code in AIX 4.3.2.
-	    # (e.g. pragma/overload core dumps)	 Let's suspect xlC_r, too.
-	    # --jhi@iki.fi
-	    cc=cc_r
-
-	    case "`oslevel`" in
-		4.2.1.*) i_crypt='undef' ;;
-		esac
-	    ;;
-	'') 
-	    cc=cc_r
-	    ;;
-	*)
-	    cat >&4 <<EOM
+	    *gcc*) ccflags="-D_THREAD_SAFE $ccflags" ;;
+
+	    cc_r) ;;
+	    '') cc=cc_r ;;
+
+	    *)
+
+
+	    # No | alternation in aix sed. :-(
+	    newcc=`echo $cc | sed -e 's/cc$/cc_r/' -e 's/xl[cC]$/cc_r/' -e 's/xl[cC]_r$/cc_r/'`
+	    case "$newcc" in
+		$cc) # No change
+		;;
+
+		*cc_r)
+		echo >&4 "Switching cc to cc_r because of POSIX threads."
+		# xlc_r has been known to produce buggy code in AIX 4.3.2.
+		# (e.g. pragma/overload core dumps)	 Let's suspect xlC_r, too.
+		# --jhi@iki.fi
+		cc="$newcc"
+		;;
+
+		*)
+		cat >&4 <<EOM
 *** For pthreads you should use the AIX C compiler cc_r.
 *** (now your compiler was set to '$cc')
 *** Cannot continue, aborting.
 EOM
-	    exit 1
-	    ;;
+		exit 1
+		;;
+	    esac
 	esac
 
-	# c_rify libswanted.
-	set `echo X "$libswanted "| sed -e 's/ \([cC]\) / \1_r /g'`
-	shift
-	libswanted="$*"
-	# c_rify lddlflags.
-	set `echo X "$lddlflags "| sed -e 's/ \(-l[cC]\) / \1_r /g'`
-	shift
-	lddlflags="$*"
-
 	# Insert pthreads to libswanted, before any libc or libC.
-	set `echo X "$libswanted "| sed -e 's/ \([cC]_r\) / pthreads \1 /'`
+	set `echo X "$libswanted "| sed -e 's/ \([cC]\) / pthreads \1 /'`
 	shift
 	libswanted="$*"
 	# Insert pthreads to lddlflags, before any libc or libC.
-	set `echo X "$lddlflags " | sed -e 's/ \(-l[cC]_r\) / -lpthreads \1 /'`
+	set `echo X "$lddlflags " | sed -e 's/ \(-l[cC]\) / -lpthreads \1 /'`
 	shift
 	lddlflags="$*"
-
 	;;
 esac
 EOCBU
 
-# This script UU/uselargefiles.cbu will get 'called-back' by Configure 
+# This script UU/uselargefiles.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to use large files.
 cat > UU/uselargefiles.cbu <<'EOCBU'
 case "$uselargefiles" in
-''|$define|true|[yY]*)
-    # Configure should take care of use64bitint and use64bitall being
-    # defined before uselargefiles.cbu is consulted.
-    if test X"$use64bitint:$quadtype" = X"$define:long" -o X"$use64bitall" = Xdefine; then
+    ''|$define|true|[yY]*)
+	# Configure should take care of use64bitint and use64bitall being
+	# defined before uselargefiles.cbu is consulted.
+	if test X"$use64bitint:$quadtype" = X"$define:long" -o X"$use64bitall" = Xdefine; then
 # Keep these at the left margin.
 ccflags_uselargefiles="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
 ldflags_uselargefiles="`getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
-    else
+	else
 # Keep these at the left margin.
 ccflags_uselargefiles="`getconf XBS5_ILP32_OFFBIG_CFLAGS 2>/dev/null`"
 ldflags_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LDFLAGS 2>/dev/null`"
-    fi
-	# _Somehow_ in AIX 4.3.1.0 the above getconf call manages to
-	# insert(?) *something* to $ldflags so that later (in Configure) evaluating
-	# $ldflags causes a newline after the '-b64' (the result of the getconf).
-	# (nothing strange shows up in $ldflags even in hexdump;
-	#  so it may be something (a bug) in the shell, instead?)
-	# Try it out: just uncomment the below line and rerun Configure:
-# echo >&4 "AIX 4.3.1.0 $ldflags_uselargefiles mystery" ; exit 1
-	# Just don't ask me how AIX does it, I spent hours wondering.
-	# Therefore the line re-evaluating ldflags_uselargefiles: it seems to fix
-	# the whatever it was that AIX managed to break. --jhi
-	ldflags_uselargefiles="`echo $ldflags_uselargefiles`"
-    if test X"$use64bitint:$quadtype" = X"$define:long" -o X"$use64bitall" = Xdefine; then
+	    fi
+	if test X"$use64bitint:$quadtype" = X"$define:long" -o X"$use64bitall" = Xdefine; then
 # Keep this at the left margin.
 libswanted_uselargefiles="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
-    else
+	else
 # Keep this at the left margin.
 libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
-    fi
+	    fi
+
 	case "$ccflags_uselargefiles$ldflags_uselargefiles$libs_uselargefiles" in
-	'');;
-	*) ccflags="$ccflags $ccflags_uselargefiles"
-	   ldflags="$ldflags $ldflags_uselargefiles"
-	   libswanted="$libswanted $libswanted_uselargefiles"
-	   ;;
-	esac
-	case "$gccversion" in
-	'') ;;
-	*) # Remove xlc-spefific -qflags.
-	   ccflags="`echo $ccflags | sed -e 's@ -q[^ ]*@ @g' -e 's@^-q[^ ]* @@g'`"
-	   ldflags="`echo $ldflags | sed -e 's@ -q[^ ]*@ @g' -e 's@^-q[^ ]* @@g'`"
-	   # Move xld-spefific -bflags.
-	   ccflags="`echo $ccflags | sed -e 's@ -b@ -Wl,-b@g'`"
-	   ldflags="`echo ' '$ldflags | sed -e 's@ -b@ -Wl,-b@g'`"
-	   lddlflags="`echo ' '$lddlflags | sed -e 's@ -b@ -Wl,-b@g'`"
-	   ld='gcc'
-	   echo >&4 "(using ccflags   $ccflags)"
-	   echo >&4 "(using ldflags   $ldflags)"
-	   echo >&4 "(using lddlflags $lddlflags)"
-	   ;; 
-        esac
-        ;;
-esac
-EOCBU
+	    '') ;;
+	    *)  ccflags="$ccflags $ccflags_uselargefiles"
+		ldflags="$ldflags $ldflags_uselargefiles"
+		libswanted="$libswanted $libswanted_uselargefiles"
+		;;
+	    esac
 
-# This script UU/use64bitint.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use 64 bit integers.
-cat > UU/use64bitint.cbu <<'EOCBU'
-case "$use64bitint" in
-$define|true|[yY]*)
-	    case "`oslevel`" in
-	    3.*|4.[012].*)
-		cat >&4 <<EOM
-AIX `oslevel` does not support 64-bit interfaces.
-You should upgrade to at least AIX 4.3.
-EOM
-		exit 1
+	case "$gccversion" in
+	    '') ;;
+	    *)  # Remove xlc-specific -qflags.
+		ccflags="`echo $ccflags | sed -e 's@ -q[^ ]*@ @g' -e 's@^-q[^ ]* @@g'`"
+		ldflags="`echo $ldflags | sed -e 's@ -q[^ ]*@ @g' -e 's@^-q[^ ]* @@g'`"
+		# Move xlc-specific -bflags.
+		ccflags="`echo $ccflags | sed -e 's@ -b@ -Wl,-b@g'`"
+		ldflags="`echo ' '$ldflags | sed -e 's@ -b@ -Wl,-b@g'`"
+		lddlflags="`echo ' '$lddlflags | sed -e 's@ -b@ -Wl,-b@g'`"
+		lddlflags="`echo ' '$lddlflags | sed -e 's@ -G @ -Wl,-G @g'`"
+		case "$use64bitall" in
+		    $define|true|[yY]*) ld="$cc -maix64"	;;
+		    *)			ld="$cc"		;;
+		    esac
+		echo >&4 "(using ccflags   $ccflags)"
+		echo >&4 "(using ldflags   $ldflags)"
+		echo >&4 "(using lddlflags $lddlflags)"
 		;;
 	    esac
-	    ;;
-esac
+	;;
+    esac
 EOCBU
 
 cat > UU/use64bitall.cbu <<'EOCBU'
-# This script UU/use64bitall.cbu will get 'called-back' by Configure 
+# This script UU/use64bitall.cbu will get 'called-back' by Configure
 # after it has prompted the user for whether to be maximally 64-bitty.
 case "$use64bitall" in
-$define|true|[yY]*)
-	    case "`oslevel`" in
-	    3.*|4.[012].*)
-		cat >&4 <<EOM
-AIX `oslevel` does not support 64-bit interfaces.
-You should upgrade to at least AIX 4.3.
-EOM
-		exit 1
-		;;
-	    esac
-	    echo " "
-	    echo "Checking the CPU width of your hardware..." >&4
-	    $cat >size.c <<EOCP
+    $define|true|[yY]*)
+	echo " "
+	echo "Checking the CPU width of your hardware..." >&4
+	$cat >size.c <<EOCP
 #include <stdio.h>
 #include <sys/systemcfg.h>
 int main (void)
 {
-  printf("%d\n",_system_configuration.width);
-  return(0);
-}
+    printf ("%d\n", _system_configuration.width);
+    return (0);
+    }
 EOCP
-	    set size
-	    if eval $compile_ok; then
-		qacpuwidth=`./size`
-		echo "You are running on $qacpuwidth bit hardware."
-	    else
-		dflt="32"
-		echo " "
-		echo "(I can't seem to compile the test program.  Guessing...)"
-		rp="What is the width of your CPU (in bits)?"
-		. ./myread
-		qacpuwidth="$ans"
+	set size
+	if eval $compile_ok; then
+	    qacpuwidth=`./size`
+	    echo "You are running on $qacpuwidth bit hardware."
+	else
+	    dflt="32"
+	    echo " "
+	    echo "(I can't seem to compile the test program.  Guessing...)"
+	    rp="What is the width of your CPU (in bits)?"
+	    . ./myread
+	    qacpuwidth="$ans"
 	    fi
-	    $rm -f size.c size
-	    case "$qacpuwidth" in
+	$rm -f size.c size
+
+	case "$qacpuwidth" in
 	    32*)
 		cat >&4 <<EOM
 Bzzzt! At present, you can only perform a
@@ -485,90 +371,102 @@ EOM
 		exit 1
 		;;
 	    esac
-	    qacflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
-	    qaldflags="`getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
-	    # See jhi's comments above regarding this re-eval.  I've
-	    # seen similar weirdness in the form of:
-	    #
+	qacflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`"
+	qaldflags="`getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`"
+	# See jhi's comments above regarding this re-eval.  I've
+	# seen similar weirdness in the form of:
+	#
 # 1506-173 (W) Option lm is not valid.  Enter xlc for list of valid options.
-	    #
-	    # error messages from 'cc -E' invocation. Again, the offending
-	    # string is simply not detectable by any means.  Since it doesn't
-	    # do any harm, I didn't pursue it. -- sh
-	    qaldflags="`echo $qaldflags`"
-	    qalibs="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
-	    # -q32 and -b32 may have been set by uselargefiles or user.
-    	    # Remove them.
-	    ccflags="`echo $ccflags | sed -e 's@-q32@@'`"
-	    ldflags="`echo $ldflags | sed -e 's@-b32@@'`"
-	    # Tell archiver to use large format.  Unless we remove 'ar'
-	    # from 'trylist', the Configure script will just reset it to 'ar'
-	    # immediately prior to writing config.sh.  This took me hours
-	    # to figure out.
-	    trylist="`echo $trylist | sed -e 's@^ar @@' -e 's@ ar @ @g' -e 's@ ar$@@'`"
-	    ar="ar -X64"
-	    nm_opt="-X64 $nm_opt"
-	    # Note: Placing the 'qacflags' variable into the 'ldflags' string
-	    # is NOT a typo.  ldflags is passed to the C compiler for final
-	    # linking, and it wants -q64 (-b64 is for ld only!).
-	    case "$qacflags$qaldflags$qalibs" in
-	    '');;
-	    *) ccflags="$ccflags $qacflags"
-	       ldflags="$ldflags $qacflags"
-	       lddlflags="$qaldflags $lddlflags"
-	       libswanted="$libswanted $qalibs"
-	       ;;
+	#
+	# error messages from 'cc -E' invocation. Again, the offending
+	# string is simply not detectable by any means.  Since it doesn't
+	# do any harm, I didn't pursue it. -- sh
+	qaldflags="`echo $qaldflags`"
+	qalibs="`getconf XBS5_LP64_OFF64_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+	# -q32 and -b32 may have been set by uselargefiles or user.
+	# Remove them.
+	ccflags="`echo $ccflags | sed -e 's@-q32@@'`"
+	ldflags="`echo $ldflags | sed -e 's@-b32@@'`"
+	case "$cc" in
+	    *gcc*)
+		ccflags="`echo $ccflags | sed -e 's@-q64@-maix64@'`"
+		ccflags_uselargefiles="`echo $ccflags_uselargefiles | sed -e 's@-q64@-maix64@'`"
+		qacflags="`echo $qacflags | sed -e 's@-q64@-maix64@'`"
+		;;
+	    esac
+	# Tell archiver to use large format.  Unless we remove 'ar'
+	# from 'trylist', the Configure script will just reset it to 'ar'
+	# immediately prior to writing config.sh.  This took me hours
+	# to figure out.
+	trylist="`echo $trylist | sed -e 's@^ar @@' -e 's@ ar @ @g' -e 's@ ar$@@'`"
+	ar="ar -X64"
+	nm_opt="-X64 $nm_opt"
+	# Note: Placing the 'qacflags' variable into the 'ldflags' string
+	# is NOT a typo.  ldflags is passed to the C compiler for final
+	# linking, and it wants -q64 (-b64 is for ld only!).
+	case "$qacflags$qaldflags$qalibs" in
+	    '') ;;
+	    *)  ccflags="$ccflags $qacflags"
+		ldflags="$ldflags $qacflags"
+		lddlflags="$qaldflags $lddlflags"
+		libswanted="$libswanted $qalibs"
+		;;
 	    esac
-	    case "$ccflags" in
+	case "$ccflags" in
 	    *-DUSE_64_BIT_ALL*) ;;
-      	    *) ccflags="$ccflags -DUSE_64_BIT_ALL";;
+	    *) ccflags="$ccflags -DUSE_64_BIT_ALL";;
 	    esac
-	    case "$archname64" in
+	case "$archname64" in
 	    ''|64*) archname64=64all ;;
 	    esac
-	    longsize="8"
-	    qacflags=''
-	    qaldflags=''
-	    qalibs=''
-	    qacpuwidth=''
-	    ;;
-esac
+	longsize="8"
+	qacflags=''
+	qaldflags=''
+	qalibs=''
+	qacpuwidth=''
+	;;
+    esac
 EOCBU
 
-if test $usenativedlopen = 'true'
-then
+if test $usenativedlopen = 'true' ; then
     ccflags="$ccflags -DUSE_NATIVE_DLOPEN"
+    # -brtl		    Enables a binary to use run time linking
+    # -bdynamic		    When used with -brtl, tells linker to search for
+    #			    ".so"-suffix libraries as well as ".a" suffix
+    #			    libraries. AIX allows both .so and .a libraries to
+    #			    contain dynamic shared objects.
+    # -bmaxdata:0x80000000  This increases the size of heap memory available
+    #			    to perl. Default is 256 MB, which sounds large but
+    #			    caused a software vendor problems. So this sets
+    #			    heap to 2 GB maximum. Anything higher and you'd
+    #			    want to consider 64 bit perl.
     case "$cc" in
-      *gcc*) ldflags="$ldflags -Wl,-brtl" ;;
-      *)     ldflags="$ldflags -brtl" ;;
-      esac
-else
-    case `oslevel` in
-	4.2.*)	;;	# libC_r has broke gettimeofday
-        *)  # If the C++ libraries, libC and libC_r, are available we will
-	    # prefer them over the vanilla libc, because the libC contain
-	    # loadAndInit() and terminateAndUnload() which work correctly
-	    # with C++ statics while libc load() and unload() do not. See
-	    # ext/DynaLoader/dl_aix.xs. The C-to-C_r switch is done by
-	    # usethreads.cbu, if needed.
-	    if test -f /lib/libC.a -a X"`$cc -v 2>&1 | grep gcc`" = X; then
-		# Cify libswanted.
-		set `echo X "$libswanted "| sed -e 's/ c / C c /'`
-		shift
-		libswanted="$*"
-		# Cify lddlflags.
-		set `echo X "$lddlflags "| sed -e 's/ -lc / -lC -lc /'`
-		shift
-		lddlflags="$*"
-	    fi
+	*gcc*) ldflags="$ldflags -Wl,-brtl -Wl,-bdynamic -Wl,-bmaxdata:0x80000000" ;;
+	*)     ldflags="$ldflags -brtl -bdynamic -bmaxdata:0x80000000" ;;
 	esac
-fi
+elif test -f /lib/libC.a -a X"`$cc -v 2>&1 | grep gcc`" = X; then
+    # If the C++ libraries, libC and libC_r, are available we will
+    # prefer them over the vanilla libc, because the libC contain
+    # loadAndInit() and terminateAndUnload() which work correctly
+    # with C++ statics while libc load() and unload() do not. See
+    # ext/DynaLoader/dl_aix.xs. The C-to-C_r switch is done by
+    # usethreads.cbu, if needed.
+
+    # Cify libswanted.
+    set `echo X "$libswanted "| sed -e 's/ c / C c /'`
+    shift
+    libswanted="$*"
+    # Cify lddlflags.
+    set `echo X "$lddlflags "| sed -e 's/ -lc / -lC -lc /'`
+    shift
+    lddlflags="$*"
+    fi
 
 case "$PASE" in
-define)
+    define)
 	case "$prefix" in
-	'') prefix=/QOpenSys/perl ;;
-	esac
+	    '') prefix=/QOpenSys/perl ;;
+	    esac
 	cat >&4 <<EOF
 
 ***
@@ -592,9 +490,9 @@ EOF
 	# V5R1 tries to use code compiled assuming fchdir(),
 	# lots of grief will issue forth from Cwd.
 	case "$d_fchdir" in
-	'') d_fchdir="$undef" ;;
-	esac
+	    '') d_fchdir="$undef" ;;
+	    esac
 	;;
-esac
+    esac
 
 # EOF