From 49f0e1ba4aa0eafe931e34a0876be7b8df58afde Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Mon, 14 Feb 2011 17:40:38 +0100
Subject: [PATCH] configure.ac (HAVE_HIDDEN_VISIBILITY): Test with -Werror in
 CFLAGS.

	* configure.ac (HAVE_HIDDEN_VISIBILITY): Test with -Werror in CFLAGS.
	* printf/printf_fp.c: Don't include <alloca.h>.
	* printf/quadmath-printf.h (_itoa): Redefine to __quadmath_itoa.
	* configure: Regenerated.

From-SVN: r170139
---
 libquadmath/ChangeLog                | 5 +++++
 libquadmath/configure                | 3 +++
 libquadmath/configure.ac             | 3 +++
 libquadmath/printf/printf_fp.c       | 1 -
 libquadmath/printf/quadmath-printf.h | 3 +++
 5 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/libquadmath/ChangeLog b/libquadmath/ChangeLog
index c17753c8528..45f382ddb0e 100644
--- a/libquadmath/ChangeLog
+++ b/libquadmath/ChangeLog
@@ -1,5 +1,10 @@
 2011-02-14  Jakub Jelinek  <jakub@redhat.com>
 
+	* configure.ac (HAVE_HIDDEN_VISIBILITY): Test with -Werror in CFLAGS.
+	* printf/printf_fp.c: Don't include <alloca.h>.
+	* printf/quadmath-printf.h (_itoa): Redefine to __quadmath_itoa.
+	* configure: Regenerated.
+
 	PR fortran/47642
 	* libquadmath.texi (quadmath_snprintf): Document.
 	(quadmath_flt128tostr): Remove.
diff --git a/libquadmath/configure b/libquadmath/configure
index fa825ce8cc6..fa209a6d254 100755
--- a/libquadmath/configure
+++ b/libquadmath/configure
@@ -12294,6 +12294,8 @@ $as_echo "#define HAVE_FETESTEXCEPT 1" >>confdefs.h
 fi
 
 # Check for hidden visibility (copied from libssp).
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether hidden visibility is supported" >&5
 $as_echo_n "checking whether hidden visibility is supported... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -12321,6 +12323,7 @@ if test x$quadmath_hidden = xyes; then
 $as_echo "#define HAVE_HIDDEN_VISIBILITY 1" >>confdefs.h
 
 fi
+CFLAGS="$saved_CFLAGS"
 
 # Check for symbol versioning (copied from libssp).
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether symbol versioning is supported" >&5
diff --git a/libquadmath/configure.ac b/libquadmath/configure.ac
index 4bde6ed50fa..9a0f4648ad5 100644
--- a/libquadmath/configure.ac
+++ b/libquadmath/configure.ac
@@ -149,6 +149,8 @@ else
 fi
 
 # Check for hidden visibility (copied from libssp).
+saved_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS -Werror"
 AC_MSG_CHECKING([whether hidden visibility is supported])
 AC_TRY_COMPILE([
 void __attribute__((visibility ("hidden"))) bar (void) {}],,
@@ -157,6 +159,7 @@ AC_MSG_RESULT($quadmath_hidden)
 if test x$quadmath_hidden = xyes; then
   AC_DEFINE([HAVE_HIDDEN_VISIBILITY],[1],[__attribute__((visibility ("hidden"))) supported])
 fi
+CFLAGS="$saved_CFLAGS"
 
 # Check for symbol versioning (copied from libssp).
 AC_MSG_CHECKING([whether symbol versioning is supported])
diff --git a/libquadmath/printf/printf_fp.c b/libquadmath/printf/printf_fp.c
index d3063ebf490..4d0bf18ce48 100644
--- a/libquadmath/printf/printf_fp.c
+++ b/libquadmath/printf/printf_fp.c
@@ -20,7 +20,6 @@
    02111-1307 USA.  */
 
 #include <config.h>
-#include <alloca.h>
 #include <float.h>
 #include <math.h>
 #include <string.h>
diff --git a/libquadmath/printf/quadmath-printf.h b/libquadmath/printf/quadmath-printf.h
index 16092bfe1bc..796df200027 100644
--- a/libquadmath/printf/quadmath-printf.h
+++ b/libquadmath/printf/quadmath-printf.h
@@ -165,3 +165,6 @@ __quadmath_do_putc (struct __quadmath_printf_file *fp, int wide,
 
 #define nl_langinfo_wc(x) \
   ({ union { const char *mb; wchar_t wc; } u; u.mb = nl_langinfo (x); u.wc; })
+
+#undef _itoa
+#define _itoa __quadmath_itoa