X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Faix.sh;h=35ee662350ad442685ff7717e386a20d1637e770;hb=8364ae4d1547eeb0d46e6f2c35b9c230722f7963;hp=d78494b2ee13a400ed01bd9a866cbccdd87e5675;hpb=2122fbb53312ecefb8aaa281765cdb7bcecb945a;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/aix.sh b/hints/aix.sh
index d78494b..35ee662 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -3,6 +3,7 @@
 # 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@lafcol.lafayette.edu>
 
@@ -67,6 +68,31 @@ so="a"
 # Stephanie Beals <bealzy@us.ibm.com>
 dlext="so"
 
+# Take possible hint from the environment.  If 32-bit is set in the
+# 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
+
+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
+
+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.
@@ -102,6 +128,20 @@ d_setreuid='undef'
 # Tell perl which symbols to export for dynamic linking.
 case "$cc" in
 *gcc*) ccdlflags='-Xlinker' ;;
+*) ccversion=`lslpp -L | grep 'C for AIX Compiler$' | awk '{print $2}'`
+   case "$ccversion" in
+     '') ccversion=`lslpp -L | grep 'IBM C and C++ Compilers LUM$' | awk '{print $2}'`
+	;;
+     esac
+   case "$ccversion" in
+     3.6.6.0)
+	optimize='none'
+	;;
+     4.4.0.0|4.4.0.1|4.4.0.2)
+	echo >&4 "*** This C compiler ($ccversion) is outdated."
+	echo >&4 "*** Please upgrade to at least 4.4.0.3."
+	;;
+     esac
 esac
 # the required -bE:$installarchlib/CORE/perl.exp is added by
 # libperl.U (Configure) later.
@@ -145,9 +185,9 @@ $define|true|[yY]*)
 	    ;;
 	*)
 	    cat >&4 <<EOM
-For pthreads you should use the AIX C compiler cc_r.
-(now your compiler was set to '$cc')
-Cannot continue, aborting.
+*** For pthreads you should use the AIX C compiler cc_r.
+*** (now your compiler was set to '$cc')
+*** Cannot continue, aborting.
 EOM
 	    exit 1
 	    ;;
@@ -175,71 +215,185 @@ EOM
 esac
 EOCBU
 
-# This script UU/uselfs.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/uselfs.cbu <<'EOCBU'
+cat > UU/uselargefiles.cbu <<'EOCBU'
 case "$uselargefiles" in
-$define|true|[yY]*)
-	lfcflags="`getconf XBS5_ILP32_OFFBIG_CFLAGS 2>/dev/null`"
-	lfldflags="`getconf XBS5_ILP32_OFFBIG_LDFLAGS 2>/dev/null`"
+''|$define|true|[yY]*)
+# 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`"
 	# _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 in the shell, instead?)
+	#  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 $lfldflags mystery" ; exit 1
+# 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 lfldflags: it seems to fix
+	# Therefore the line re-evaluating ldflags_uselargefiles: it seems to fix
 	# the whatever it was that AIX managed to break. --jhi
-	lfldflags="`echo $lfldflags`"
-	lflibs="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
-	case "$lfcflags$lfldflags$lflibs" in
+	ldflags_uselargefiles="`echo $ldflags_uselargefiles`"
+# Keep this at the left margin.
+libswanted_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LIBS 2>/dev/null|sed -e 's@^-l@@' -e 's@ -l@ @g`"
+	case "$ccflags_uselargefiles$ldflags_uselargefiles$libs_uselargefiles" in
 	'');;
-	*) ccflags="$ccflags $lfcflags"
-	   ldflags="$ldflags $ldldflags"
-	   libswanted="$libswanted $lflibs"
+	*) ccflags="$ccflags $ccflags_uselargefiles"
+	   ldflags="$ldflags $ldflags_uselargefiles"
+	   libswanted="$libswanted $libswanted_uselargefiles"
 	   ;;
 	esac
-	lfcflags=''
-	lfldflags=''
-	lflibs=''
-	;;
+	case "$gccversion" in
+	'') ;;
+	*)
+	cat >&4 <<EOM
+
+*** Warning: gcc in AIX might not work with the largefile support of Perl
+*** (default since 5.6.0), this combination hasn't been tested.
+*** I will try, though.
+
+EOM
+	# 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'`"
+	echo >&4 "(using ccflags $ccflags)"
+	echo >&4 "(using ldflags $ldflags)"
+        ;; 
+        esac
+        ;;
 esac
 EOCBU
 
-# This script UU/use64bits.cbu will get 'called-back' by Configure 
-# after it has prompted the user for whether to use 64 bits.
-cat > UU/use64bits.cbu <<'EOCBU'
-case "$use64bits" in
+# 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.2.
+You should upgrade to at least AIX 4.3.
 EOM
 		exit 1
 		;;
 	    esac
+	    ;;
+esac
+EOCBU
+
+cat > UU/use64bitall.cbu <<'EOCBU'
+# 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
+#include <stdio.h>
+#include <sys/systemcfg.h>
+int main (void)
+{
+  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"
+	    fi
+	    $rm -f size.c size
+	    case "$qacpuwidth" in
+	    32*)
+		cat >&4 <<EOM
+Bzzzt! At present, you can only perform a
+full 64-bit build on a 64-bit machine.
+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:
+	    #
+# 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.  ldqalags 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"
+	       lddqalags="$qaldflags $lddqalags"
+	       libswanted="$libswanted $qalibs"
+	       ;;
+	    esac
 	    case "$ccflags" in
-	    *-DUSE_64_BITS*) ;;
-	    *) ccflags="$ccflags -DUSE_64_BITS" ;;
+	    *-DUSE_64_BIT_ALL*) ;;
+      	    *) ccflags="$ccflags -DUSE_64_BIT_ALL";;
+	    esac
+	    case "$archname64" in
+	    ''|64*) archname64=64all ;;
 	    esac
-	    # When a 64-bit cc becomes available $archname64
-	    # may need setting so that $archname gets it attached.
+	    longsize="8"
+	    # Don't try backwards compatibility
+	    bincompat="$undef"
+	    d_bincompat5005="$undef"
+	    qacflags=''
+	    qaldflags=''
+	    qalibs=''
+	    qacpuwidth=''
 	    ;;
 esac
 EOCBU
 
+cat > UU/uselongdouble.cbu <<'EOCBU'
 # This script UU/uselongdouble.cbu will get 'called-back' by Configure 
 # after it has prompted the user for whether to use long doubles.
-cat > UU/uselongdouble.cbu <<'EOCBU'
 case "$uselongdouble" in
 $define|true|[yY]*)
-	ccflags="$ccflags -qlongdouble"
+        case "$cc" in
+        *gcc*) ;;
+        *) ccflags="$ccflags -qlongdouble" ;;
+        esac
 	# The explicit cc128, xlc128, xlC128 are not needed,
 	# the -qlongdouble should do the trick. --jhi
+	d_Gconvert='sprintf((b),"%.*llg",(n),(x))'
 	;;
 esac
 EOCBU