From patchwork Mon Mar 4 17:41:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Karpov X-Patchwork-Id: 1907816 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=microsoft.com header.i=@microsoft.com header.a=rsa-sha256 header.s=selector2 header.b=cyXCCFar; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TpQxf4KCkz23fC for ; Tue, 5 Mar 2024 04:42:14 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 74696385842F for ; Mon, 4 Mar 2024 17:42:12 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01on2097.outbound.protection.outlook.com [40.107.15.97]) by sourceware.org (Postfix) with ESMTPS id 41BA03858408 for ; Mon, 4 Mar 2024 17:41:53 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 41BA03858408 Authentication-Results: sourceware.org; dmarc=pass (p=reject dis=none) header.from=microsoft.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=microsoft.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 41BA03858408 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.15.97 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1709574115; cv=pass; b=wQ4R31p+cp39ITOqGA4wr53DFXKnxkJaveRoF+O16AJiWsuaYXi8I3ppEZbHKfbnbUi0HFzOI9MS/SMlfq0BOgCIs0NDGZuZtnLtpS1m5X1d2BIoyIFCR1H1l5IA49Nx05o7yNV+4WhMG1FBIKFKwFkhIr/tvIhfZvByScsgTdg= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1709574115; c=relaxed/simple; bh=NeILwZIYAzn4AboQzOPCD0HkoDyUyqKOvVDcGVMm9L4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=rKlJ4yh7na5dTxrlYi6qRMvhhUjF6OA2xrPdJFftBkZ/Ia2A5aiP0WXJH1kBU6FOwzmuLN8SK2rElJXEXHnIXr8HaALxxx74aEGpBgk/b+IcCeY/CzFbXgzT1AdaQBYJqk0WtxiNK/MFhrI4ByDGj0n0uw7M9FvStX1c/I5312g= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=S9gOoRrwIdbnUd0/JvXaZWKSxJweIqMZbABXAeHPPBXkaBzDVqviM1SA5W70MPLeD37i6MBVvif5aWX8maMh9SaBQpJYqJCe07hy9bsw135dZQJUolnYP30D6jlnDnibWMqoWQrIhbanNTSLGP5U4JbHFzi0iUNVp/5HHX1wKBH1S1yeyFD8tObQlZFBPwzhQkSxeKyXWl/Tf9TCLHYRYb+f0Ac6B13kVGAhArBOKe8bSZcgsb+hU2Qg25R8JBAHU/KQh5iA/1b8okzbuplfwJ9Ka4stAVBp09I8Qy+slzCXL8jS7U/IYHkyWWroK06Qmu2ta9BQ4+hXUHYN+O+elw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TmWsipn0ys3ihFcjM48bMUQa5vPJIxkAW+BljFZcQYw=; b=KnlVBEzzsiT2wMQM8uphWuVzYPLIqxHZpixhlfC10W4Tu9NRaTH9f1H9NVs8ko0mZN52hqyrkZrozhwv/T0E1rwr+C98A1Zizlqi5E/C5y+puQ2dk3mLtouWJnfyLsSfeYR0i7v/P1xZmmm3jlraT9U5RvFda3NYhQlGDSB4gnOx6ZjduDF4SCivwxUK9DvMoW6ijeJPVnF/V8jX7P7AHFu8LKSa91asqFFb3LspgiDT+FAxJrH/h12VrHgYX1G/AiW7wVS2eGkcb26Ui2bRobs6LllgYevf/4FxTWdylYnuxskPCZWSAOnLdj3ZGeR8VJa18mVdx9pbW8vwJXZU7Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=microsoft.com; dmarc=pass action=none header.from=microsoft.com; dkim=pass header.d=microsoft.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=TmWsipn0ys3ihFcjM48bMUQa5vPJIxkAW+BljFZcQYw=; b=cyXCCFarBdPkoG7QrMknbiXXQZMdLsStW1h85MCVj6yNl8seVDN0lM7W4lvU+QiNwP2Gbn/DL2inKsBO1dwr4bKv4bkl0gtUWrX5K9Jikeyr2Xv5iExadbvg1wgaLqsTBNNzVTMk/5PQYBfRCmj3zlYNktzZZV3JPMcNFS+R4ko= Received: from VI1PR83MB0431.EURPRD83.prod.outlook.com (2603:10a6:800:17f::6) by AM7PR83MB0436.EURPRD83.prod.outlook.com (2603:10a6:20b:1bf::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7386.0; Mon, 4 Mar 2024 17:41:50 +0000 Received: from VI1PR83MB0431.EURPRD83.prod.outlook.com ([fe80::7279:eea0:8540:a0f5]) by VI1PR83MB0431.EURPRD83.prod.outlook.com ([fe80::7279:eea0:8540:a0f5%7]) with mapi id 15.20.7386.002; Mon, 4 Mar 2024 17:41:50 +0000 From: Evgeny Karpov To: Evgeny Karpov , "gcc-patches@gcc.gnu.org" CC: "richard.sandiford@arm.com" , "Richard Earnshaw (lists)" , "Andrew Pinski (QUIC)" , Maxim Kuvyrkov , Radek Barton Subject: [PATCH v2 06/13] Rename section and encoding functions from i386 which will be used in aarch64 Thread-Topic: [PATCH v2 06/13] Rename section and encoding functions from i386 which will be used in aarch64 Thread-Index: AQHabls8IvfSnd4R+kSyWZuHpKHvBA== Date: Mon, 4 Mar 2024 17:41:49 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=804f8e78-f263-4809-bbd5-d515c5934d44; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ContentBits=0; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Enabled=true; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Method=Standard; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_Name=Internal; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SetDate=2024-03-04T17:10:26Z; MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_SiteId=72f988bf-86f1-41af-91ab-2d7cd011db47; authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=microsoft.com; x-ms-publictraffictype: Email x-ms-traffictypediagnostic: VI1PR83MB0431:EE_|AM7PR83MB0436:EE_ x-ms-office365-filtering-correlation-id: d9bc94bc-8419-4d2d-1a5c-08dc3c725eeb x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: qSJMn/3oXAL3Yk9oKACsy2+myaOmV33E6vs9Yj31fWA3Ti9odsHTYtG0YcckCvE4iU0ZeUG6ZUPtrjh7srEYNUYog8PxI5v9/RAlOozW3IXwgNFLSsETw176JJjbG96Neo0L609Ma0DthABZhfP59PAFJ0Ey7yhSzQiD9Rc7q14orXnJQOrnqEv65ofpMsRD0thbhmC0pELYxgMk4i7ngLB9pAbYmUYjhuzjTsFeBsD2OGu7ZiWnY26SwCLAf3TK6NYRjkvQJTfJnQ0OY2NeN2Czkai0Hl1oqznKLSrRCkRV5Ens4NkH4NYMitpx4ueyf6VMBE/n5Z/6C8iki9Ack6+VYpKuCTXXXxwCg+iSByg9LTe/FesQGss5KNPfe1OoZGtn7EQWhtLRYOeR1hksgq8jbQyqfi2sb+OTULE6JKQjI2vztbpOjkVRZydkXkJpEzdAnZNH3TZ05DxjawaFCOoosX1+wTdsvQXIutmjnnqV4i8uDbTS8Ef3bdIS3e8a3R6LwjfSUmnQESHEk56pqDe547QsPq0xSh8C25FUrssEhtZJKQojNeVvK7df0cbqBLQsL5V19ZDbJP4qK5xTHk5GPuyqA1tPDg+sQSpS/h1Rjj/HUlTUNVRJK5VUy2gRCTZAXkhwr73jHa7Q/NeTVf4fznjHoNjFjvRk1G9M43U68eQya06c/FUPdsneGSmDtfli19QAlmwbEbHJ+OdyYWg8plmIxjOei6HGyVviS30= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR83MB0431.EURPRD83.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(376005)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: epSN/Q/I7UpDVhbh5I4r8KopgJZwFq5o5oE5kjItqjavJF/1onCr2IAv6rVnokceHG5opjYMNeq1ttywfy9JI4TPQiThtgi5MrVFVINmfGivzt7zuV02U/uhpopczVsmOrbnXNRqrbv1FZ/iSBCg/Dm08i2Dsly8+kjbjTtyrSy18jUTSzz26ZgLAmpYNzCfLdU6YylfosxTB90JQEI7ymzSOPu3UnnwR74+XIzkxflEsrkeJYyR6eIvFx9dj5ib6uH8x07A0JitTLlkvGalyUI7aB1rFoNnyzG5ujl1IT1lf3i4Zoza4QfZk0TRvce+2jHdjbCvLTE3HnP4nOHKBGRjuTYefYGcwJAInembmIhKuG8F6TVPW225LQFuWWm0XrDi3JBLD7j5O9qgxxTUkWUbke6CMMCe86MX0Q6wh4L6QVQeZot+qkxr5WNWmK0N0SJnxiVpYtdJl9DpAz1qxoK8r3hpvn/UvMRJrq0cw8/N8fKUi9v8CvAgNAQXM73rW3wXt1iM1k4ypuNGUia3f9FtL42kFvp7pM7+86l4aO3HZBrvrdzjVbwVJjGlD1zgJ5SPp7yx3ubT+CsKwqnAuehRm/J1L+DL/vlwO1NlALpRB2nZFs5TQaAm2raD83PQOXgl+WDMzFtzqg8DySNm4+uvXkmI0SMng0nEfLGLNyPMaWHEkacNBUz7S7MCeBXvAAQm50cCV9FVYFh+vvlzcqM9LaWvvpcrv2jf0BCDoA5khLUxnxRZWHhYu1o00Ud70ldfGQnQ959QfFw40SnZsrK9Iczc3r8kQN8wCUr4Z13MIMN182mMyuP8x+cRCT5fiToYOCzR5svVJ8ugJugHNNM/lE+fAcMJnZWvilbFr4KrR2dYbyvWhcnVoH0+mcIHPLampVTJWzl5qfbbA7qwzs4btKGebszMnC8fzBM/wd02lUEuwe2Ajc9beTDaspGG4aFcCeNpTrAGdI1rXXRWp4YuPoHQWjD5PzEsHsDFUZF1IglhD/Muzrg8WU7HiTtcNfwBkg6hF1T8OFkEx6kuDzsiUjdoANh/TxYl/4X28sKL1PDjJ1zw/v5qdxSEvlQdS4xhg86vathtxwARBFjhGksiNmDjhO/jmqZvRJwLrG6dxN67iVVO6AL8F+npxZm/CWDx4npkx49oUIRR0U9WaKSKJ4Mch+V3eqpzbDCWF3wGkjX+Mi+52ZKgSxNkjLxGkPBRPJtEUmNQVw07pVjDztiMYh5nb44Vuan8wDSj/hfKMWO4b7Zxy6PrQpvOlHeFjCLZDoxl9Q98fFxVaplbcxT2i3itvTu3zmNYJUmbjamzGEmF9EjjaAQY7zY4tg04R9CYj2IWp5ByD4VE8jdrWBfEN0ASM8cm1tiR5chc7zr006On9WRcUKae3DFJqM+sX7auJx3dhEJ9RREU6TnxagdCuMTTLeQwCDg4N0PT6UMBMgByQ03me93VvNdn0OBE+rMJOOQ3OCq9UxDPvMX8w6N/+QlQX7JvA79zgqEN2qTgRtuk5i5OLuPsUGIycIgs4kuPjUsJgcdMZIWYEI9mt5pXpxB2FRnXLCuoORqSgyB7Rlp0MzlA1VaPHBKW0xn1 MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: VI1PR83MB0431.EURPRD83.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: d9bc94bc-8419-4d2d-1a5c-08dc3c725eeb X-MS-Exchange-CrossTenant-originalarrivaltime: 04 Mar 2024 17:41:49.5671 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: /RDTaUApLhE88Iy7A/B+ntv5li/1AWdNPy+pTUYvHDnUhfVL2fXwtGiJm5P5IvFymQfZ42tb4NO6fKzxHkj3/A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM7PR83MB0436 X-Spam-Status: No, score=-8.8 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FORGED_SPF_HELO, GIT_PATCH_0, KAM_NUMSUBJECT, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NONE, TXREP, T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Zac Walker Date: Tue, 20 Feb 2024 17:22:31 +0100 Subject: [PATCH v2 06/13] Rename section and encoding functions from i386 which will be used in aarch64 gcc/ChangeLog: * config/i386/cygming.h (SUBTARGET_ENCODE_SECTION_INFO): Rename functions in mingw folder which will be reused for aarch64. (TARGET_ASM_UNIQUE_SECTION): Likewise. (TARGET_ASM_NAMED_SECTION): Likewise. (TARGET_SECTION_TYPE_FLAGS): Likewise. (ASM_DECLARE_COLD_FUNCTION_NAME): Likewise. (ASM_OUTPUT_EXTERNAL_LIBCALL): Likewise. * config/i386/i386-protos.h (i386_pe_unique_section): Rename into ... (mingw_pe_unique_section): ... this. (i386_pe_declare_function_type): Rename into ... (mingw_pe_declare_function_type): ... this. (i386_pe_encode_section_info): Rename into ... (mingw_pe_encode_section_info): ... this. (i386_pe_maybe_record_exported_symbol): Rename into ... (mingw_pe_maybe_record_exported_symbol): ... this. (i386_pe_section_type_flags): Rename into ... (mingw_pe_section_type_flags): ... this. (i386_pe_asm_named_section): Rename into ... (mingw_pe_asm_named_section): ... this. * config/mingw/winnt.cc (i386_pe_encode_section_info): Rename into ... (mingw_pe_encode_section_info): ... this. (i386_pe_unique_section): Rename into ... (mingw_pe_unique_section): ... this. (i386_pe_section_type_flags): Rename into ... (mingw_pe_section_type_flags): ... this. (i386_pe_asm_named_section): Rename into ... (mingw_pe_asm_named_section): ... this. (i386_pe_asm_output_aligned_decl_common): Likewise. (i386_pe_declare_function_type): Rename into ... (mingw_pe_declare_function_type): ... this. (i386_pe_maybe_record_exported_symbol): Rename into ... (mingw_pe_maybe_record_exported_symbol): ... this. (i386_pe_start_function): Likewise. * varasm.cc (switch_to_comdat_section): Likewise. --- gcc/config/i386/cygming.h | 18 +++++++++--------- gcc/config/i386/i386-protos.h | 12 ++++++------ gcc/config/mingw/winnt.cc | 22 +++++++++++----------- gcc/varasm.cc | 2 +- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h index 1af5bc380a5..beedf7c398a 100644 --- a/gcc/config/i386/cygming.h +++ b/gcc/config/i386/cygming.h @@ -219,7 +219,7 @@ do { \ section and we need to set DECL_SECTION_NAME so we do that here. Note that we can be called twice on the same decl. */ -#define SUBTARGET_ENCODE_SECTION_INFO i386_pe_encode_section_info +#define SUBTARGET_ENCODE_SECTION_INFO mingw_pe_encode_section_info /* Local and global relocs can be placed always into readonly memory for PE-COFF targets. */ @@ -235,7 +235,7 @@ do { \ #undef ASM_DECLARE_OBJECT_NAME #define ASM_DECLARE_OBJECT_NAME(STREAM, NAME, DECL) \ do { \ - i386_pe_maybe_record_exported_symbol (DECL, NAME, 1); \ + mingw_pe_maybe_record_exported_symbol (DECL, NAME, 1); \ ASM_OUTPUT_LABEL ((STREAM), (NAME)); \ } while (0) @@ -283,16 +283,16 @@ do { \ /* Windows uses explicit import from shared libraries. */ #define MULTIPLE_SYMBOL_SPACES 1 -#define TARGET_ASM_UNIQUE_SECTION i386_pe_unique_section +#define TARGET_ASM_UNIQUE_SECTION mingw_pe_unique_section #define TARGET_ASM_FUNCTION_RODATA_SECTION default_no_function_rodata_section #define SUPPORTS_ONE_ONLY 1 /* Switch into a generic section. */ -#define TARGET_ASM_NAMED_SECTION i386_pe_asm_named_section +#define TARGET_ASM_NAMED_SECTION mingw_pe_asm_named_section /* Select attributes for named sections. */ -#define TARGET_SECTION_TYPE_FLAGS i386_pe_section_type_flags +#define TARGET_SECTION_TYPE_FLAGS mingw_pe_section_type_flags /* Write the extra assembler code needed to declare a function properly. */ @@ -307,7 +307,7 @@ do { \ #define ASM_DECLARE_COLD_FUNCTION_NAME(FILE, NAME, DECL) \ do \ { \ - i386_pe_declare_function_type (FILE, NAME, 0); \ + mingw_pe_declare_function_type (FILE, NAME, 0); \ i386_pe_seh_cold_init (FILE, NAME); \ ASM_OUTPUT_LABEL (FILE, NAME); \ } \ @@ -333,7 +333,7 @@ do { \ /* Declare the type properly for any external libcall. */ #define ASM_OUTPUT_EXTERNAL_LIBCALL(FILE, FUN) \ - i386_pe_declare_function_type (FILE, XSTR (FUN, 0), 1) + mingw_pe_declare_function_type (FILE, XSTR (FUN, 0), 1) /* This says out to put a global symbol in the BSS section. */ #undef ASM_OUTPUT_ALIGNED_BSS @@ -416,9 +416,9 @@ do { \ { \ const char *alias \ = IDENTIFIER_POINTER (DECL_ASSEMBLER_NAME (DECL)); \ - i386_pe_maybe_record_exported_symbol (DECL, alias, 0); \ + mingw_pe_maybe_record_exported_symbol (DECL, alias, 0); \ if (TREE_CODE (DECL) == FUNCTION_DECL) \ - i386_pe_declare_function_type (STREAM, alias, \ + mingw_pe_declare_function_type (STREAM, alias, \ TREE_PUBLIC (DECL)); \ ASM_OUTPUT_DEF (STREAM, alias, IDENTIFIER_POINTER (TARGET)); \ } while (0) diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h index 46214a63974..dbc861fb1ea 100644 --- a/gcc/config/i386/i386-protos.h +++ b/gcc/config/i386/i386-protos.h @@ -295,16 +295,16 @@ extern void ix86_target_macros (void); extern void ix86_register_pragmas (void); /* In winnt.cc */ -extern void i386_pe_unique_section (tree, int); -extern void i386_pe_declare_function_type (FILE *, const char *, int); +extern void mingw_pe_unique_section (tree, int); +extern void mingw_pe_declare_function_type (FILE *, const char *, int); extern void i386_pe_record_external_function (tree, const char *); -extern void i386_pe_maybe_record_exported_symbol (tree, const char *, int); -extern void i386_pe_encode_section_info (tree, rtx, int); +extern void mingw_pe_maybe_record_exported_symbol (tree, const char *, int); +extern void mingw_pe_encode_section_info (tree, rtx, int); extern bool i386_pe_binds_local_p (const_tree); extern const char *i386_pe_strip_name_encoding_full (const char *); extern bool i386_pe_valid_dllimport_attribute_p (const_tree); -extern unsigned int i386_pe_section_type_flags (tree, const char *, int); -extern void i386_pe_asm_named_section (const char *, unsigned int, tree); +extern unsigned int mingw_pe_section_type_flags (tree, const char *, int); +extern void mingw_pe_asm_named_section (const char *, unsigned int, tree); extern void i386_pe_asm_output_aligned_decl_common (FILE *, tree, const char *, HOST_WIDE_INT, diff --git a/gcc/config/mingw/winnt.cc b/gcc/config/mingw/winnt.cc index 9b315898fca..1ed383155d0 100644 --- a/gcc/config/mingw/winnt.cc +++ b/gcc/config/mingw/winnt.cc @@ -293,7 +293,7 @@ i386_pe_mangle_assembler_name (const char *name) } void -i386_pe_encode_section_info (tree decl, rtx rtl, int first) +mingw_pe_encode_section_info (tree decl, rtx rtl, int first) { rtx symbol; int flags; @@ -384,7 +384,7 @@ i386_pe_strip_name_encoding_full (const char *str) } void -i386_pe_unique_section (tree decl, int reloc) +mingw_pe_unique_section (tree decl, int reloc) { int len; const char *name, *prefix; @@ -442,7 +442,7 @@ i386_pe_reloc_rw_mask (void) #define SECTION_PE_SHARED SECTION_MACH_DEP unsigned int -i386_pe_section_type_flags (tree decl, const char *, int reloc) +mingw_pe_section_type_flags (tree decl, const char *, int reloc) { unsigned int flags; @@ -471,7 +471,7 @@ i386_pe_section_type_flags (tree decl, const char *, int reloc) } void -i386_pe_asm_named_section (const char *name, unsigned int flags, +mingw_pe_asm_named_section (const char *name, unsigned int flags, tree decl) { char flagchars[8], *f = flagchars; @@ -548,7 +548,7 @@ i386_pe_asm_output_aligned_decl_common (FILE *stream, tree decl, rounded = (rounded / (BIGGEST_ALIGNMENT / BITS_PER_UNIT) * (BIGGEST_ALIGNMENT / BITS_PER_UNIT)); - i386_pe_maybe_record_exported_symbol (decl, name, 1); + mingw_pe_maybe_record_exported_symbol (decl, name, 1); fprintf (stream, "\t.comm\t"); assemble_name (stream, name); @@ -574,7 +574,7 @@ i386_pe_asm_output_aligned_decl_common (FILE *stream, tree decl, visible. */ void -i386_pe_declare_function_type (FILE *file, const char *name, int pub) +mingw_pe_declare_function_type (FILE *file, const char *name, int pub) { fprintf (file, "\t.def\t"); assemble_name (file, name); @@ -641,7 +641,7 @@ static GTY(()) struct stub_list *stub_head; the LTO marker. */ void -i386_pe_maybe_record_exported_symbol (tree decl, const char *name, int is_data) +mingw_pe_maybe_record_exported_symbol (tree decl, const char *name, int is_data) { rtx symbol; struct export_list *p; @@ -761,11 +761,11 @@ i386_pe_file_end (void) the real function so that an (unused) import is created. */ const char *realsym = i386_find_on_wrapper_list (p->name); if (realsym) - i386_pe_declare_function_type (asm_out_file, + mingw_pe_declare_function_type (asm_out_file, concat ("__real_", realsym, NULL), TREE_PUBLIC (decl)); #endif /* CXX_WRAP_SPEC_LIST */ TREE_ASM_WRITTEN (decl) = 1; - i386_pe_declare_function_type (asm_out_file, p->name, + mingw_pe_declare_function_type (asm_out_file, p->name, TREE_PUBLIC (decl)); } } @@ -1354,8 +1354,8 @@ i386_pe_seh_init_sections (void) void i386_pe_start_function (FILE *f, const char *name, tree decl) { - i386_pe_maybe_record_exported_symbol (decl, name, 0); - i386_pe_declare_function_type (f, name, TREE_PUBLIC (decl)); + mingw_pe_maybe_record_exported_symbol (decl, name, 0); + mingw_pe_declare_function_type (f, name, TREE_PUBLIC (decl)); /* In case section was altered by debugging output. */ if (decl != NULL_TREE) switch_to_section (function_section (decl)); diff --git a/gcc/varasm.cc b/gcc/varasm.cc index 747f74ba1c0..2ab9e096853 100644 --- a/gcc/varasm.cc +++ b/gcc/varasm.cc @@ -8672,7 +8672,7 @@ switch_to_comdat_section (section *sect, tree decl) everything in .vtable_map_vars at the end. A fix could be made in - gcc/config/i386/winnt.cc: i386_pe_unique_section. */ + gcc/config/i386/winnt.cc: mingw_pe_unique_section. */ if (TARGET_PECOFF) { char *name;