X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fsolaris_2.sh;h=82e394123885fb7785331ad4bf65511e694d4e41;hb=696814337d4eac8d0663d5307d6e01964d1b2897;hp=c54148ba64d38e9971b854a6543636e608249939;hpb=68fed2afeea75342559d1bce2d459572bbdd23e4;p=p5sagit%2Fp5-mst-13.2.git diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh index c54148b..82e3941 100644 --- a/hints/solaris_2.sh +++ b/hints/solaris_2.sh @@ -24,7 +24,7 @@ d_suidsafe=${d_suidsafe:-define} # Be paranoid about nm failing to find symbols -mistrustnm=run +mistrustnm=${mistrustnm:-run} # Several people reported problems with perl's malloc, especially # when use64bitall is defined or when using gcc. @@ -32,6 +32,11 @@ mistrustnm=run # http://www.xray.mpe.mpg.de/mailing-lists/perl5-porters/2001-01/msg00465.html usemymalloc=${usemymalloc:-false} +# malloc wrap works +case "$usemallocwrap" in +'') usemallocwrap='define' ;; +esac + # Avoid all libraries in /usr/ucblib. # /lib is just a symlink to /usr/lib set `echo $glibpth | sed -e 's@/usr/ucblib@@' -e 's@ /lib @ @'` @@ -51,11 +56,11 @@ libswanted="$*" case "$archname" in '') if test -f /usr/bin/arch; then - archname=`/usr/bin/arch` - archname="${archname}-${osname}" + archname=`/usr/bin/arch` + archname="${archname}-${osname}" elif test -f /usr/ucb/arch; then - archname=`/usr/ucb/arch` - archname="${archname}-${osname}" + archname=`/usr/ucb/arch` + archname="${archname}-${osname}" fi ;; esac @@ -206,7 +211,10 @@ echo 'int main() { return 0; }' > try.c # Indent to avoid propagation to config.sh verbose=`${cc:-cc} -v -o try try.c 2>&1` -if echo "$verbose" | grep '^Reading specs from' >/dev/null 2>&1; then +# XXX TODO: 'specs' output changed from 'Reading specs from' in gcc-[23] to 'Using +# built-in specs' in gcc-4. Perhaps we should just use the same gcc test as +# in Configure to see if we're using gcc. +if echo "$verbose" | egrep '(Reading specs from)|(Using built-in specs)' >/dev/null 2>&1; then # # Using gcc. # @@ -238,9 +246,13 @@ END # Hmm. gcc doesn't call /usr/ccs/bin/ld directly, but it # does appear to be using it eventually. egcs-1.0.3's ld # wrapper does this. - # All Solaris versions of ld I've seen contain the magic + # Most Solaris versions of ld I've seen contain the magic # string used in the grep. : + elif echo "$verbose" | grep "Solaris Link Editors" >/dev/null 2>&1; then + # However some Solaris 8 versions prior to ld 5.8-1.286 contain + # this string instead. + : else # No evidence yet of /usr/ccs/bin/ld. Some versions # of egcs's ld wrapper call /usr/ccs/bin/ld in turn but @@ -248,9 +260,9 @@ END # (This may all depend on local configurations too.) # Recompute verbose with -Wl,-v to find GNU ld if present - verbose=`${cc:-cc} -v -Wl,-v -o try try.c 2>&1 | grep ld 2>&1` + verbose=`${cc:-cc} -Wl,-v -o try try.c 2>&1 | grep /ld 2>&1` - myld=`echo $verbose| grep ld | awk '/\/ld/ {print $1}'` + myld=`echo $verbose | awk '/\/ld/ {print $1}'` # This assumes that gcc's output will not change, and that # /full/path/to/ld will be the first word of the output. # Thus myld is something like /opt/gnu/sparc-sun-solaris2.5/bin/ld @@ -260,6 +272,10 @@ END grep "ld: Software Generation Utilities" >/dev/null 2>&1; then # Ok, /usr/ccs/bin/ld eventually does get called. : + elif ${myld:-ld} -V 2>&1 | + grep "Solaris Link Editors" >/dev/null 2>&1; then + # Ok, /usr/ccs/bin/ld eventually does get called. + : else echo "Found GNU ld='$myld'" >&4 cat <&2 @@ -334,20 +350,6 @@ END fi fi -# Check to see if the selected compiler and linker -# support the -z ignore, -z lazyload and -z combreloc flags. -echo "int main() { return(0); } " > try.c - zflgs='' -for zf in ignore lazyload combreloc; do - if ${cc:-cc} -o try try.c -z $zf > /dev/null 2>&1; then - zflgs="$zflgs -z $zf" - fi -done -if test -n "$zflgs"; then - ccdlflags="$ccdlflags $zflgs" - lddlflags="$lddlflags -G $zflgs" -fi - # as --version or ld --version might dump core. rm -f try try.c core EOCBU @@ -357,21 +359,35 @@ cat > UU/usethreads.cbu <<'EOCBU' # after it has prompted the user for whether to use threads. case "$usethreads" in $define|true|[yY]*) - ccflags="-D_REENTRANT $ccflags" - - sched_yield='yield' - set `echo X "$libswanted "| sed -e "s/ c / pthread c /"` - shift - libswanted="$*" - - # On Solaris 2.6 x86 there is a bug with sigsetjmp() and siglongjmp() - # when linked with the threads library, such that whatever positive - # value you pass to siglongjmp(), sigsetjmp() returns 1. - # Thanks to Simon Parsons for this report. - # Sun BugID is 4117946, "sigsetjmp always returns 1 when called by - # siglongjmp in a MT program". As of 19980622, there is no patch - # available. - cat >try.c <<'EOM' + ccflags="-D_REENTRANT $ccflags" + + # -lpthread overrides some lib C functions, so put it before c. + set `echo X "$libswanted "| sed -e "s/ c / pthread c /"` + shift + libswanted="$*" + + # sched_yield is available in the -lrt library. However, + # we can also pick up the equivalent yield() function in the + # normal C library. To avoid pulling in unnecessary + # libraries, we'll normally avoid sched_yield()/-lrt and + # just use yield(). However, we'll honor a command-line + # override : "-Dsched_yield=sched_yield". + # If we end up using sched_yield, we're going to need -lrt. + sched_yield=${sched_yield:-yield} + if test "$sched_yield" = "sched_yield"; then + set `echo X "$libswanted "| sed -e "s/ pthread / rt pthread /"` + shift + libswanted="$*" + fi + + # On Solaris 2.6 x86 there is a bug with sigsetjmp() and siglongjmp() + # when linked with the threads library, such that whatever positive + # value you pass to siglongjmp(), sigsetjmp() returns 1. + # Thanks to Simon Parsons for this report. + # Sun BugID is 4117946, "sigsetjmp always returns 1 when called by + # siglongjmp in a MT program". As of 19980622, there is no patch + # available. + cat >try.c <<'EOM' /* Test for sig(set|long)jmp bug. */ #include @@ -385,17 +401,10 @@ $define|true|[yY]*) siglongjmp(env, 2); } EOM - if test "`arch`" = i86pc -a `uname -r` = 5.6 && \ - ${cc:-cc} try.c -lpthread >/dev/null 2>&1 && ./a.out; then - d_sigsetjmp=$undef - cat << 'EOM' >&2 - -You will see a *** WHOA THERE!!! *** message from Configure for -d_sigsetjmp. Keep the recommended value. See hints/solaris_2.sh -for more information. - -EOM - fi + if test "`arch`" = i86pc -a `uname -r` = 5.6 && \ + ${cc:-cc} try.c -lpthread >/dev/null 2>&1 && ./a.out; then + d_sigsetjmp=$undef + fi # These prototypes should be visible since we using # -D_REENTRANT, but that does not seem to work. @@ -447,7 +456,15 @@ case "$usemorebits" in ;; esac -if test `uname -p` = "sparc"; then +if test `uname -p` = i386; then + case "$use64bitint" in + "$define"|true|[yY]*) + ccflags="$ccflags -DPTR_IS_LONG" + ;; + esac +fi + +if test `uname -p` = sparc -o `uname -p` = i386; then cat > UU/use64bitint.cbu <<'EOCBU' # This script UU/use64bitint.cbu will get 'called-back' by Configure # after it has prompted the user for whether to use 64 bit integers. @@ -462,15 +479,12 @@ EOM exit 1 ;; esac - ;; -esac + # gcc-2.8.1 on Solaris 8 with -Duse64bitint fails op/pat.t test 822 # if we compile regexec.c with -O. Turn off optimization for that one # file. See hints/README.hints , especially # =head2 Propagating variables to config.sh, method 3. # A. Dougherty May 24, 2002 -case "$use64bitint" in -"$define") case "${gccversion}-${optimize}" in 2.8*-O*) # Honor a command-line override (rather unlikely) @@ -500,15 +514,18 @@ EOM exit 1 ;; esac - libc='/usr/lib/sparcv9/libc.so' - if test ! -f $libc; then - cat >&4 <&4 </dev/null" in *gcc*) @@ -527,17 +544,20 @@ EOM exit 1 ;; esac - loclibpth="/usr/lib/sparcv9 $loclibpth" - ccflags="$ccflags -mcpu=v9 -m64" - if test X`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then - ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - fi - # no changes to ld flags, as (according to man ld): - # - # There is no specific option that tells ld to link 64-bit - # objects; the class of the first object that gets processed - # by ld determines whether it is to perform a 32-bit or a - # 64-bit link edit. + if test "$processor" = sparc; then + loclibpth="/usr/lib/sparcv9 $loclibpth" + ccflags="$ccflags -mcpu=v9" + fi + ccflags="$ccflags -m64" + + # This adds in -Wa,-xarch=v9. I suspect that's superfluous, + # since the -m64 above should do that already. Someone + # with gcc-3.x.x, please test with gcc -v. A.D. 20-Nov-2003 +# if test $processor = sparc -a X`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null` != X; then +# ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" +# fi + ldflags="$ldflags -m64" + lddlflags="$lddlflags -G -m64" ;; *) ccflags="$ccflags `getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" @@ -545,10 +565,13 @@ EOM lddlflags="$lddlflags -G `getconf XBS5_LP64_OFF64_LDFLAGS 2>/dev/null`" echo "int main() { return(0); } " > try.c tryworkshopcc="${cc:-cc} try.c -o try $ccflags" - loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 `$getworkshoplibs` $loclibpth" + if test "$processor" = sparc; then + loclibpth="/usr/lib/sparcv9 /usr/ccs/lib/sparcv9 $loclibpth" + fi + loclibpth="`$getworkshoplibs` $loclibpth" ;; esac - + unset processor use64bitall_done=yes archname64=64 ;; @@ -591,4 +614,33 @@ EOM esac EOCBU +# +# If unsetenv is available, use it in conjunction with PERL_USE_SAFE_PUTENV to +# work around Sun bugid 6333830. Both unsetenv and 6333830 only appear in +# Solaris 10, so we don't need to probe explicitly for an OS version. We have +# to append this test to the end of config.over as it needs to run after +# Configure has probed for unsetenv, and this hints file is processed before +# that has happened. +# +cat >> config.over <<'EOOVER' +if test "$d_unsetenv" = "$define" -a \ + `expr "$ccflags" : '.*-D_PERL_USE_SAFE_PUTENV'` -eq 0; then + ccflags="$ccflags -DPERL_USE_SAFE_PUTENV" +fi +EOOVER + rm -f try.c try.o try a.out + +# If using C++, the Configure scan for dlopen() will fail in Solaris +# because one of the two (1) an extern "C" linkage definition is needed +# (2) #include is needed, *and* a cast to (void*(*)()) +# is needed for the &dlopen. Adding any of these would require changing +# a delicate spot in Configure, so easier just to force our guess here +# for Solaris. Much the same goes for dlerror(). +case "$cc" in +*g++*|*CC*) + d_dlopen='define' + d_dlerror='define' + ;; +esac +