Fwd: [PATCH] Fix PR54659, include gmp.h from system.h

Fwd: [PATCH] Fix PR54659, include gmp.h from system.h

[H.J. Lu]

[-- Attachment #1: Type: text/plain, Size: 1509 bytes --]

I checked in this patch to sync with gcc.


---------- Forwarded message ----------
From: H.J. Lu <hjl.tools@gmail.com>
Date: Tue, Jan 8, 2013 at 10:50 AM
Subject: Re: [PATCH] Fix PR54659, include gmp.h from system.h
To: Richard Biener <rguenther@suse.de>, "Iyer, Balaji V"
<balaji.v.iyer@intel.com>
Cc: gcc-patches@gcc.gnu.org, Diego Novillo <dnovillo@google.com>,
iant@google.com


On Fri, Dec 21, 2012 at 5:14 AM, Richard Biener <rguenther@suse.de> wrote:
>
> After the Ada fix including gmp.h from system.h is trivial
> (by means of double-int.h it was included from almost everywhere
> already)
>
> Bootstrapped on x86_64-unknown-linux-gnu, testing in progress.
>
> Ok for trunk?  (Go frontend "unfixed")
>
> Thanks,
> Richard.
>
> 2012-12-21  Richard Biener  <rguenther@suse.de>
>
>         PR bootstrap/54659
>         * system.h: Include gmp.h.
>         * tree-ssa-loop-niter.c: Do not include gmp.h here.
>         * double-int.h: Likewise.
>         * realmpfr.h: Likewise.
>
>         fortran/
>         * gfortran.h: Do not include gmp.h here.
>

This breaks bootstrap with in-tree gmp since system.h is included for
host feature test by gcc/configure.  Before gmp is built, gmp.h isn't
available.  We need to build gmp first before configuring gcc.

Balaji, can you try this patch?


--
H.J.
--
2013-01-08  H.J. Lu  <hongjiu.lu@intel.com>

        * Makefile.def (configure-gcc): Depend on all-gmp.
        (all-gcc): Remove dependency on all-gmp.
        * Makefile.in: Regenerated.


-- 
H.J.

[-- Attachment #2: gcc-gmp.patch --]
[-- Type: application/octet-stream, Size: 2472 bytes --]

2013-01-08  H.J. Lu  <hongjiu.lu@intel.com>

	* Makefile.def (configure-gcc): Depend on all-gmp.
	(all-gcc): Remove dependency on all-gmp.
	* Makefile.in: Regenerated.

diff --git a/Makefile.def b/Makefile.def
index 899ea2d..04088c3 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -291,6 +291,7 @@ dependencies = { module=all-build-fixincludes; on=all-build-libiberty; };
 
 // Host modules specific to gcc.
 dependencies = { module=configure-gcc; on=configure-intl; };
+dependencies = { module=configure-gcc; on=all-gmp; };
 dependencies = { module=configure-gcc; on=all-lto-plugin; };
 dependencies = { module=configure-gcc; on=all-binutils; };
 dependencies = { module=configure-gcc; on=all-gas; };
@@ -298,7 +299,6 @@ dependencies = { module=configure-gcc; on=all-ld; };
 dependencies = { module=configure-gcc; on=all-gold; };
 dependencies = { module=configure-gcc; on=all-libelf; };
 dependencies = { module=all-gcc; on=all-libiberty; hard=true; };
-dependencies = { module=all-gcc; on=all-gmp; };
 dependencies = { module=all-gcc; on=all-intl; };
 dependencies = { module=all-gcc; on=all-mpfr; };
 dependencies = { module=all-gcc; on=all-mpc; };
diff --git a/Makefile.in b/Makefile.in
index ba5e041..06adbee 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -45485,6 +45485,14 @@ configure-stage3-gcc: maybe-configure-stage3-intl
 configure-stage4-gcc: maybe-configure-stage4-intl
 configure-stageprofile-gcc: maybe-configure-stageprofile-intl
 configure-stagefeedback-gcc: maybe-configure-stagefeedback-intl
+configure-gcc: maybe-all-gmp
+
+configure-stage1-gcc: maybe-all-stage1-gmp
+configure-stage2-gcc: maybe-all-stage2-gmp
+configure-stage3-gcc: maybe-all-stage3-gmp
+configure-stage4-gcc: maybe-all-stage4-gmp
+configure-stageprofile-gcc: maybe-all-stageprofile-gmp
+configure-stagefeedback-gcc: maybe-all-stagefeedback-gmp
 configure-gcc: maybe-all-lto-plugin
 
 configure-stage1-gcc: maybe-all-stage1-lto-plugin
@@ -45541,14 +45549,6 @@ all-stage3-gcc: all-stage3-libiberty
 all-stage4-gcc: all-stage4-libiberty
 all-stageprofile-gcc: all-stageprofile-libiberty
 all-stagefeedback-gcc: all-stagefeedback-libiberty
-all-gcc: maybe-all-gmp
-
-all-stage1-gcc: maybe-all-stage1-gmp
-all-stage2-gcc: maybe-all-stage2-gmp
-all-stage3-gcc: maybe-all-stage3-gmp
-all-stage4-gcc: maybe-all-stage4-gmp
-all-stageprofile-gcc: maybe-all-stageprofile-gmp
-all-stagefeedback-gcc: maybe-all-stagefeedback-gmp
 all-gcc: maybe-all-intl
 
 all-stage1-gcc: maybe-all-stage1-intl