X-Git-Url: https://perl5.git.perl.org/perl5.git/blobdiff_plain/ea14a82db6693ddbf3ec60c43dba5225e888c876..f3fa3df009834db42837a2b61a058e31c24d3000:/cflags.SH diff --git a/cflags.SH b/cflags.SH index 3ab5180..e60742f 100755 --- a/cflags.SH +++ b/cflags.SH @@ -73,18 +73,10 @@ cat >_cflags.c <<__EOT__ #include /* Just in case the inclusion of perl.h did not * pull in enough system headers, let's try again. */ -#ifdef I_STDLIB #include -#endif -#ifdef I_STDDEF #include -#endif -#ifdef I_STDARG #include -#endif -#ifdef I_LIMITS #include -#endif #ifdef I_DIRENT #include #endif @@ -132,7 +124,9 @@ int main(int argc, char *argv[]) { IV iv; Off_t t0a = 2; STRLEN t0b = 3; - int t0c = t0a == t0b; + int t0c = (STRLEN)t0a == t0b; + + printf("%s: %d\n", argv[0], argc); /* In FreeBSD 6.2 (and probably other releases too), with -Duse64bitint, perl will use atoll(3). However, that declaration is hidden in @@ -155,17 +149,53 @@ stdflags='' # (especially about things like long long, which are not in C89) will still be # valid if we now add flags like -std=c89. +pedantic='' +case "$gccansipedantic" in +define) pedantic='-pedantic' ;; +esac + case "$gccversion" in '') ;; [12]*) ;; # gcc versions 1 (gasp!) and 2 are not good for this. Intel*) ;; # # Is that you, Intel C++? -*) for opt in -ansi -std=c89 -W -Wextra -Wdeclaration-after-statement \ - -Wendif-labels -Wc++-compat -Wwrite-strings +# +# NOTE 1: the -std=c89 without -pedantic is a bit pointless. +# Just -std=c89 means "if there is room for interpretation, +# interpret the C89 way." It does NOT mean "strict C89" on its own. +# You need to add the -pedantic for that. To do this with Configure, +# do -Dgccansipedantic (note that the -ansi is included in any case, +# the option is a bit oddly named, for historical reasons.) +# +# NOTE 2: -pedantic necessitates adding a couple of flags: +# * -PERL_GCC_PEDANTIC so that the perl code can adapt: there's nothing +# added by gcc itself to indicate pedanticness. +# * -Wno-overlength-strings under -DDEBUGGING because quite many of +# the LEAVE_with_name() and assert() calls generate string literals +# longer then the ANSI minimum of 509 bytes. +# +# NOTE 3: the relative order of these options matters: +# -Wextra before -W +# -std=c89 before -ansi +# -pedantic* before -Werror=d-a-s +# +*) for opt in -std=c89 -ansi $pedantic \ + -Werror=declaration-after-statement \ + -Werror=pointer-arith \ + -Wextra -W \ + -Wc++-compat -Wwrite-strings do case " $ccflags " in *" $opt "*) ;; # Skip if already there. *) rm -f _cflags$_exe - case "`$cc -DPERL_NO_INLINE_FUNCTIONS $ccflags $warn $stdflags $opt _cflags.c -o _cflags$_exe 2>&1`" in + flags="-DPERL_NO_INLINE_FUNCTIONS $ccflags $warn $stdflags $opt" + case "$opt" in + *-pedantic*) flags="$flags -DPERL_GCC_PEDANTIC" ;; + esac + # echo "opt = $opt, flags = $flags" + cmd="$cc $flags _cflags.c -o _cflags$_exe" + out="`$cmd 2>&1`" + # echo "$cmd --> $out" + case "$out" in *"unrecognized"*) ;; *"unknown"*) ;; *"implicit declaration"*) ;; # Was something useful hidden? @@ -174,14 +204,78 @@ Intel*) ;; # # Is that you, Intel C++? *) if test -x _cflags$_exe then case "$opt" in - -std*) stdflags="$stdflags $opt" ;; - *) warn="$warn $opt" ;; + -std*) + echo "cflags.SH: Adding $opt." + stdflags="$stdflags $opt" + ;; + -ansi) + # -std=c89 is the modern form of -ansi, so add + # -ansi only if -std=c89 is not there already. + case " $stdflags " in + *-std=c89*) ;; + *) + echo "cflags.SH: Adding $opt." + stdflags="$stdflags $opt" + ;; + esac + ;; + -W) + # -Wextra is the modern form of -W, so add + # -W only if -Wextra is not there already. + case " $warn " in + *-Wextra*) ;; + *) + echo "cflags.SH: Adding $opt." + warn="$warn $opt" + ;; + esac + ;; + -Werror=declaration-after-statement) + # -pedantic* (with -std=c89) covers -Werror=d-a-s. + case "$stdflags$warn" in + *-std=c89*-pedantic*|*-pedantic*-std=c89*) ;; + *) + echo "cflags.SH: Adding $opt." + warn="$warn $opt" + ;; + esac + ;; + -Werror=pointer-arith) + # -pedantic* covers -Werror=p-a + case "$warn" in + *-pedantic*) ;; + *) + echo "cflags.SH: Adding $opt." + warn="$warn $opt" + ;; + esac + ;; + *) + echo "cflags.SH: Adding $opt." + warn="$warn $opt" + ;; esac fi ;; esac ;; esac + case "$ccflags$warn" in + *-pedantic*) + overlength='' + case "$ccflags$optimize" in + *-DDEBUGGING*) overlength='-Wno-overlength-strings' ;; + esac + for opt2 in -DPERL_GCC_PEDANTIC $overlength + do + case "$ccflags$warn" in + *"$opt2"*) ;; + *) echo "cflags.SH: Adding $opt2 because of -pedantic." + warn="$warn $opt2" ;; + esac + done + ;; + esac done ;; esac @@ -190,38 +284,63 @@ rm -f _cflags.c _cflags$_exe case "$gccversion" in '') ;; *) - if [ "$gccansipedantic" = "" ]; then + case "$warn$ccflags" in + *-pedantic*) # If we have -Duse64bitint (or equivalent) in effect and the quadtype - # has become 'long long', gcc -pedantic becomes unbearable (moreso - # when combined with -Wall) because long long and LL and %lld|%Ld + # has become 'long long', gcc -pedantic* becomes unbearable + # (moreso when combined with -Wall) because long long and LL and %lld|%Ld # become warn-worthy. So let's drop the -pedantic in that case. - case "$quadtype:$sPRId64" in - "long long"*|*lld*|*Ld*) - echo "cflags.SH: Removing -pedantic and warn because of quadtype='long long'." - ccflags="`echo $ccflags|sed 's/-pedantic/ /'`" - warn="`echo $warn|sed 's/-pedantic/ /'`" - ;; - esac + # # Similarly, since 'long long' isn't part of C89, FreeBSD 6.2 headers # don't declare atoll() under -std=c89, but we need it. In general, # insisting on -std=c89 is inconsistent with insisting on using # 'long long'. So drop -std=c89 and -ansi as well if we're using # 'long long' as our main integral type. - case "$ivtype" in - "long long") - echo "cflags.SH: Removing -pedantic, -std=c89, and -ansi because of ivtype='long long'." - ccflags=`echo $ccflags|sed -e 's/-pedantic/ /' -e 's/-std=c89/ /' -e 's/-ansi/ /'` - warn=`echo $warn|sed -e 's/-pedantic/ /' -e 's/-ansi/ /'` - stdflags=`echo $stdflags|sed -e 's/-std=c89/ /'` - ;; + # + # usedtrace (DTrace) uses unportable features (dollars in identifiers, + # and gcc statement expressions), it is just easier to turn off pedantic. + remove='' + case "$quadtype:$ivtype:$sPRId64:$usedtrace" in + *"long long"*|*lld*|*Ld*) remove='long long' ;; + *) case "$usedtrace" in + define) remove='usedtrace' ;; + esac + ;; + esac + case "$remove" in + '') ;; + *) echo "cflags.SH: Removing -pedantic*, -std=c89, and -ansi because of $remove." + ccflags=`echo $ccflags|sed -e 's/-pedantic-errors/ /' -e 's/-pedantic/ /' -e 's/-std=c89/ /' -e 's/-ansi/ /' -e 's/-DPERL_GCC_PEDANTIC/ /'` + warn=`echo $warn|sed -e 's/-pedantic-errors/ /' -e 's/-pedantic/ /' -e 's/-ansi/ /' -e 's/-DPERL_GCC_PEDANTIC/ /'` + stdflags=`echo $stdflags|sed -e 's/-std=c89/ /'` + ;; esac - fi - # Using certain features (like the gcc statement expressions) - # requires knowing whether -pedantic has been specified. - case "$warn$ccflags" in - *-pedantic*) - echo "cflags.SH: Adding -DPERL_PEDANTIC because of -pedantic." - warn="$warn -DPERL_GCC_PEDANTIC" + ;; + esac + ;; +esac + +# Older clang releases are not wise enough for -Wunused-value. +case "$gccversion" in +*"Apple LLVM "[34]*|*"Apple LLVM version "[34]*) + for f in -Wno-unused-value + do + echo "cflags.SH: Adding $f because clang version '$gccversion'" + warn="$warn $f" + done + ;; +esac + +# The quadmath Q format specifier will cause -Wformat to whine. +case "$gccversion" in +'') ;; +*) case "$usequadmath" in + define) + for f in -Wno-format + do + echo "cflags.SH: Adding $f because of usequadmath." + warn="$warn $f" + done ;; esac ;; @@ -232,18 +351,27 @@ case "$cc" in # Extra paranoia in case people have bad canned ccflags: # bad in the sense that the flags are accepted by g++, # but then whined about. - for f in -Wdeclaration-after-statement -std=c89 + # + # -Werror=d-a-s option is valid for g++, by definition, + # but we remove it just for cleanliness and shorter command lines. + for f in -Wdeclaration-after-statement \ + -Werror=declaration-after-statement \ + -Wc++-compat \ + -std=c89 do - case "$ccflags" in + case "$ccflags$warn" in *"$f"*) - echo "cflags.SH: Removing $ccflags because of g++." - ccflags=`echo $ccflags|sed 's/$f/ /'` ;; + echo "cflags.SH: Removing $f because of g++." + ccflags=`echo $ccflags|sed 's/$f/ /'` + warn=`echo $warn|sed 's/$f/ /'` + ;; esac done ;; esac -for f in -Wdeclaration-after-statement +for f in -Wdeclaration-after-statement -Werror=declaration-after-statement \ + -Wpointer-arith -Werror=pointer-arith do case "$cppflags" in *"$f"*) @@ -252,9 +380,41 @@ do esac done +# If usethreads and clang, add -Wthread-safety for clang 3.6 or later. +# gccversion is defined also for clang, because compat, use that for matching. +# Apple overwrites clang version with XCode version, see hints/darwin.sh +# for the gory details. Aggressively forward-proofing. +case "$usethreads" in +define) +case "$gccversion" in +*" Clang 3."[56789]*|*" Clang "[456]*|*"Apple LLVM 6.1"*|*"Apple LLVM "[789]*) + for f in -Wthread-safety + do + case " $warn " in + *" $f "*) ;; # Skip if already there. + *) + echo "cflags.SH: Adding $f because usethreads and clang and gccversion '$gccversion'" + warn="$warn $f" + ;; + esac + done +;; +esac +;; +esac + +echo "cflags.SH: cc = $cc" +echo "cflags.SH: ccflags = $ccflags" +echo "cflags.SH: stdflags = $stdflags" +echo "cflags.SH: optimize = $optimize" +echo "cflags.SH: warn = $warn" + # Code to set any extra flags here. extra='' +# Protect double or single quotes for better restoring of ccflags. +myccflags=`echo $ccflags | sed -e 's/"/\\\"/g' -e "s/'/\\\'/g"` + echo "Extracting cflags (with variable substitutions)" # This section of the file will have variable substitutions done on it. # Move anything that needs config subs from !NO!SUBS! section to !GROK!THIS!. @@ -269,7 +429,8 @@ $startsh # This file is generated by cflags.SH # Used to restore possible edits by cflags.SH. -myccflags="$ccflags" +myccflags="$myccflags" + # Extra warnings, used e.g. for gcc. warn="$warn" # Extra standardness. @@ -328,14 +489,19 @@ for file do # allow variables like toke_cflags to be evaluated - if echo $file | grep -v / >/dev/null - then - eval 'eval ${'"${file}_cflags"'-""}' - fi + case "$file" in + */*) ;; + *) eval 'eval ${'"${file}_cflags"'-""}' ;; + esac # or customize here case "$file" in + regcomp) : work around http://bugs.debian.org/754054 + case $archname in + mips-*|mipsel-*) + optimize="$optimize -fno-tree-vrp";; + esac;; *) ;; # Customization examples follow. @@ -353,7 +519,6 @@ for file do toke) optimize=-O0 ;; esac - # Can we perhaps use $ansi2knr here echo "$cc -c -DPERL_CORE $ccflags $stdflags $optimize $warn $extra" . $TOP/config.sh