X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Flinux.sh;h=bd6afd29f5098db24d3bc442fa04e1028e97e4fb;hb=696814337d4eac8d0663d5307d6e01964d1b2897;hp=bc7d49ad82112072755f8429eea02ce291d06278;hpb=06d57135c3576e5e9f97d6e4dad25b75f34d779f;p=p5sagit%2Fp5-mst-13.2.git diff --git a/hints/linux.sh b/hints/linux.sh index bc7d49a..bd6afd2 100644 --- a/hints/linux.sh +++ b/hints/linux.sh @@ -39,9 +39,10 @@ d_suidsafe='undef' # do the implicit mapping. ignore_versioned_solibs='y' -# BSD compatability library no longer needed -# 'kaffe' has a /usr/lib/libnet.so which is not at all relevent for perl. -set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /'` +# BSD compatibility library no longer needed +# 'kaffe' has a /usr/lib/libnet.so which is not at all relevant for perl. +# bind causes issues with several reentrant functions +set `echo X "$libswanted "| sed -e 's/ bsd / /' -e 's/ net / /' -e 's/ bind / /'` shift libswanted="$*" @@ -60,6 +61,11 @@ fi # function in . d_lstat=define +# malloc wrap works +case "$usemallocwrap" in +'') usemallocwrap='define' ;; +esac + # The system malloc() is about as fast and as frugal as perl's. # Since the system malloc() has been the default since at least # 5.001, we might as well leave it that way. --AD 10 Jan 2002 @@ -69,28 +75,52 @@ esac # Check if we're about to use Intel's ICC compiler case "`${cc:-cc} -V 2>&1`" in -*"Intel(R) C++ Compiler"*) +*"Intel(R) C++ Compiler"*|*"Intel(R) C Compiler"*) # This is needed for Configure's prototype checks to work correctly - ccflags="-we147 $ccflags" + # The -mp flag is needed to pass various floating point related tests + # The -no-gcc flag is needed otherwise, icc pretends (poorly) to be gcc + ccflags="-we147 -mp -no-gcc $ccflags" # If we're using ICC, we usually want the best performance case "$optimize" in '') optimize='-O3' ;; esac ;; +*"Sun C"*) + optimize='-xO2' + cccdlflags='-KPIC' + lddlflags='-G -Bdynamic' + # Sun C doesn't support gcc attributes, but, in many cases, doesn't + # complain either. Not all cases, though. + d_attribute_format='undef' + d_attribute_malloc='undef' + d_attribute_nonnull='undef' + d_attribute_noreturn='undef' + d_attribute_pure='undef' + d_attribute_unused='undef' + d_attribute_warn_unused_result='undef' + ;; esac case "$optimize" in -'') # If we have modern enough gcc and well-supported enough CPU, - # crank up the optimization level. - case "`${cc:-gcc} -v 2>&1`" in - *"gcc version 2.95"*|*"gcc version 3."*) - case "`arch 2>&1`" in - i?86|ppc) optimize='-O3' ;; - esac +# use -O2 by default ; -O3 doesn't seem to bring significant benefits with gcc +'') + optimize='-O2' + case "`uname -m`" in + ppc*) + # on ppc, it seems that gcc (at least gcc 3.3.2) isn't happy + # with -O2 ; so downgrade to -O1. + optimize='-O1' + ;; + ia64*) + # This architecture has had various problems with gcc's + # in the 3.2, 3.3, and 3.4 releases when optimized to -O2. See + # RT #37156 for a discussion of the problem. + case "`${cc:-gcc} -v 2>&1`" in + *"version 3.2"*|*"version 3.3"*|*"version 3.4"*) + ccflags="-fno-delete-null-pointer-checks $ccflags" + ;; + esac ;; - esac - case "$optimize" in - '') optimize='-O2' ;; esac ;; esac @@ -101,6 +131,7 @@ cat >try.c <<'EOM' /* Test for whether ELF binaries are produced */ #include #include +#include main() { char buffer[4]; int i=open("a.out",O_RDONLY); @@ -247,10 +278,11 @@ fi #'osfmach3ppc') ccdlflags='-Wl,-E' ;; #esac -case "`uname -r`" in -sparc-linux) +case "`uname -m`" in +sparc*) case "$cccdlflags" in *-fpic*) cccdlflags="`echo $cccdlflags|sed 's/-fpic/-fPIC/'`" ;; + *-fPIC*) ;; *) cccdlflags="$cccdlflags -fPIC" ;; esac ;; @@ -279,9 +311,12 @@ cat > UU/usethreads.cbu <<'EOCBU' case "$usethreads" in $define|true|[yY]*) ccflags="-D_REENTRANT -D_GNU_SOURCE -DTHREADS_HAVE_PIDS $ccflags" - set `echo X "$libswanted "| sed -e 's/ c / pthread c /'` - shift - libswanted="$*" + if echo $libswanted | grep -v pthread >/dev/null + then + set `echo X "$libswanted "| sed -e 's/ c / pthread c /'` + shift + libswanted="$*" + fi # Somehow at least in Debian 2.2 these manage to escape # the #define forest of and so that @@ -311,3 +346,66 @@ ccflags_uselargefiles="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" ;; esac EOCBU + +# Purify fails to link Perl if a "-lc" is passed into its linker +# due to duplicate symbols. +case "$PURIFY" in +$define|true|[yY]*) + set `echo X "$libswanted "| sed -e 's/ c / /'` + shift + libswanted="$*" + ;; +esac + +# If we are using g++ we must use nm and force ourselves to use +# the /usr/lib/libc.a (resetting the libc below to an empty string +# makes Configure to look for the right one) because the symbol +# scanning tricks of Configure will crash and burn horribly. +case "$cc" in +*g++*) usenm=true + libc='' + ;; +esac + +# If using g++, the Configure scan for dlopen() and (especially) +# dlerror() might fail, easier just to forcibly hint them in. +case "$cc" in +*g++*) + d_dlopen='define' + d_dlerror='define' + ;; +esac + +# Under some circumstances libdb can get built in such a way as to +# need pthread explicitly linked. + +libdb_needs_pthread="N" + +if echo " $libswanted " | grep -v " pthread " >/dev/null +then + if echo " $libswanted " | grep " db " >/dev/null + then + for DBDIR in $glibpth + do + DBLIB="$DBDIR/libdb.so" + if [ -f $DBLIB ] + then + if nm -u $DBLIB | grep pthread >/dev/null + then + if ldd $DBLIB | grep pthread >/dev/null + then + libdb_needs_pthread="N" + else + libdb_needs_pthread="Y" + fi + fi + fi + done + fi +fi + +case "$libdb_needs_pthread" in + "Y") + libswanted="$libswanted pthread" + ;; +esac