re PR bootstrap/55784 (declaration of C function 'const char* strsignal(int)' conflic...

2013-01-02  Richard Biener  <rguenther@suse.de>

	PR bootstrap/55784
	* configure.ac: Add $GMPINC to CFLAGS/CXXFLAGS.
	* configure: Regenerate.

	ada/
	* gcc-interface/Makefile.in: Add $(GMPINC) to includes.

From-SVN: r194804

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 73bd92e..210fb54 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-02  Richard Biener  <rguenther@suse.de>
+
+       PR bootstrap/55784
+       * configure.ac: Add $GMPINC to CFLAGS/CXXFLAGS.
+       * configure: Regenerate.
+
 2013-01-02  Richard Sandiford  <rdsandiford@googlemail.com>
 
        * builtins.c (expand_builtin_mathfn, expand_builtin_mathfn_2)

diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index fa4cb07..d9e91b6 100644 (file)
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,8 @@
+2013-01-02  Richard Biener  <rguenther@suse.de>
+
+       PR bootstrap/55784
+       * gcc-interface/Makefile.in: Add $(GMPINC) to includes.
+
 2013-01-02  Thomas Quinot  <quinot@adacore.com>
 
        * exp_intr.adb (Expand_Dispatching_Constructor_Call): Remove

diff --git a/gcc/ada/gcc-interface/Makefile.in b/gcc/ada/gcc-interface/Makefile.in
index d27a813..24c9966 100644 (file)
--- a/gcc/ada/gcc-interface/Makefile.in
+++ b/gcc/ada/gcc-interface/Makefile.in
@@ -273,7 +273,7 @@ endif
 # Both . and srcdir are used, in that order,
 # so that tm.h and config.h will be found in the compilation
 # subdirectory rather than in the source directory.
-INCLUDES = -I- -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(srcdir)/../include
+INCLUDES = -I- -I. -I.. -I$(srcdir)/ada -I$(srcdir) -I$(srcdir)/../include $(GMPINC)
 
 ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
 
@@ -283,11 +283,11 @@ ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
 ifneq ($(findstring vxworks,$(osys)),)
   INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
                        -iquote $(fsrcdir)/ada \
-                       -I$(fsrcdir)/../include
+                       -I$(fsrcdir)/../include $(GMPINC)
 else
   INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
                        -iquote $(fsrcdir)/ada -iquote $(fsrcdir) \
-                       -I$(fsrcdir)/../include
+                       -I$(fsrcdir)/../include $(GMPINC)
 endif
 
 ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada

diff --git a/gcc/configure b/gcc/configure
index f4f6593..ecdbea4 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -10321,9 +10321,9 @@ $as_echo "#define HAVE_LANGINFO_CODESET 1" >>confdefs.h
 
 # We will need to find libiberty.h and ansidecl.h
 saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include"
+CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
 saved_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include"
+CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
 for ac_func in getenv atol asprintf sbrk abort atof getcwd getwd \
        strsignal strstr stpcpy strverscmp \
        errno snprintf vsnprintf vasprintf malloc realloc calloc \

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 7abe7cf..447a0ca 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -1098,9 +1098,9 @@ AM_LANGINFO_CODESET
 
 # We will need to find libiberty.h and ansidecl.h
 saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include"
+CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
 saved_CXXFLAGS="$CXXFLAGS"
-CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include"
+CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
 gcc_AC_CHECK_DECLS(getenv atol asprintf sbrk abort atof getcwd getwd \
        strsignal strstr stpcpy strverscmp \
        errno snprintf vsnprintf vasprintf malloc realloc calloc \