This supposedly fixes PR55784 according to people running into the
issue. We need to add GMPINC to the include paths everywhere as
we now include gmp.h from system.h.
Bootstrap and regtest running on x86_64-unknown-linux-gnu.
Ada bits approved by Eric in bugzilla.
Richard.
2013-01-02 Richard Biener <rguent...@suse.de>
PR bootstrap/55784
* configure.ac: Add $GMPINC to CFLAGS/CXXFLAGS.
* configure: Regenerate.
ada/
* gcc-interface/Makefile.in: Add $(GMPINC) to includes.
Index: gcc/configure.ac
===================================================================
*** gcc/configure.ac (revision 194787)
--- gcc/configure.ac (working copy)
*************** AM_LANGINFO_CODESET
*** 1098,1106 ****
# We will need to find libiberty.h and ansidecl.h
saved_CFLAGS="$CFLAGS"
! CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include"
saved_CXXFLAGS="$CXXFLAGS"
! CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include"
gcc_AC_CHECK_DECLS(getenv atol asprintf sbrk abort atof getcwd getwd \
strsignal strstr stpcpy strverscmp \
errno snprintf vsnprintf vasprintf malloc realloc calloc \
--- 1098,1106 ----
# We will need to find libiberty.h and ansidecl.h
saved_CFLAGS="$CFLAGS"
! CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
saved_CXXFLAGS="$CXXFLAGS"
! 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 \
Index: gcc/configure
===================================================================
*** gcc/configure (revision 194787)
--- gcc/configure (working copy)
*************** $as_echo "#define HAVE_LANGINFO_CODESET
*** 10321,10329 ****
# We will need to find libiberty.h and ansidecl.h
saved_CFLAGS="$CFLAGS"
! CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include"
saved_CXXFLAGS="$CXXFLAGS"
! CXXFLAGS="$CXXFLAGS -I${srcdir} -I${srcdir}/../include"
for ac_func in getenv atol asprintf sbrk abort atof getcwd getwd \
strsignal strstr stpcpy strverscmp \
errno snprintf vsnprintf vasprintf malloc realloc calloc \
--- 10321,10329 ----
# We will need to find libiberty.h and ansidecl.h
saved_CFLAGS="$CFLAGS"
! CFLAGS="$CFLAGS -I${srcdir} -I${srcdir}/../include $GMPINC"
saved_CXXFLAGS="$CXXFLAGS"
! 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 \
Index: gcc/ada/gcc-interface/Makefile.in
===================================================================
*** gcc/ada/gcc-interface/Makefile.in (revision 194787)
--- gcc/ada/gcc-interface/Makefile.in (working copy)
*************** endif
*** 273,279 ****
# 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
ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
--- 273,279 ----
# 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
$(GMPINC)
ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
*************** ADA_INCLUDES = -I- -I. -I$(srcdir)/ada
*** 283,293 ****
ifneq ($(findstring vxworks,$(osys)),)
INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
-iquote $(fsrcdir)/ada \
! -I$(fsrcdir)/../include
else
INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
-iquote $(fsrcdir)/ada -iquote $(fsrcdir) \
! -I$(fsrcdir)/../include
endif
ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
--- 283,293 ----
ifneq ($(findstring vxworks,$(osys)),)
INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
-iquote $(fsrcdir)/ada \
! -I$(fsrcdir)/../include $(GMPINC)
else
INCLUDES_FOR_SUBDIR = -iquote . -iquote .. -iquote ../.. \
-iquote $(fsrcdir)/ada -iquote $(fsrcdir) \
! -I$(fsrcdir)/../include $(GMPINC)
endif
ADA_INCLUDES_FOR_SUBDIR = -I. -I$(fsrcdir)/ada
