From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.CeBiTec.Uni-Bielefeld.DE (smtp.CeBiTec.Uni-Bielefeld.DE [129.70.160.84]) by sourceware.org (Postfix) with ESMTPS id 3C1C738708F9 for ; Thu, 17 Dec 2020 10:36:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 3C1C738708F9 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=CeBiTec.Uni-Bielefeld.DE Authentication-Results: sourceware.org; spf=none smtp.mailfrom=ro@cebitec.uni-bielefeld.de Received: from localhost (localhost [127.0.0.1]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTP id ADB879E23; Thu, 17 Dec 2020 11:36:26 +0100 (CET) X-Virus-Scanned: amavisd-new at CeBiTec.Uni-Bielefeld.DE Received: from smtp.CeBiTec.Uni-Bielefeld.DE ([127.0.0.1]) by localhost (smtp.cebitec.uni-bielefeld.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id mS3fZfV1E1iw; Thu, 17 Dec 2020 11:36:26 +0100 (CET) Received: from manam.CeBiTec.Uni-Bielefeld.DE (p4fddb2f4.dip0.t-ipconnect.de [79.221.178.244]) by smtp.CeBiTec.Uni-Bielefeld.DE (Postfix) with ESMTPSA id 16667A28E; Thu, 17 Dec 2020 11:36:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=CeBiTec.Uni-Bielefeld.DE; s=20200306; t=1608201386; bh=XgpqKQkoVMcwV5B/d/TNYkbCEGoq05MJw3QHylrsybg=; h=From:To:Cc:Subject:Date:From; b=IvNJex5vKAqvV2MUCYNmZjyuFm88LTdHAkdyZ86xW9kx/PFcZW3n81daUulxAA7h7 HgHJqo9hfYL2aYhwacL56HqYI2rxiSmnTirxGkvtl3/QecTZXQ1LKisizThLVVlzsP qHNI7OiXIKllRL38EeJTJKboVi3IjDL0K3IeM/Sw8IMNWxXGGJqNFanzHUPWSZbM+o r39wngnRnKW0a1RG88vZGoytQxnfkh4ZyAiKiw1nIdBj0JjTjzCL1RB26MpJhTY1uQ S2xfEGN2jbMKGNv8xMsMYF5uWvkUKHgvBbkXG9+p5+AK/SR1I6+hWAt5IY7RLOWyzB 5XaNd19udZlyA== From: Rainer Orth To: gcc-patches@gcc.gnu.org Cc: Richard Sandiford Subject: [PATCH] rtl-ssa: Include memmodel.h before tm_p.h Date: Thu, 17 Dec 2020 11:36:25 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (usg-unix-v) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Status: No, score=-3796.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 17 Dec 2020 10:36:30 -0000 --=-=-= Content-Type: text/plain 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 (both into stage 3 now, so the compilation error is gone). Ok for master? Rainer -- ----------------------------------------------------------------------------- Rainer Orth, Center for Biotechnology, Bielefeld University 2020-12-17 Rainer Orth gcc: * rtl-ssa.h: Include memmodel.h before tm_p.h. --=-=-= Content-Type: text/x-patch Content-Disposition: inline; filename=rtl-ssa-memmodel.patch diff --git a/gcc/rtl-ssa.h b/gcc/rtl-ssa.h --- a/gcc/rtl-ssa.h +++ b/gcc/rtl-ssa.h @@ -51,8 +51,8 @@ #include "rtlanal.h" // Provides the global crtl->ssa. +#include "memmodel.h" #include "tm_p.h" -#include "memmodel.h" #include "emit-rtl.h" // The rtl-ssa files themselves. --=-=-=--