From patchwork Wed Feb 21 18:35:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Evgeny Karpov X-Patchwork-Id: 86185 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id D81273858431 for ; Wed, 21 Feb 2024 18:36:09 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from EUR03-AM7-obe.outbound.protection.outlook.com (mail-am7eur03on2128.outbound.protection.outlook.com [40.107.105.128]) by sourceware.org (Postfix) with ESMTPS id 7970E385841A for ; Wed, 21 Feb 2024 18:35:31 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7970E385841A 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 7970E385841A Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.105.128 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708540534; cv=pass; b=VU8Kxlg+u3+WW0TeS/Bs8ZNQALDSzocFBV9JrGBwWHh/CBRzR12hD9vM7JwTtis7eS/Jme9yV6t12MtqGy7z9rnJ+f9p8DJnZQZ7ds+D5MoKWSHIPBIhL5WQAsA9oFFMjHJwqvnS6db8n1e7xg0VC2lBMqrfNrhahQ2Wj3RGby4= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1708540534; c=relaxed/simple; bh=2bCvSLC/uhipF6KZz1XAIB51sy5HP0ioPkpZPDM2fhs=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=cSgdz027xnalHrVGhX7pIRGNBKNymAB9QudeopJLW195cpbJCXH2Myz0ehZhbroCm6eDvKXzAlR8RJS3Yc/dRgGBit09hDvblDynz2KqRUKmlp+H3w6UtX0Ah/CI9tywDVOyWP0d/id70FfUbyj04NKa+pFE3QqjIqH7U6RlkXE= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cKWZJ561YD70Bgp0Qzdet0UWUvPBY1GqIuQgvPT4jZLMBdbEzEgXikaD0uCDLwlVFN/Smd524Ao7dxuchn8aEZiU2jTIPZBhFvGvbs4lON5tpZDSG+wPrMyvt+qVp0XBXNt6WKRhp3+GsAr1lUOdec+Is6PRTxuVrRvg10GXzP4iuCJP54gZqn+b+tmALz/5DstzoDLB6Q78ZdQOb3swkA3aRmMikbOslNvjMjViJOAo8pY1t7UtHk8aHt0B3/coJk2X4DQP0sYZdZxQ7QMqaa2Ov43z7l0wJORsvL0pElKxvH57BEPe4CF3xmSjdnq/wveyzQbHBhAhpOC61xWO4w== 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=5vu2E86uA0sXinLTbbKxfZkdVet85fBhqI8cKPGbjlc=; b=evbyNfpQS3dsjzTK8YcZZxbLpef1Xrdi6IleAvbx7PL25xCYbovWS8q4G99RPmoVcx7dJLzzoweFhcuKLY2ui6tK0nD1axGk9JwDN1Ea46kVs1BwG+VPv3TzAAGqZeUAf3Gik2+8LXxEI3MZHEcvFQFjGJt3AnCDE+31jj39dD0UdJ0matGnbR6PUyVlEAg3Ozm5qezQ4s/FqXxNwddqejeQnPWQurgV2N82vWIns1qRPsHbCDC2piAyMOMd1VD2iJdtJidpb3Guc/r/A10Ji7E55jNDZfM63cGUTYGFnae5oZxMpG3Crgy4vKzVXcbqVGn4/wLxwXK62ZevSica+A== 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=5vu2E86uA0sXinLTbbKxfZkdVet85fBhqI8cKPGbjlc=; b=QduhAjHh6PL/GIALCI/IRffALVMi6iwce80PejmVMb8m4ISKshVNK3HoisS4HusoPq5SkMrMa+CO75ygsUew2b1WwGNxL7moT3xHINYc0FHFI7chIxsH3K4I8g8ZcsC4rE/1MBM4rVVCmHGnsF0rMDkPuyu3wHDLRn8dqF4gbKc= Received: from VI1PR83MB0431.EURPRD83.prod.outlook.com (2603:10a6:800:17f::6) by DBBPR83MB0614.EURPRD83.prod.outlook.com (2603:10a6:10:533::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7339.8; Wed, 21 Feb 2024 18:35:28 +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.7339.007; Wed, 21 Feb 2024 18:35:28 +0000 From: Evgeny Karpov To: Evgeny Karpov , "gcc-patches@gcc.gnu.org" CC: "richard.sandiford@arm.com" , "10walls@gmail.com" <10walls@gmail.com>, Maxim Kuvyrkov , "mark@harmstone.com" , Zac Walker , Ron Riddle , Radek Barton Subject: [PATCH v1 06/13] Rename section and encoding functions from i386 which will be used in aarch64 Thread-Topic: [PATCH v1 06/13] Rename section and encoding functions from i386 which will be used in aarch64 Thread-Index: AQHaZPS9Gn5vUfYCykee0Y7JQgV1+Q== Date: Wed, 21 Feb 2024 18:35:28 +0000 Message-ID: References: In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: msip_labels: MSIP_Label_f42aa342-8706-4288-bd11-ebb85995028c_ActionId=57576bd1-751e-4189-ac11-c600ca5b612b; 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-02-21T17:14:30Z; 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_|DBBPR83MB0614:EE_ x-ms-office365-filtering-correlation-id: 58e84147-d83a-4e50-eb28-08dc330be06b x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: bIU8qX726lxdgtGFzjUt+GtsOuCQRHc6HdPkDb+PJEyb/OCdY8nBV7ZUmW4yBE65UDbTCR8oU3DfFbkGy9pbmDP8zYJLXIvs33mURtWf36BsERCAFjiiZEENpro2++0WIHS2QbkTiQQkfW5VLTiy16vqButVe24pscjG52NufmENQRCPul3z2mmRvgrLBnhZe9pu23/T9x5dZgyBI7EKccjYjYwc1XznTJ8JFQWPEQgpTk/9Ygz7STd76UuJlfrIrcbpcmGzsdbJonE6LXQobG0Xc0/Yk2ip1RiAWVI4GAdmH6Kuz4yyTsaRTFjsZQqOh47gVeo+6NVVkSO3yjqUvbz6XEy1ewUoNRhcftyzLsg= 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)(38070700009); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: nhw5jZs9kReKQoTqdUcB6RNFNr172es5cr8Z5cZzCd5671cVpgwVwyQR3P9StxUKWyEYQsbiZWazM5TmXJ9PoP48VFuNC8qs8TtuW2aZz1JgknOSMjzo+VtkIMWIyzVIhXQADnoFKvBJnPCFyG2RAtdjTzWoRVHmZVRz9y5nABSzQerdS5JH49pZQWaYY7Zdt7zYPABPhjUbb+ujPb5YEIVDEYUBkma0uRgEgQ2pRx+kMWoe1/2zwwwVtv2qpjyHal8lLr+/w69oXoeoqyNU7vVXT2Wb22OvPQ+z87/JkNaihmU1w/S6h+8cPfEZoKH6+/xWE4hbKVK1hHQbonpeHLOAQxeJUViTdrT2Ayy8Eb8VHKEET3jnJx2jC0wo4/055gWYT031mxSpWmwH84jcap0b+ebq8Z1QM8PsaFQvT8bqTN/EZW7AU+2uwXw+d7kTd/puS0EDc1XXNwVgRBkq145c36goZPx0KShlwy2hM194kRQiAVfFVWCTroXldw+v29u01ayCotgTiSOrN3faNv9+Qk4EEx0emxb+aPn+sy5hWYPw8z/E/L9GCrnL56CKhwJIk+3KijcBBmfZ/E5RO98/075/pD+OyJoTcE/UNqFSlFELuyl2T+B3ezCY6BU/FEL8LpMfHf+5poecCXn7BAL6e++zeZBEXfeYDn5Fr4YNsS1i4ouICPqUqXPq9f4dqFEsSlFl2ns5OJ35yxT55tB1JR1FaDcM28os7v286nEoy1iDJ3hrMyX0+EaOo62/IQ2bUn5u2rALl62/GmIk1X26ETsbLTeJy6LxPEy7vUXH7cP2vlPCxYZ6u3Ly3135kohCyCmz7YoFktE8vuCCq4UHyjLKwlIe/Vbfgl6BrZSKq22dS73cTLuytJPRoGouVsq+hbB13/EcesMYE8AAENLp5eM+0X69KbloATmCDefWwt6u1ICJO7lgqeoUi7kYvoLzSZA/WZUy8gC4Ocr5ZwQIOGCOqfBmui0289Q7R6GAk5+UFWpKB2uMje2Wk0n+8sVAOEZA0nB+QExm0XBhgqYvddYzWfAkUvAPvbkFKPIcj1nDzmOrChEiISbjAp+fTa/adeH7eZJut/aPnFSJGe2Qs4peKRMceQjrcWquZr7zMH8glR4lMrX8L3EWJxK6VK5K9ghuw4t9B0v58I6aBkQB3pWSpPju0A4qCOzarb5L+N83foF7dSYtp2pcexEHwWJ6Ye7vGJ58vkMuWQY0wgmOTxnv+DlxmtngLomGzeyv9UMbvlzaa1Yvn6i1b7FiWm3/2q1pdzTJdeSsHNpKtVntoeMe/vamHnStuIoSpUmW8w9og+BLOV/iVTsz93X9H3pdoh0nIRuxBBfZ17iGYLMfEtThIJ/w0mao/6SHSaQFfSx3kCwXRiboqOpbdLCacl4o33NtH5BRiRuXAyW4TN+fhuLo1muaOAjV69pp6nDUxVYUfb52GbixvGVAMt6l5d3H/EqEZDXvZRemlNDkz7WF17EBL1UyITujot89jnJ1Rc5/oxoXzXxm1jbDIBiONHiM2dPAIpWH1PhwFEz+QcXVM1jtAPFvkC4p1zpn/TPNsByvP34dPuUdwsC1Tzjm 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: 58e84147-d83a-4e50-eb28-08dc330be06b X-MS-Exchange-CrossTenant-originalarrivaltime: 21 Feb 2024 18:35:28.2245 (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: ynyHPC2WOh+yu8UeHn841P8Z+IQsmuLJoy9jcKcfwNCUHuIFN1ufg0qv6OgUm2HjTQvBlBu7HDj9RyzFf2QzkQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR83MB0614 X-Spam-Status: No, score=-10.3 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+patchwork=sourceware.org@gcc.gnu.org From 69561787206b968b5a86c48ca9c9f9073761ed78 Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Tue, 20 Feb 2024 17:22:31 +0100 Subject: [PATCH v1 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 008d9b13303..b011ea033c9 100644 --- a/gcc/varasm.cc +++ b/gcc/varasm.cc @@ -8626,7 +8626,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;