X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Faix.sh;h=40c7b66ae4011e18a6b87508ea4495d38dd4c54c;hb=6d6ae9622174ffaa5c3fb93887744deb77298e45;hp=5698036aee7d50d22f2c382b01d77e3317f3ffcd;hpb=61d42ce43847d6cea183d4f40e2921e53606f13f;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/hints/aix.sh b/hints/aix.sh
index 5698036..40c7b66 100644
--- a/hints/aix.sh
+++ b/hints/aix.sh
@@ -54,12 +54,20 @@ esac
 # AIX 4.3.* and above default to using nm for symbol extraction
 case "$osvers" in
    3.*|4.1.*|4.2.*)
-      usenm='undef'
-      usenativedlopen='false'
+      case "$usenm" in
+	  '') usenm='undef'
+	  esac
+      case "$usenativedlopen" in
+	  '') usenativedlopen='false'
+	  esac
       ;;
    *)
-      usenm='true'
-      usenativedlopen='true'
+      case "$usenm" in
+	  '') usenm='true'
+	  esac
+      case "$usenativedlopen" in
+	  '') usenativedlopen='true'
+	  esac
       ;;
 esac
 
@@ -152,14 +160,14 @@ EOF
      5.0.0.0)
 	cat >&4 <<EOF
 ***
-*** This C compiler ($ccversion) is known to have optimizer problems
-*** when compiling perl.c.
+*** This C compiler ($ccversion) is known to have too many optimizer
+*** bugs to compile a working Perl.
 ***
-*** Disabling optimization for that file but consider upgrading
-*** your C compiler.
+*** Consider upgrading your C compiler, or getting the GNU cc (gcc).
 ***
+*** Cannot continue, aborting.
 EOF
-perl_cflags='optimize='
+	exit 1
 	;;
      5.0.1.0)
 	cat >&4 <<EOF
@@ -249,11 +257,11 @@ EOM
 	lddlflags="$*"
 
 	# Insert pthreads to libswanted, before any libc or libC.
-	set `echo X "$libswanted "| sed -e 's/ \([cC]\) / pthreads \1 /'`
+	set `echo X "$libswanted "| sed -e 's/ \([cC]_r\) / pthreads \1 /'`
 	shift
 	libswanted="$*"
 	# Insert pthreads to lddlflags, before any libc or libC.
-	set `echo X "$lddlflags " | sed -e 's/ \(-l[cC]\) / -lpthreads \1 /'`
+	set `echo X "$lddlflags " | sed -e 's/ \(-l[cC]_r\) / -lpthreads \1 /'`
 	shift
 	lddlflags="$*"
 
@@ -266,9 +274,17 @@ EOCBU
 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
+# 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
 # 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).
@@ -280,8 +296,13 @@ ldflags_uselargefiles="`getconf XBS5_ILP32_OFFBIG_LDFLAGS 2>/dev/null`"
 	# 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
+# 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
 # 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
 	case "$ccflags_uselargefiles$ldflags_uselargefiles$libs_uselargefiles" in
 	'');;
 	*) ccflags="$ccflags $ccflags_uselargefiles"
@@ -304,9 +325,9 @@ EOM
         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'`"
+        ldflags="`echo ' '$ldflags | sed -e 's@ -b@ -Wl,-b@g'`"
+        lddlflags="`echo ' '$lddlflags | sed -e 's@ -b@ -Wl,-b@g'`"
         ld='gcc'
-        lddlflags="`echo $lddlflags | sed -e 's@ -b@ -Wl,-b@g'`"
         echo >&4 "(using ccflags   $ccflags)"
         echo >&4 "(using ldflags   $ldflags)"
         echo >&4 "(using lddlflags $lddlflags)"
@@ -448,24 +469,31 @@ EOCBU
 
 if test $usenativedlopen = 'true'
 then
-        ccflags="$ccflags -DUSE_NATIVE_DLOPEN"
-	ldflags="$ldflags -brtl"
+    ccflags="$ccflags -DUSE_NATIVE_DLOPEN"
+    case "$cc" in
+      *gcc*) ldflags="$ldflags -Wl,-brtl" ;;
+      *)     ldflags="$ldflags -brtl" ;;
+      esac
 else
-    # 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
+    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
+	esac
 fi
 
 # EOF