X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=hints%2Fdec_osf.sh;h=dcaa2832ce29fa411d5f77fb8a0bf0d437efb44f;hb=a48ec845cbd27881b821dcb9bb80e52ba093c5f2;hp=3c3b00caa55f86939ce2c68f45ae6c9d2e4f9f1c;hpb=a68015de2b97756a748d63e3a1fe7ff73ca9ba54;p=p5sagit%2Fp5-mst-13.2.git diff --git a/hints/dec_osf.sh b/hints/dec_osf.sh index 3c3b00c..dcaa283 100644 --- a/hints/dec_osf.sh +++ b/hints/dec_osf.sh @@ -60,15 +60,53 @@ cc=${cc:-cc} +case "`$cc -v 2>&1 | grep cc`" in +*gcc*) isgcc=gcc ;; +esac + # do NOT, I repeat, *NOT* take away the leading tabs # Configure Black Magic (TM) # reset _DEC_cc_style= -case "`$cc -v 2>&1 | grep cc`" in -*gcc*) ;; # pass +case "$isgcc" in +gcc) _gcc_version=`$cc --version 2>&1 | tr . ' '` + set $_gcc_version + if test "$1" -lt 2 -o \( "$1" -eq 2 -a \( "$2" -lt 95 -o \( "$2" -eq 95 -a "$3" -lt 2 \) \) \); then + cat >&4 <&4 <&1`" in + case "`cc -v -I. -c taint.c -o taint$$.o 2>&1`" in */gemc_cc*) # we have the new DEC GEM CC _DEC_cc_style=new ;; @@ -77,13 +115,13 @@ case "`$cc -v 2>&1 | grep cc`" in ;; esac # cleanup - rm -f /tmp/taint$$.o + rm -f taint$$.o ;; esac # be nauseatingly ANSI -case "`$cc -v 2>&1 | grep gcc`" in -*gcc*) ccflags="$ccflags -ansi" +case "$isgcc" in +gcc) ccflags="$ccflags -ansi" ;; *) ccflags="$ccflags -std" ;; @@ -95,13 +133,10 @@ esac # we want optimisation case "$optimize" in -'') case "`$cc -v 2>&1 | grep gcc`" in - *gcc*) - optimize='-O3' ;; +'') case "$isgcc" in + gcc) optimize='-O3' ;; *) case "$_DEC_cc_style" in - new) optimize='-O4' - ccflags="$ccflags -fprm d -ieee" - ;; + new) optimize='-O4' ;; old) optimize='-O2 -Olimit 3200' ;; esac ccflags="$ccflags -D_INTRINSICS" @@ -110,6 +145,15 @@ case "$optimize" in ;; esac +# we want dynamic fp rounding mode, and we want ieee exception semantics +case "$isgcc" in +gcc) ;; +*) case "$_DEC_cc_style" in + new) ccflags="$ccflags -fprm d -ieee" ;; + esac + ;; +esac + # Make glibpth agree with the compiler suite. Note that /shlib # is not here. That's on purpose. Even though that's where libc # really lives from V4.0 on, the linker (and /sbin/loader) won't @@ -151,7 +195,7 @@ case "`uname -r`" in *) if $test "X$optimize" = "X$undef"; then lddlflags="$lddlflags -msym" else - case "`sizer -v`" in + case "`/usr/sbin/sizer -v`" in *4.0D*) # QAR 56761: -O4 + .so may produce broken code, # fixed in 4.0E or better. @@ -162,7 +206,7 @@ case "`uname -r`" in esac # -msym: If using a sufficiently recent /sbin/loader, # keep the module symbols with the modules. - lddlflags="$lddlflags -msym" + lddlflags="$lddlflags -msym -std" fi ;; esac @@ -202,16 +246,27 @@ esac # please adjust this appropriately. See also pp_sys.c just before the # emulate_eaccess(). +# Fixed in V5.0A. +case "`/usr/sbin/sizer -v`" in +*5.0[A-Z]*|*5.[1-9]*|*[6-9].[0-9]*) + : ok + ;; +*) +# V5.0 or previous pp_sys_cflags='ccflags="$ccflags -DNO_EFF_ONLY_OK"' + ;; +esac +# The off_t is already 8 bytes, so we do have largefileness. + +cat > UU/usethreads.cbu <<'EOCBU' # This script UU/usethreads.cbu will get 'called-back' by Configure # after it has prompted the user for whether to use threads. -cat > UU/usethreads.cbu <<'EOCBU' case "$usethreads" in $define|true|[yY]*) # Threads interfaces changed with V4.0. - case "`$cc -v 2>&1 | grep gcc`" in - *gcc*)ccflags="-D_REENTRANT $ccflags" ;; + case "$isgcc" in + gcc) ccflags="-D_REENTRANT $ccflags" ;; *) case "`uname -r`" in *[123].*) ccflags="-threads $ccflags" ;; *) ccflags="-pthread $ccflags" ;; @@ -223,11 +278,76 @@ $define|true|[yY]*) *) libswanted="$libswanted pthread exc" ;; esac - usemymalloc='n' + case "$usemymalloc" in + '') + usemymalloc='n' + ;; + esac + # These symbols are renamed in so + # that the Configure hasproto doesn't see them. + d_asctime_r_proto="$define" + d_ctime_r_proto="$define" + d_gmtime_r_proto="$define" + d_localtime_r_proto="$define" ;; 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. +case "$uselongdouble" in +$define|true|[yY]*) + case "`/usr/sbin/sizer -v`" in + *[1-4].0*) cat >&4 </dev/null`"; then + needusrshlib=yes + fi + if test -d $p; then + echo "Appending $p to LD_LIBRARY_PATH." >& 4 + case "$LD_LIBRARY_PATH" in + '') LD_LIBRARY_PATH=$p ;; + *) LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$p ;; + esac + fi + done + echo "LD_LIBRARY_PATH is now $LD_LIBRARY_PATH." >& 4 + # This is evil but I can't think of a nice workaround: + # the /usr/shlib/libdb.so needs to be seen first, + # or running Configure will fail. + if test -n "$needusrshlib"; then + echo "Prepending /usr/shlib to loclibpth." >& 4 + loclibpth="/usr/shlib $loclibpth" + echo "loclibpth is now $loclibpth." >& 4 + fi + ;; +esac + # # Unset temporary variables no more needed. #