X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Faix.sh;h=a5313d49c75da796925afda66afeb01d86211b49;hb=531b886104fed3302a6d671985aba5e2f6420dd5;hp=2f19f1cebbaded8d3972d3d7cf243358877de2b0;hpb=2973cfbe08c1a80f4799b8b261fc8e722106e799;p=p5sagit%2Fp5-mst-13.2.git diff --git a/hints/aix.sh b/hints/aix.sh index 2f19f1c..a5313d4 100644 --- a/hints/aix.sh +++ b/hints/aix.sh @@ -53,11 +53,13 @@ esac # AIX 4.3.* and above default to using nm for symbol extraction case "$osvers" in - 3.*|4.1.*|4.2.*) + 3.*|4.1.*|4.2.*|4.3.0.*) usenm='undef' + usenativedlopen='false' ;; *) usenm='true' + usenativedlopen='true' ;; esac @@ -126,6 +128,7 @@ d_setreuid='undef' # Changes for dynamic linking by Wayne Scott # # Tell perl which symbols to export for dynamic linking. +cccdlflags='none' # All AIX code is position independent case "$cc" in *gcc*) ccdlflags='-Xlinker' ;; *) ccversion=`lslpp -L | grep 'C for AIX Compiler$' | awk '{print $2}'` @@ -189,14 +192,14 @@ case "$osvers" in 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 -b noentry -lc" + lddlflags="$lddlflags -bhalt:4 -bM:SRE -bI:\$(PERL_INC)/perl.exp -bE:\$(BASEEXT).exp -bnoentry -lc" ;; 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.*) # Test for xlc version too, should we? + 4.2.1.*) case "$ccversion" in # Don't know if needed for gcc 3.1.4.*) # libswanted "bind ... c ..." => "... c bind ..." set `echo X "$libswanted "| sed -e 's/ bind\( .*\) \([cC]\) / \1 \2 bind /'` @@ -263,9 +266,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). @@ -277,8 +288,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" @@ -299,8 +315,14 @@ 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)" + # Move xld-spefific -bflags. + ccflags="`echo $ccflags | sed -e 's@ -b@ -Wl,-b@g'`" + ldflags="`echo ' '$ldflags | 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)" ;; esac ;; @@ -430,31 +452,33 @@ cat > UU/uselongdouble.cbu <<'EOCBU' # after it has prompted the user for whether to use long doubles. case "$uselongdouble" in $define|true|[yY]*) - 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))' + # -qlongdouble for cc taken out on 20010522 cause it + # causes more trouble than it does any good --hmb + d_Gconvert='sprintf((b),"%.*llg",((int)(n)),(x))' ;; esac EOCBU -# 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="$*" +if test $usenativedlopen = 'true' +then + ccflags="$ccflags -DUSE_NATIVE_DLOPEN" + ldflags="$ldflags -brtl" +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 fi # EOF