From 6b356c8efb963846940ef92952cf77e5b86bd65e Mon Sep 17 00:00:00 2001 From: Jarkko Hietaniemi Date: Fri, 1 Sep 2000 18:17:54 +0000 Subject: [PATCH] Rename the PRIElfbl, PRIX64, etc, to be PRIEUfldbl, PRIXU64, so that case-ignoring systems like DCL can tell them from PRIefldbl and PRIx64. Apply Merijn's ccversion patches. p4raw-id: //depot/perl@6982 --- Configure | 104 ++++++++++++++++++++++++++------------------------- Porting/Glossary | 78 ++++++++++++++++++++++++++++---------- Porting/config.sh | 39 ++++++++++--------- Porting/config_H | 30 +++++++++++---- configure.com | 46 +++++++++++------------ epoc/config.sh | 16 ++++---- hints/aix.sh | 13 +++++-- hints/dec_osf.sh | 1 + hints/hpux.sh | 1 + hints/irix_6.sh | 6 +++ hints/solaris_2.sh | 6 ++- myconfig.SH | 6 +-- uconfig.sh | 16 ++++---- vos/config.def | 4 ++ vos/config.h | 10 +++++ vos/config_h.SH_orig | 10 +++++ win32/config.bc | 16 ++++---- win32/config.gc | 16 ++++---- win32/config.vc | 16 ++++---- 19 files changed, 270 insertions(+), 164 deletions(-) diff --git a/Configure b/Configure index 169f89c..8e83ffb 100755 --- a/Configure +++ b/Configure @@ -20,7 +20,7 @@ # $Id: Head.U,v 3.0.1.9 1997/02/28 15:02:09 ram Exp $ # -# Generated on Fri Sep 1 17:46:55 EET DST 2000 [metaconfig 3.0 PL70] +# Generated on Fri Sep 1 21:10:02 EET DST 2000 [metaconfig 3.0 PL70] # (with additional metaconfig patches by perlbug@perl.org) cat >/tmp/c1$$ < exists and + * should be included. + */ +/*#define I_LIBUTIL / **/ + /* I_MACH_CTHREADS: * This symbol, if defined, indicates to the C program that it should * include . @@ -2516,8 +2528,18 @@ * This symbol, if defined, contains the string used by stdio to * format long doubles (format 'g') for output. */ +/* PERL_PRIeldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'e') for output. + */ +/* PERL_SCNfldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'f') for input. + */ #define PERL_PRIfldbl "f" /**/ #define PERL_PRIgldbl "g" /**/ +#define PERL_PRIeldbl "e" /**/ +#define PERL_SCNfldbl "f" /**/ /* Off_t: * This symbol holds the type used to declare offsets in the kernel. @@ -3151,10 +3173,4 @@ #define PERL_XS_APIVERSION "5.7.0" #define PERL_PM_APIVERSION "5.005" -/* I_LIBUTIL: - * This symbol, if defined, indicates that exists and - * should be included. - */ -/*#define I_LIBUTIL / **/ - #endif diff --git a/configure.com b/configure.com index 176b285..ae6141e 100644 --- a/configure.com +++ b/configure.com @@ -2704,9 +2704,9 @@ $! $ IF use64bitint .OR. use64bitint .EQS. "define" $ THEN $ d_PRId64 = "define" -$ d_PRIEldbl_cap = "define" -$ d_PRIFldbl_cap = "define" -$ d_PRIGldbl_cap = "define" +$ d_PRIEUldbl = "define" +$ d_PRIFUldbl = "define" +$ d_PRIGUldbl = "define" $ d_PRIeldbl = "define" $ d_PRIfldbl = "define" $ d_PRIgldbl = "define" @@ -2714,10 +2714,10 @@ $ d_PRIu64 = "define" $ d_PRIo64 = "define" $ d_PRIx64 = "define" $ sPRId64 = """Ld""" -$ sPRIEldbl_cap = """LE""" -$ sPRIFldbl_cap = """LF""" -$ sPRIGldbl_cap = """LG""" -$ sPRIX64_cap = """LX""" +$ sPRIEUldbl = """LE""" +$ sPRIFUldbl = """LF""" +$ sPRIGUldbl = """LG""" +$ sPRIXU64 = """LX""" $ sPRIeldbl = """Le""" $ sPRIfldbl = """Lf""" $ sPRIgldbl = """Lg""" @@ -2734,10 +2734,10 @@ $ d_isnanl = "define" $ d_modfl = "define" $ ELSE $ d_PRId64 = "undef" -$ d_PRIEldbl_cap = "define" -$ d_PRIFldbl_cap = "define" -$ d_PRIGldbl_cap = "define" -$ d_PRIX64_cap = "undef" +$ d_PRIEUldbl = "define" +$ d_PRIFUldbl = "define" +$ d_PRIGUldbl = "define" +$ d_PRIXU64 = "undef" $ d_PRIeldbl = "define" $ d_PRIfldbl = "undef" $ d_PRIgldbl = "undef" @@ -2745,10 +2745,10 @@ $ d_PRIu64 = "undef" $ d_PRIo64 = "undef" $ d_PRIx64 = "undef" $ sPRId64 = "" -$ sPRIEldbl_cap = """E""" -$ sPRIFldbl_cap = """F""" -$ sPRIGldbl_cap = """G""" -$ sPRIX64_cap = """lX""" +$ sPRIEUldbl = """E""" +$ sPRIFUldbl = """F""" +$ sPRIGUldbl = """G""" +$ sPRIXU64 = """lX""" $ sPRIeldbl = """e""" $ sPRIfldbl = """f""" $ sPRIgldbl = """g""" @@ -4633,10 +4633,10 @@ $ WC "cppstdin='" + cppstdin + "'" $ WC "crosscompile='undef'" $ WC "d_Gconvert='my_gconvert(x,n,t,b)'" $ WC "d_PRId64='" + d_PRId64 + "'" -$ WC "d_PRIEldbl='" + d_PRIEldbl_cap + "'" -$ WC "d_PRIFldbl='" + d_PRIFldbl_cap + "'" -$ WC "d_PRIGldbl='" + d_PRIGldbl_cap + "'" -$ WC "d_PRIX64='" + d_PRIX64_cap + "'" +$ WC "d_PRIEldbl='" + d_PRIEUldbl + "'" +$ WC "d_PRIFldbl='" + d_PRIFUldbl + "'" +$ WC "d_PRIGldbl='" + d_PRIGUldbl + "'" +$ WC "d_PRIX64='" + d_PRIXU64 + "'" $ WC "d_PRIeldbl='" + d_PRIeldbl + "'" $ WC "d_PRIfldbl='" + d_PRIfldbl + "'" $ WC "d_PRIgldbl='" + d_PRIgldbl + "'" @@ -5112,10 +5112,10 @@ $ WC "ranlib='" + "'" $ WC "rd_nodata=' '" $ WC "revision='" + revision + "'" $ WC "sPRId64='" + sPRId64 + "'" -$ WC "sPRIEldbl='" + sPRIEldbl_cap + "'" -$ WC "sPRIFldbl='" + sPRIFldbl_cap + "'" -$ WC "sPRIGldbl='" + sPRIGldbl_cap + "'" -$ WC "sPRIX64='" + sPRIX64_cap + "'" +$ WC "sPRIEldbl='" + sPRIEUldbl + "'" +$ WC "sPRIFldbl='" + sPRIFUldbl + "'" +$ WC "sPRIGldbl='" + sPRIGUldbl + "'" +$ WC "sPRIX64='" + sPRIXU64 + "'" $ WC "sPRIeldbl='" + sPRIeldbl + "'" $ WC "sPRIfldbl='" + sPRIfldbl + "'" $ WC "sPRIgldbl='" + sPRIgldbl + "'" diff --git a/epoc/config.sh b/epoc/config.sh index 897a18f..4d2a911 100644 --- a/epoc/config.sh +++ b/epoc/config.sh @@ -80,10 +80,10 @@ crosscompile='define' cryptlib='' csh='csh' d_Gconvert='epoc_gcvt((x),(n),(b))' -d_PRIEldbl='undef' -d_PRIFldbl='undef' -d_PRIGldbl='undef' -d_PRIX64='undef' +d_PRIEUldbl='undef' +d_PRIFUldbl='undef' +d_PRIGUldbl='undef' +d_PRIXU64='undef' d_PRId64='undef' d_PRIeldbl='undef' d_PRIfldbl='define' @@ -602,10 +602,10 @@ rd_nodata='-1' rm='rm' rmail='' runnm='false' -sPRIEldbl='' -sPRIFldbl='' -sPRIGldbl='' -sPRIX64='' +sPRIEUldbl='' +sPRIFUldbl='' +sPRIGUldbl='' +sPRIXU64='' sPRId64='' sPRIeldbl='' sPRIfldbl='"f"' diff --git a/hints/aix.sh b/hints/aix.sh index c07e79c..cf1270d 100644 --- a/hints/aix.sh +++ b/hints/aix.sh @@ -128,6 +128,13 @@ d_setreuid='undef' # Tell perl which symbols to export for dynamic linking. case "$cc" in *gcc*) ccdlflags='-Xlinker' ;; +*) ccversion=`lslpp -L | grep 'C for AIX Compiler$' | awk '{print $2}'` + case "$ccversion" in + 4.4.0.0|4.4.0.1|4.4.0.2) + echo >&4 "*** This C compiler ($ccversion) is outdated." + echo >&4 "*** Please upgrade to at least 4.4.0.3." + ;; + esac esac # the required -bE:$installarchlib/CORE/perl.exp is added by # libperl.U (Configure) later. @@ -171,9 +178,9 @@ $define|true|[yY]*) ;; *) cat >&4 <&1`" in */gemc_cc*) # we have the new DEC GEM CC diff --git a/hints/hpux.sh b/hints/hpux.sh index 522fd46..d729af2 100644 --- a/hints/hpux.sh +++ b/hints/hpux.sh @@ -108,6 +108,7 @@ esac case `$cc -v 2>&1`"" in *gcc*) ccisgcc="$define" ;; *) ccisgcc='' ;; + ccversion=`which cc | xargs what | grep Compiler | awk '{print $2}'` ;; esac # Determine the architecture type of this system. diff --git a/hints/irix_6.sh b/hints/irix_6.sh index ce301df..9190cee 100644 --- a/hints/irix_6.sh +++ b/hints/irix_6.sh @@ -48,8 +48,14 @@ case "$cc" in *) test -f /usr/lib32/libm.so && cc='cc -n32' ;; esac esac + test -z "$cc" && cc=cc +case "$cc" in +*gcc*) ;; +*) ccversion=`cc -version` ;; +esac + case "$use64bitint" in $define|true|[yY]*) case "`uname -r`" in diff --git a/hints/solaris_2.sh b/hints/solaris_2.sh index 6809d4c..22a0324 100644 --- a/hints/solaris_2.sh +++ b/hints/solaris_2.sh @@ -45,7 +45,11 @@ case "$archname" in ;; esac -test -z "`${cc:-cc} -V 2>&1|grep -i workshop`" || ccname=workshop +ccversion="`${cc:-cc} -V 2>&1|sed 's/^cc: //'`" +case "$ccversion" in +*WorkShop*) ccname=workshop ;; +*) ccversion='' ;; +esac cat >UU/workshoplibpth.cbu<<'EOCBU' case "$workshoplibpth_done" in diff --git a/myconfig.SH b/myconfig.SH index 8642fae..acc3ac6 100644 --- a/myconfig.SH +++ b/myconfig.SH @@ -37,10 +37,8 @@ Summary of my $package (revision $baserev version $PERL_VERSION subversion $PERL useperlio=$useperlio d_sfio=$d_sfio uselargefiles=$uselargefiles use64bitint=$use64bitint use64bitall=$use64bitall uselongdouble=$uselongdouble usesocks=$usesocks Compiler: - cc='$cc', optimize='$optimize', gccversion=$gccversion, gccosandvers=$gccosandvers - cppflags='$cppflags' - ccflags ='$ccflags' - stdchar='$stdchar', d_stdstdio=$d_stdstdio, usevfork=$usevfork + cc='$cc', ccflags ='$ccflags', optimize='$optimize', cppflags='$cppflags' + ccversion='$ccversion', gccversion='$gccversion', gccosandvers='$gccosandvers' intsize=$intsize, longsize=$longsize, ptrsize=$ptrsize, doublesize=$doublesize, byteorder=$byteorder d_longlong=$d_longlong, longlongsize=$longlongsize, d_longdbl=$d_longdbl, longdblsize=$longdblsize ivtype='$ivtype', ivsize=$ivsize, nvtype='$nvtype', nvsize=$nvsize, Off_t='$lseektype', lseeksize=$lseeksize diff --git a/uconfig.sh b/uconfig.sh index 21f91a1..373db77 100755 --- a/uconfig.sh +++ b/uconfig.sh @@ -17,10 +17,10 @@ cpp_stuff='42' crosscompile='undef' d_Gconvert='sprintf((b),"%.*g",(n),(x))' d_SCNfldbl='undef' -d_PRIEldbl='undef' -d_PRIFldbl='undef' -d_PRIGldbl='undef' -d_PRIX64='undef' +d_PRIEUldbl='undef' +d_PRIFUldbl='undef' +d_PRIGUldbl='undef' +d_PRIXU64='undef' d_PRId64='undef' d_PRIeldbl='undef' d_PRIfldbl='undef' @@ -454,10 +454,10 @@ randbits='48' randfunc='drand48' randseedtype='int' rd_nodata='-1' -sPRIEldbl='"llE"' -sPRIFldbl='"llF"' -sPRIGldbl='"llG"' -sPRIX64='"LX"' +sPRIEUldbl='"llE"' +sPRIFUldbl='"llF"' +sPRIGUldbl='"llG"' +sPRIXU64='"LX"' sPRId64='"Ld"' sPRIeldbl='"lle"' sPRIfldbl='"llf"' diff --git a/vos/config.def b/vos/config.def index 9f439a5..cdb8f81 100644 --- a/vos/config.def +++ b/vos/config.def @@ -167,8 +167,12 @@ $d_pause='define' $d_phostname='undef' $d_pipe='define' $d_poll='define' +$d_PRIeldbl='define' $d_PRIfldbl='define' $d_PRIgldbl='define' +$d_PRIEUldbl='define' +$d_PRIFUldbl='define' +$d_PRIGUldbl='define' $d_pthread_yield='undef' $d_pwage='undef' $d_pwchange='undef' diff --git a/vos/config.h b/vos/config.h index ecb8ae4..9454c79 100644 --- a/vos/config.h +++ b/vos/config.h @@ -2524,8 +2524,18 @@ * This symbol, if defined, contains the string used by stdio to * format long doubles (format 'g') for output. */ +/* PERL_PRIeldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'e') for output. + */ +/* PERL_SCNfldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'f') for input. + */ #define PERL_PRIfldbl "Lf" /**/ #define PERL_PRIgldbl "Lg" /**/ +#define PERL_PRIeldbl $sPRIeldbl /**/ +# PERL_SCNfldbl $sSCNfldbl /**/ /* Off_t: * This symbol holds the type used to declare offsets in the kernel. diff --git a/vos/config_h.SH_orig b/vos/config_h.SH_orig index a9bb0ea..7c70ab3 100755 --- a/vos/config_h.SH_orig +++ b/vos/config_h.SH_orig @@ -2548,8 +2548,18 @@ sed <$CONFIG_H -e 's!^#undef\(.*/\)\*!/\*#define\1 \*!' -e 's!^#un * This symbol, if defined, contains the string used by stdio to * format long doubles (format 'g') for output. */ +/* PERL_PRIeldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'e') for output. + */ +/* PERL_SCNfldbl: + * This symbol, if defined, contains the string used by stdio to + * format long doubles (format 'f') for input. + */ #$d_PRIfldbl PERL_PRIfldbl $sPRIfldbl /**/ #$d_PRIgldbl PERL_PRIgldbl $sPRIgldbl /**/ +#$d_PRIeldbl PERL_PRIeldbl $sPRIeldbl /**/ +#$d_SCNfldbl PERL_SCNfldbl $sSCNfldbl /**/ /* Off_t: * This symbol holds the type used to declare offsets in the kernel. diff --git a/win32/config.bc b/win32/config.bc index 172404b..3fe0c4d 100644 --- a/win32/config.bc +++ b/win32/config.bc @@ -72,10 +72,10 @@ crosscompile='undef' cryptlib='' csh='undef' d_Gconvert='gcvt((x),(n),(b))' -d_PRIEldbl='undef' -d_PRIFldbl='undef' -d_PRIGldbl='undef' -d_PRIX64='undef' +d_PRIEUldbl='undef' +d_PRIFUldbl='undef' +d_PRIGUldbl='undef' +d_PRIXU64='undef' d_PRId64='undef' d_PRIeldbl='undef' d_PRIfldbl='undef' @@ -642,10 +642,10 @@ revision='5' rm='del' rmail='' runnm='true' -sPRIEldbl='"E"' -sPRIFldbl='"F"' -sPRIGldbl='"G"' -sPRIX64='"lX"' +sPRIEUldbl='"E"' +sPRIFUldbl='"F"' +sPRIGUldbl='"G"' +sPRIXU64='"lX"' sPRId64='"ld"' sPRIeldbl='"e"' sPRIfldbl='"f"' diff --git a/win32/config.gc b/win32/config.gc index 498bb40..731ba39 100644 --- a/win32/config.gc +++ b/win32/config.gc @@ -72,10 +72,10 @@ crosscompile='undef' cryptlib='' csh='undef' d_Gconvert='sprintf((b),"%.*g",(n),(x))' -d_PRIEldbl='undef' -d_PRIFldbl='undef' -d_PRIGldbl='undef' -d_PRIX64='undef' +d_PRIEUldbl='undef' +d_PRIFUldbl='undef' +d_PRIGUldbl='undef' +d_PRIXU64='undef' d_PRId64='undef' d_PRIeldbl='undef' d_PRIfldbl='undef' @@ -642,10 +642,10 @@ revision='5' rm='del' rmail='' runnm='true' -sPRIEldbl='"E"' -sPRIFldbl='"F"' -sPRIGldbl='"G"' -sPRIX64='"lX"' +sPRIEUldbl='"E"' +sPRIFUldbl='"F"' +sPRIGUldbl='"G"' +sPRIXU64='"lX"' sPRId64='"ld"' sPRIeldbl='"e"' sPRIfldbl='"f"' diff --git a/win32/config.vc b/win32/config.vc index 0371234..1152d84 100644 --- a/win32/config.vc +++ b/win32/config.vc @@ -72,10 +72,10 @@ crosscompile='undef' cryptlib='' csh='undef' d_Gconvert='sprintf((b),"%.*g",(n),(x))' -d_PRIEldbl='undef' -d_PRIFldbl='undef' -d_PRIGldbl='undef' -d_PRIX64='undef' +d_PRIEUldbl='undef' +d_PRIFUldbl='undef' +d_PRIGUldbl='undef' +d_PRIXU64='undef' d_PRId64='undef' d_PRIeldbl='undef' d_PRIfldbl='undef' @@ -642,10 +642,10 @@ revision='5' rm='del' rmail='' runnm='true' -sPRIEldbl='"E"' -sPRIFldbl='"F"' -sPRIGldbl='"G"' -sPRIX64='"lX"' +sPRIEUldbl='"E"' +sPRIFUldbl='"F"' +sPRIGUldbl='"G"' +sPRIXU64='"lX"' sPRId64='"ld"' sPRIeldbl='"e"' sPRIfldbl='"f"' -- 2.7.4