From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <marxin@sourceware.org>
Received: by sourceware.org (Postfix, from userid 1851)
 id 09859393A42F; Wed, 12 Jan 2022 11:53:35 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 09859393A42F
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Martin Liska <marxin@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org
Subject: [gcc r12-6520] Include elfos.h before ${tm_file}.
X-Act-Checkin: gcc
X-Git-Author: Martin Liska <mliska@suse.cz>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 4960516df2f90e6ae16aa03c63c8bf2c702e6bc4
X-Git-Newrev: f4ce10fb4d57d427cb8bed33b36b9cf56a1dd17c
Message-Id: <20220112115335.09859393A42F@sourceware.org>
Date: Wed, 12 Jan 2022 11:53:35 +0000 (GMT)
X-BeenThere: gcc-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Gcc-cvs mailing list <gcc-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/gcc-cvs/>
List-Help: <mailto:gcc-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-cvs>,
 <mailto:gcc-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Jan 2022 11:53:35 -0000

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

commit r12-6520-gf4ce10fb4d57d427cb8bed33b36b9cf56a1dd17c
Author: Martin Liska <mliska@suse.cz>
Date:   Wed Jan 12 11:09:20 2022 +0100

    Include elfos.h before ${tm_file}.
    
    Fixes:
    
    In file included from ./tm.h:23,
                      from gcc/genconfig.c:25:
    gcc/config/elfos.h:209: warning: "READONLY_DATA_SECTION_ASM_OP" redefined
       209 | #define READONLY_DATA_SECTION_ASM_OP    "\t.section\t.rodata"
           |
    In file included from ./tm.h:21,
                      from gcc/genconfig.c:25:
    gcc/config/epiphany/epiphany.h:671: note: this is the location of the previous definition
       671 | #define READONLY_DATA_SECTION_ASM_OP    "\t.section .rodata"
    
    gcc/ChangeLog:
    
            * config.gcc: Include elfos.h before ${tm_file}.

Diff:
---
 gcc/config.gcc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 89e0992fda5..f1b8d832c6f 100644
--- a/gcc/config.gcc
+++ b/gcc/config.gcc
@@ -1620,7 +1620,7 @@ csky-*-*)
 	esac
 	;;
 epiphany-*-elf | epiphany-*-rtems*)
-	tm_file="${tm_file} dbxelf.h elfos.h"
+	tm_file="dbxelf.h elfos.h ${tm_file}"
 	tmake_file="${tmake_file} epiphany/t-epiphany"
 	case ${target} in
 	epiphany-*-rtems*)