From: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date: Thu, 17 Dec 2020 14:31:06 +0000 (+0100)
Subject: rtl-ssa: Include memmodel.h before tm_p.h
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d592ee3ada825fe8c022e1d5fa30562b17fc3221;p=gcc.git

rtl-ssa: Include memmodel.h before tm_p.h

The RTL SSA merge broke SPARC bootstrap:

In file included from ./tm_p.h:4,
                 from /vol/gcc/src/hg/master/local/gcc/rtl-ssa.h:54,
                 from /vol/gcc/src/hg/master/local/gcc/fwprop.c:29:
/vol/gcc/src/hg/master/local/gcc/config/sparc/sparc-protos.h:45:47: error: use of enum 'memmodel' without previous declaration
 extern void sparc_emit_membar_for_model (enum memmodel, int, int);
                                               ^~~~~~~~

and similarly in rtl-ssa/functions.cc, rtl-ssa/changes.cc, and
rtl-ssa/insns.cc.

Fixed by moving the memmove.h include in rtl-ssa.h before tm_p.h.

Tested on sparc-sun-solaris2.11 and i386-pc-solaris2.11.


2020-12-17  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

	gcc:
	* rtl-ssa.h: Include memmodel.h before tm_p.h.
---

diff --git a/gcc/rtl-ssa.h b/gcc/rtl-ssa.h
index 60cdad03dc0..edb09a7a1dc 100644
--- a/gcc/rtl-ssa.h
+++ b/gcc/rtl-ssa.h
@@ -51,8 +51,8 @@
 #include "rtlanal.h"
 
 // Provides the global crtl->ssa.
-#include "tm_p.h"
 #include "memmodel.h"
+#include "tm_p.h"
 #include "emit-rtl.h"
 
 // The rtl-ssa files themselves.