diff mbox

Fix bootstrap with brig FE

Message ID 20170704113609.GJ2123@tucnak
State New
Headers show

Commit Message

Jakub Jelinek July 4, 2017, 11:36 a.m. UTC
Hi!

Seems tree-cfg.h now requires profile-count.h (or some header that includes
it like basic-block.h) to be included first (the flattened headers without
including their dependencies and without aggregate headers are really terrible
idea), so right now bootstrap fails in brig FE.

Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, ok for
trunk?

2017-07-04  Jakub Jelinek  <jakub@redhat.com>

	* brigfrontend/brig-function.cc: Include profile-count.h.
	* brigfrontend/brig-to-generic.cc: Likewise.


	Jakub

Comments

Richard Biener July 4, 2017, 11:46 a.m. UTC | #1
On Tue, 4 Jul 2017, Jakub Jelinek wrote:

> Hi!
> 
> Seems tree-cfg.h now requires profile-count.h (or some header that includes
> it like basic-block.h) to be included first (the flattened headers without
> including their dependencies and without aggregate headers are really terrible
> idea), so right now bootstrap fails in brig FE.
> 
> Fixed thusly, bootstrapped/regtested on x86_64-linux and i686-linux, ok for
> trunk?

Obvious.

Yes.
Richard.

> 2017-07-04  Jakub Jelinek  <jakub@redhat.com>
> 
> 	* brigfrontend/brig-function.cc: Include profile-count.h.
> 	* brigfrontend/brig-to-generic.cc: Likewise.
> 
> --- gcc/brig/brigfrontend/brig-function.cc.jj	2017-01-26 09:15:50.000000000 +0100
> +++ gcc/brig/brigfrontend/brig-function.cc	2017-07-04 11:07:10.899930814 +0200
> @@ -38,6 +38,7 @@
>  #include "phsa.h"
>  #include "tree-pretty-print.h"
>  #include "dumpfile.h"
> +#include "profile-count.h"
>  #include "tree-cfg.h"
>  #include "errors.h"
>  #include "function.h"
> --- gcc/brig/brigfrontend/brig-to-generic.cc.jj	2017-02-01 16:25:19.000000000 +0100
> +++ gcc/brig/brigfrontend/brig-to-generic.cc	2017-07-04 11:06:56.413106803 +0200
> @@ -45,6 +45,7 @@
>  #include "phsa.h"
>  #include "tree-pretty-print.h"
>  #include "dumpfile.h"
> +#include "profile-count.h"
>  #include "tree-cfg.h"
>  #include "errors.h"
>  #include "fold-const.h"
> 
> 	Jakub
> 
>
diff mbox

Patch

--- gcc/brig/brigfrontend/brig-function.cc.jj	2017-01-26 09:15:50.000000000 +0100
+++ gcc/brig/brigfrontend/brig-function.cc	2017-07-04 11:07:10.899930814 +0200
@@ -38,6 +38,7 @@ 
 #include "phsa.h"
 #include "tree-pretty-print.h"
 #include "dumpfile.h"
+#include "profile-count.h"
 #include "tree-cfg.h"
 #include "errors.h"
 #include "function.h"
--- gcc/brig/brigfrontend/brig-to-generic.cc.jj	2017-02-01 16:25:19.000000000 +0100
+++ gcc/brig/brigfrontend/brig-to-generic.cc	2017-07-04 11:06:56.413106803 +0200
@@ -45,6 +45,7 @@ 
 #include "phsa.h"
 #include "tree-pretty-print.h"
 #include "dumpfile.h"
+#include "profile-count.h"
 #include "tree-cfg.h"
 #include "errors.h"
 #include "fold-const.h"