public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
From: Rainer Orth <ro@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r11-6231] rtl-ssa: Include memmodel.h before tm_p.h
Date: Thu, 17 Dec 2020 14:35:16 +0000 (GMT)	[thread overview]
Message-ID: <20201217143516.E95C53894C14@sourceware.org> (raw)

https://gcc.gnu.org/g:d592ee3ada825fe8c022e1d5fa30562b17fc3221

commit r11-6231-gd592ee3ada825fe8c022e1d5fa30562b17fc3221
Author: Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
Date:   Thu Dec 17 15:31:06 2020 +0100

    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:
---
 gcc/rtl-ssa.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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.


                 reply	other threads:[~2020-12-17 14:35 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20201217143516.E95C53894C14@sourceware.org \
    --to=ro@gcc.gnu.org \
    --cc=gcc-cvs@gcc.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).