From 215ed6ce53e595830ca9877085cf6bb6381f9211 Mon Sep 17 00:00:00 2001
From: Andy Dougherty <doughera@lafayette.edu>
Date: Mon, 22 Oct 2007 08:49:25 -0400
Subject: [PATCH] FreeBSD atoll() warning (Was Re: Code freeze Message-ID:
 <Pine.LNX.4.64.0710221246340.31725@fractal.phys.lafayette.edu> Date: Mon, 22
 Oct 2007 12:49:25 -0400 (EDT)

p4raw-id: //depot/perl@32174
---
 cflags.SH | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/cflags.SH b/cflags.SH
index 2e7ecf357d6..412beeba90b 100755
--- a/cflags.SH
+++ b/cflags.SH
@@ -104,17 +104,32 @@ int main(int argc, char *argv[]) {
  * that struct cannot be compared in some gcc releases with a flat
  * integer, such as a STRLEN. */
 
+  IV iv;
   Off_t t0a = 2;
   STRLEN t0b = 3;
   int t0c = t0a == t0b;
 
-  return 0;
+/* In FreeBSD 6.2 (and probably other releases too), with -Duse64bitint,
+   perl will use atoll(3).  However, that declaration is hidden in <stdlib.h>
+   if we force the compiler to use -std=c89 mode.
+*/
+  iv = Atol("42");
+
+  return (!t0c && (iv == 42)) ? 0 : -1; /* Try to avoid 'unused' warnings. */
 }
 __EOT__
 
 stdflags=''
 
-# Further gcc warning options.
+# Further gcc warning options.  Build up a list of options that work.
+# Note that some problems may only show up with combinations of options,
+# e.g. a warning might show up only with -Wall -ansi, not with either
+# one individually.
+# TODO:  Ponder whether to migrate this back to Configure so hints files can 
+# tweak it.  Also, be paranoid about whether results we've deduced in Configure
+# (especially about things like long long, which are not in C89) will still be 
+# valid if we now add flags like -std=c89.
+
 case "$gccversion" in
 '') ;;
 [12]*) ;; # gcc versions 1 (gasp!) and 2 are not good for this.
@@ -124,8 +139,9 @@ Intel*) ;; # # Is that you, Intel C++?
        case " $ccflags " in
        *" $opt "*) ;; # Skip if already there.
        *) rm -f _cflags$_exe
-          case "`$cc $cflags $opt _cflags.c -o _cflags$_exe 2>&1`" in
+          case "`$cc $cflags $warn $opt _cflags.c -o _cflags$_exe 2>&1`" in
           *"unrecognized"*) ;;
+          *"implicit declaration"*) ;; # Was something useful hidden?
           *"Invalid"*) ;;
           *"is valid for C"*) ;;
           *) if test -x _cflags$_exe
@@ -158,6 +174,18 @@ case "$gccversion" in
       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")
+	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 $warn|sed -e 's/-std=c89/ /'`
+	;;
+    esac
   fi
   # Using certain features (like the gcc statement expressions)
   # requires knowing whether -pedantic has been specified.