From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01on2138.outbound.protection.outlook.com [40.107.14.138]) by sourceware.org (Postfix) with ESMTPS id 6D80D3858414 for ; Thu, 11 Apr 2024 13:53:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 6D80D3858414 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 6D80D3858414 Authentication-Results: server2.sourceware.org; arc=pass smtp.remote-ip=40.107.14.138 ARC-Seal: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712843598; cv=pass; b=nfb/RLUYH0zP6po3jOtiEezSrlNrVHJkHH6pI9zwEpuaHR1t39gNbhhBDKT53Xw1JouVtZhlDrEFOJSbIlhfqBy2mE6FPg9oI8CU9x9LhQdbNCgvHBiwUsAE9W4Vw67RA9Wz9L414HnTFrCMv2xcxKDynPXqZrk6crA+PK25PdU= ARC-Message-Signature: i=2; a=rsa-sha256; d=sourceware.org; s=key; t=1712843598; c=relaxed/simple; bh=8BdwvD02fkNsNeuZmJcGGZK7s0jd5OawRBWh0EUq5ak=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=UOdJ9eop7iGm4cDCilloXJKWUElR09N0pCGzJUiDc3K4CqvocwddfjikzUy1R/RklyWniM6+sXlZ/X/nAkQvaEFXfQCVyu7U6/Bw5wCboXuAXMD9U6JSemFNDYtJp/Xsdi9X3SHh97cDMnqw59oKZE+VBLfoLSuHyJqKEAV1n/I= ARC-Authentication-Results: i=2; server2.sourceware.org ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jvWQcOeCcTVioFOfo2Nol1rDDYPHi5sISUZIFy93t8XeJ+J5e5afJlYG9RGe3A7O43fpJt89xcNfA9J75HG98NkuEZAYBt8MD79wFWN9MlvXHWeX52E9bW+X+lWcQteDcdkc1y9ZZK2XSot90pOVl47MyD6h/7ahXrTgZdAlSM82y5zsvsq2WtAGX4581gS96CWRjDv9RuAgzGY/p85uCYP7BEGd6nA00ZlyMvnLkvFsEFOxjeJd7WwWkLFjOSq38uY9xDn0ZXBoiajhcKDncQIH29v5JUS9ZxGkIZ3lSWYtJ4BleWzPouNx7sg+j4MrylRx2wYdwZlId0/iIp+AcQ== 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=5qNHoilKUL+A085GIkpvZoxBkMNn2MZG79P71AkxQyk=; b=YNkG95jHIsDeE1xOcCF6X41Y9YCYZgyHdj3G5pueFqZV3g3+m+XGRuHlM0wsOUQpmVuoFWGTOydxjYWd78ha+RQgNumTgrNCSwyq/HaOHWyutQvMUE9vLAChKDHtpKVnz9aaKFbJ6nv/fFbwrZ1DaunScfrLBpcljEFLD4CwPu88CZhwI/zPTU2JPFSt25aRkH0bPcAS9b490JiENk9fOiy1r+jvjvd5HekmjQeZjoGqXCI+3MpAgnz+1P2m3ndWO87tqzkvlQUrxH8xZ7vF0+UBR7WRU3udNWSnw7msnnJCEtp9vKCYueX80S8L4/zc2/lzi3Ab4gWeukLkes59hQ== 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=5qNHoilKUL+A085GIkpvZoxBkMNn2MZG79P71AkxQyk=; b=eg/QomZd5zeUsAK8BcBlKLRHBT6J9DMtf+GpNZ6jOqVLysuARQTcxkFX33AtVEuyt9taol4S8OZjQBexqPorJPFx/mOGzvBKpNb89JVffcXZ3IwRLIHzGVCfp+QtbuXWQ4dv9t0uI66etu5hu1qCikfBRAj7dt3cRCH8xGQdTZU= Received: from VI1PR83MB0431.EURPRD83.prod.outlook.com (2603:10a6:800:17f::6) by PA4PR83MB0525.EURPRD83.prod.outlook.com (2603:10a6:102:26a::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7495.12; Thu, 11 Apr 2024 13:53:12 +0000 Received: from VI1PR83MB0431.EURPRD83.prod.outlook.com ([fe80::7147:b7f9:31fb:39f7]) by VI1PR83MB0431.EURPRD83.prod.outlook.com ([fe80::7147:b7f9:31fb:39f7%6]) with mapi id 15.20.7495.011; Thu, 11 Apr 2024 13:53:12 +0000 From: Evgeny Karpov To: Evgeny Karpov , "gcc-patches@gcc.gnu.org" CC: "richard.sandiford@arm.com" , "Richard Earnshaw (lists)" , Maxim Kuvyrkov , Radek Barton Subject: [PATCH v3 05/12] Rename section and encoding functions from i386 which will be used in aarch64 Thread-Topic: [PATCH v3 05/12] Rename section and encoding functions from i386 which will be used in aarch64 Thread-Index: AQHajBeXIXKStUVw+UeC0fBEhcfLUQ== Date: Thu, 11 Apr 2024 13:53:12 +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=ee10a91a-ecb0-4ef6-a7aa-22b9c54f3645;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-04-11T13:35:01Z;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_|PA4PR83MB0525:EE_ x-ms-office365-filtering-correlation-id: e56a87ad-4d1d-425b-1735-08dc5a2eba59 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: F/OGpFnGXGcDkWTYaNUJw2BdX5AE0fuUNxfbC2xRX/7SNnqVaR+qHVQMFE0Cg9iRuMRIaiqMX5bzOR+d/b3t1d84kuyooBk5XGgkeZlKsAb7xnSy+5g9y67YQgCRAgNdx+IWpLtumM8ZyuNyMYJDCsUiG9+9awce4uJx/mVMFxz0GZJ9GN/lLGVWAXereNmXtU7QvZm1hC6TDZ3l8vDv07JpHVKD1ANO//QNr36tMt4IUho6Zku0yd4b48QUz/sJcEQaBZdYqK5Bdr/dXG6i5rf1JqiLlD9yxNtEYtI93rLWFwZe0XdY4IO1HtAnz7tX5r1f9PWAi6GKfWZNaPCEVavESwxzvz4tieQVgDha4hmFG4+dMmigZU7tRUrCJYpk1bCTeEIVkgm3KTtmbajiAFZQlDAJKchQbZfd0oiXs3SkR7qT81+kSju3gLxf6GRwPrjX7RmAl0oGVnW/36I4Jj05POvXOSbyzw9T8/hdu/WK9C7VEFxev+Z7yLVXO4JRI8tOTnZy1kN2vzmig/u1ft6B/WxYTTx7eXh6a1kTwD5GfH8ApawYaaanLwscrWwLHt8QQ2JjKqCuATqA4+nTa4MDcAxVXP53Bs4Srdk4ZlawKhKxItk2WhfVMowgUQFwL+LvIXvXQZRYlCtV0j02fYDbUrkNwfguio+viXnAdcVbRxrV6rrWP2lJPdlmHlNZ5QOYvNn0phnxyaVSRAr90ZRd5vPZW8ixCLFh6/2czqg= 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)(1800799015)(376005)(366007)(38070700009);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?K+G7KQVrFRDdfMZWaB+1jfVaTuSf6ZhWeL/ly21m/ru2pvn393rTZh79WsPO?= =?us-ascii?Q?5ecMXWnBZxW7K+gaSMAb46pGJV0CYfT0WtESvbZ5fDKA+h6ePqsN9C/wEeGj?= =?us-ascii?Q?+xo6iTvA6c/CF7vKv26F67hyCkfvyAZQOu3Fgi6Wl5u8heUEgaYXvB7z/tf2?= =?us-ascii?Q?TEqYc4hg6Bl1Xq/tZkQUVh2Nsa5hQNoxXzBk7w9X5ET2aHozfH16Zipe919Q?= =?us-ascii?Q?Ztypr4UXcs+jIYdxWrVi0R4uxPmoOBQym4teCF207XrZXgyVhlEfN/tLv1+l?= =?us-ascii?Q?Mml8yd8bwFTTeDod8Ap0bHEPml+MtLB/rUwtzcvT8zrRgTIrZDmZQFQ2+edR?= =?us-ascii?Q?HUV++f+7GFBPtisFUT23VYQijJMiW3KaYn7fdYgsSxyMLf9eqFxyshGYmNYC?= =?us-ascii?Q?4EU7IrzaDzSpiH8jazL8Ukafrs78O1Cn78uFqAFCb38TG3mfGeNQ6ZLqrqt3?= =?us-ascii?Q?XCTpp83djQCDrnwnO7vajkkZBdo8RKSMn7unc7Qe4YK47IS7pC/iyyiKO8xo?= =?us-ascii?Q?fvDHQwYZZlzzkiS4JDTkX1uTevbIlqGEjlJILifAAR6zBklTXekiXerOKL7A?= =?us-ascii?Q?uJtdUmyDyE4xOOgQam+axsNFAr93n9ZORPdB0ZhYkaHrNg7NQLU0m2S+abbg?= =?us-ascii?Q?ToQ1/i8UiODC7p9Oim65mCMzJFMceKj1uagdOBPGiDhWjaOLLq0jUbfdHhjx?= =?us-ascii?Q?GvsS62yYNiBkrbSuGDF7Zyix9hNhdpX+w23I7VW1pGJsTdyXrcBXDKAHMyVx?= =?us-ascii?Q?tIcOskZyyDMzY+zQkkxvbLd0XnqugeHSQrb77c1gcHUe51ahjDl+uJDDd+u0?= =?us-ascii?Q?7C6JZBTOCi3JKet0R7jB9immYlkEisRItlwQZknMbGm63zfHdsHv/Tc/DLUf?= =?us-ascii?Q?SAQJciheWtPDke6JwsD6C+H+7oUIYm7EP4Wx1tBl6sxuD+A6o8Hl9VE8ey36?= =?us-ascii?Q?7mbzy7jBMDLTzwjsevkIXYLBcCeopKJm1dtCh0AvAP8P5/A5FrN6tA/RPts3?= =?us-ascii?Q?1G/iHGFnR1LAM00RQrCDuJoG3FDBAI7JAMnPuGESyhR0IvrXWaGLT2n0NKDk?= =?us-ascii?Q?2wzNICg1ETK0w0xcEfuSWJGhyzwXeLETSHzWo/zlBwd1+vLbMFBVFu3bEgM/?= =?us-ascii?Q?MC8/Zb3i8TMAkF/9F1nHnowVK9V2ShCEn+TWGVRkbO7qfsYVNM0p2WjKJ6sF?= =?us-ascii?Q?R84DRoE/1CMvH60c1y/n7GNjgkw9PRaNinitSsF9I2EZUoyWws0+VDT49UEk?= =?us-ascii?Q?Zj5gveN696UTZlIU0GjyhPNSuuwmUXPZTdFeZwJ3SjgnJ0aX/KHdWIUeiTVs?= =?us-ascii?Q?DHCPOHB9hvy0UByssQdQWZMCHofTnrZGLsidLKtc10H6IuhXlHmZySGkcZzC?= =?us-ascii?Q?L0fMg3Rxy6BSo2HvClmMuP0OiZOOZs1VPVWutW1eU9ts8tQyP5w/YRYish4o?= =?us-ascii?Q?wmbiwGxaxmBF+1rOptuW2G4njTUcZ22dGd5XQ9NxOIF0k0rmn1kNhnMiZh8A?= =?us-ascii?Q?2yhp118jv0jfDZvxDet3aTzNVXYuUP7AwcZf7xnHuNePPs3YqPvsGuoyQNER?= =?us-ascii?Q?4jWEandQtS4YdQi945ju8/RG6Az7dvJIWaCiFMr9?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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: e56a87ad-4d1d-425b-1735-08dc5a2eba59 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Apr 2024 13:53:12.1025 (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: LdBcStBE3JBxGFZsN98H69U1gTdAnY/bmacvFyPsSFqnZxgAr0tafyDROCnzsgBnNpGgjhTahlZn52E6aqO/7w== X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR83MB0525 X-Spam-Status: No, score=-10.2 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_MSPIKE_H2,SPF_HELO_PASS,SPF_NONE,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Zac Walker Date: Tue, 20 Feb 2024 17:22:31 +0100 Subject: [PATCH v3 05/12] 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. */ =20 -#define SUBTARGET_ENCODE_SECTION_INFO i386_pe_encode_section_info +#define SUBTARGET_ENCODE_SECTION_INFO mingw_pe_encode_section_info =20 /* 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) =20 @@ -283,16 +283,16 @@ do { \ /* Windows uses explicit import from shared libraries. */ #define MULTIPLE_SYMBOL_SPACES 1 =20 -#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_sect= ion =20 #define SUPPORTS_ONE_ONLY 1 =20 /* 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 =20 /* 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 =20 /* 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 { \ =20 /* 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) =20 /* 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 \ =3D 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) =3D=3D 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); =20 /* 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) } =20 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) } =20 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 =20 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; =20 @@ -471,7 +471,7 @@ i386_pe_section_type_flags (tree decl, const char *, in= t reloc) } =20 void -i386_pe_asm_named_section (const char *name, unsigned int flags,=20 +mingw_pe_asm_named_section (const char *name, unsigned int flags, tree decl) { char flagchars[8], *f =3D flagchars; @@ -548,7 +548,7 @@ i386_pe_asm_output_aligned_decl_common (FILE *stream, t= ree decl, rounded =3D (rounded / (BIGGEST_ALIGNMENT / BITS_PER_UNIT) * (BIGGEST_ALIGNMENT / BITS_PER_UNIT)); =20 - i386_pe_maybe_record_exported_symbol (decl, name, 1); + mingw_pe_maybe_record_exported_symbol (decl, name, 1); =20 fprintf (stream, "\t.comm\t"); assemble_name (stream, name); @@ -574,7 +574,7 @@ i386_pe_asm_output_aligned_decl_common (FILE *stream, t= ree decl, visible. */ =20 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. */ =20 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 =3D 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) =3D 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 !=3D 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. =20 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; --=20 2.25.1