From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pg1-x52e.google.com (mail-pg1-x52e.google.com [IPv6:2607:f8b0:4864:20::52e]) by sourceware.org (Postfix) with ESMTPS id E783F3861877 for ; Wed, 5 Jun 2024 23:41:45 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org E783F3861877 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmail.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org E783F3861877 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717630909; cv=none; b=n0nk8OikmCUiOOs25YiYUaJAKWoKdoNKrCajQzPRIKE3S5Is0aYdMxGCg2ujXVOriSXZT9FdxafnE2wzlHFHEHJ3/l5Py60LlMM6q3dO3hPIcagytGeEA+lUTNRVfe3RbS8WS55876t5BcpS0hHF4aODqgsDSV6pnYl6TKTaurE= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1717630909; c=relaxed/simple; bh=bZff7KVjJaaqj13zY4pr1asWE1ZjrxUPgqnlYWwp1nA=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=kX3PAfTnX/E2VSXpxdzFSmipdNjT+SX74QgLEagzSkOZmgpI0KnkJSf0huaDYbWjLhkkafGpuv23FicpC8YCu5hiBEbGkHqCzdmGGvsaJOnPEDAjGEXfYSPhDb55MV5wUs0kaEMhpouuiwS7/f/vmMcZfWej5oQMirAlx/98b2g= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52e.google.com with SMTP id 41be03b00d2f7-6819d785528so226519a12.3 for ; Wed, 05 Jun 2024 16:41:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717630905; x=1718235705; darn=gcc.gnu.org; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:from:to:cc:subject:date:message-id:reply-to; bh=20r69AAPKCJhQ2wyETR2idPVEImd5RjZP1atmotuv6o=; b=SUamdldiXwK5pH+wXxRANsQz1A98GVzK1hlDg4NPn3UePCrhYHYdOtzyJYDYsE1enG 8uTB14rHGD5Wq86aqxwIek7iYTRm3vaqZcbNfxnOk1AN8aK2LwEysxSkh5IypzRgv/yJ cRu/O22mVR93SjSLZGsT+BILcVDpogOES5m5UsipCydhYMDgHaHCcrMN+bw/DsfhsqKO 2Tj5OTaeepaBcIQg0ecZA00Ftz0DYxQapYRBUTNI1ewdV+/H+1A4wmxmow/tDRtBEdt/ jL5jKnXThvxq2U9HDF7u36Ae7bFE6aQq0kwd9tgY8Brf/08TvD9zbmbZ519Tr5YDFyXW HJ5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717630905; x=1718235705; h=content-transfer-encoding:in-reply-to:autocrypt:content-language :from:references:cc:to:subject:user-agent:mime-version:date :message-id:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=20r69AAPKCJhQ2wyETR2idPVEImd5RjZP1atmotuv6o=; b=cgVbokm23MhZBEpoeSfIFqiH8a115MYpwgnvPlmD6zQiIZL/i10/LWPm31uMcNjLN+ DiWaP361PfqTMPvon5eZilZ4VuiKWN9xBazekrxXRDitUVh03afn7ID3LB+DzSoc0ud2 ucAJrLK2jyqaRclq2SQeJlgScVow7cUD8MzmULeFIbccE0X6kCloqYEoekvzxKjX/gQx aKj4IA0lIjIub+ntWSUWqgIPdhHLRs744hXZ8CyZ0xfg5kxDiHuDuMOrhi4PfsXhPy6i urrQEYLANOOyJzYLhbSuc5illrNW5R1j1wKp74BWge6TOerEi87PqQNkbHle+y/nLtzv JFoA== X-Gm-Message-State: AOJu0YyZZXDrjjyaeq/qYoG27ap4hduOKibluVKtaxpN8En0BGL9U7kH VrebGp1gbLUpeAm6pTo4DYoLjt8IJuytyg/Oem3wjMgWhlcDNd1h X-Google-Smtp-Source: AGHT+IEuJMYqOxyB0+jWDJEi2UlOivR5E4HZlvMZRDJvX1q1iUsOOJ1aqfJ7+PuP5tonYSthfKuMWQ== X-Received: by 2002:a05:6a20:1596:b0:1b2:4834:7a24 with SMTP id adf61e73a8af0-1b2b70fef06mr4989956637.45.1717630904430; Wed, 05 Jun 2024 16:41:44 -0700 (PDT) Received: from ?IPV6:2001:f40:919::2cb3? ([2001:f40:919::2cb3]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-2c254a7877bsm2094941a91.0.2024.06.05.16.41.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 05 Jun 2024 16:41:43 -0700 (PDT) Message-ID: <4293344a-4961-4179-a408-af99a830115c@gmail.com> Date: Wed, 5 Jun 2024 23:41:39 +0000 MIME-Version: 1.0 User-Agent: Betterbird (Linux) Subject: Re: [PATCH v1 0/6] Add DLL import/export implementation to AArch64 To: Uros Bizjak , Evgeny Karpov Cc: "gcc-patches@gcc.gnu.org" , "richard.sandiford@arm.com" , "Richard Earnshaw (lists)" , Maxim Kuvyrkov , Radek Barton References: From: Jonathan Yong <10walls@gmail.com> Content-Language: en-US Autocrypt: addr=10walls@gmail.com; keydata= xsFNBFDEdwIBEACSrmywJMpgYlgJa0HJ1AFu9tQp8yVpVS21EfnrSK16TS6PoW/JS78D5CYx pshPzr1iil8yeL8/val1yXkI8uNZjMnhLxMBU5C7WEMCeY/h760btG3bZZ5BMCNCkC0Yfrtv JJQDEyv1H+p1U7yMFRyxNtMjaf6QDzoRjTVOzO6mtNMZWYnlhzC54etiVt3HQ4jKOlKbI+dw jigIw8B1SZ+xWcukAHRMBcIZYLjbnAI/XNu796pfwh6QEhJjr8EpvyNjdHLFSMMuyUPO/a3s r/jkFSTpqt5lr9jWejdQwe7e8WtbC+euv++fH1B9Yz42259kLxgH+aHk6lWX3epIIx3w17rG faMrFrINjXEBGLLOQkIy2LtBLYRU2NhDg+VSDOEwAsiOVZs1EHpSNF5GV12L8SFiNtVToHxL RpObNpYIHBkDFzx9gvQfX5Kocx5XFhBiNfTjdxBOjopLzQHpfCSo3fzSqc7zpscqOw3uni7G IN86fI8h3wSV44dQ4yaervnL2kZykRyWL5y1C9WDfjzljTIeLB6gK/gBbrsuKuVC42r6xAK9 yC9pL0Trf7+GLJ9UF4WGnJ5IvfVpZ7gtBMjWOpiwewTprdBNwhLsVSep9Vqg/cbtmG6AnpzN tMsLEWAwDpgaFa5KqlehgUCuMlEdU6LhvSd0cJ/pqKwwzxEiLwARAQABzRlqb25feSA8MTB3 YWxsc0BnbWFpbC5jb20+wsGVBBMBAgA/AhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgBYh BOUK3Z2wV/T6ZOG2z3E7X+KcFF1FBQJkv8QIBQkXsIUGAAoJEHE7X+KcFF1F4uEQAJKbrHtj r648MMV+rkwrpB0DD8hqP+gammZcozvO2SQmJjN6bLHDquPkgqGe2GkDm+2FAxJ0OogRKGki Fak4d+fkAFxPwEhSSHZG360ODypL82NQ/v2GWTikaKr6d2sC5zNfif84ejrT1uZbzMFiKo6u BkerQsqoOuhE/dW3HTIgHrQqTM15sjBbeg4YQC1nmQeWlAK6rMkzNLQefmbFpbUQW9OBFEFr /wSI8GnJYyoJmtBf+Kl5n/fghYc4tcUfx8JB92ktkirO+TuFEsGXqU7RwxaO0PnjYMDtR6m5 UYVumzYQEeAbHcbuj95tIUpNwoyyuHZMOjL4/xaagGU9Isb4POyQVviwYMSAZh+k08BMpiQY UbGYxiDrtV6WQBOPpX3MfeJ6GlLXd07UCDcV3FKBHcHllfaSxEmbfBAuNEVxpG8FXaCfyJ8c ysdoSPmNo9ExpXKIcIOssfKJldHFvYO/egtakO9LGY4fOExRA4aEtsKml9TeRqHwr94bX516 VsDEkndFKwZkh5HwaitcuHD222gntr3ozquQ3xjm7Sh/0JqyypslVzPGAPQZcCBeg0Ct6ZUc ovAYcx/Pxv5xIissAoUti6PVpF2EcuBiPO9XgpVe8mUhYdJm29hZMkuxg++cNHbQgzPUicfz 9tsVWNkBOEAFZ7yrJcPQ9DO/rg1wzsFNBFDEdwIBEACsXcBns4YGVTUGMVKVGEocPffmAhAY 89XSk1c1qWPngieUtZ2GoiG+a8IKAqYIjfpuV/YXX8i9mXuGAGJvf6rRhpPos8v76y3qoFFr PsFjNaiTTTvPn1oNRT+Br5KWjJaDomGkmQe5bGrok6ETK4VgRdYWPib7IbTLUX1rzfaKvDP2 19HTsdWj/cdE3QGTZjekJUiJqgqSS8SmaBNtFm2T18r3gdx6+Xq0kJPW421IaXtuxbyD3MTB VJYEfY+rEvVfMUi9rvsfCG0djJOh8954D8AhVY58x7aszhHddTeQlXxUdwNpyJFFoFFhpj0L vmhCH84eaf+9eW8VqegPDzE2MJ/Oe+bftYS9qtIx4MMHRU5Wl7g2x3QUhsmyev3BmhBvqFzo 6TmBZ1bjp2MXZqQw2d5YXJNb0Vtr9qgV1EqnoG7Lf5q5wcENYAJDVeOzOMxUnM3u2VYbt8GM u3QITxpHw4lOukzarmEmAq3EwwzBxFKKmD9gvAbkAGmimONRiQSY9OBEW4XLmOqy9b7pnoS+ 6x0Oqv8lELvz9TJ2Kh5urXJ/7LOvof9z3R0g7Hn7AWn1Y+0hUKN1vRqziJdIFqZ7kcViiKYA KfYiDPlHSAVguc3qvok0P8A3uS5qvkz2yC3C5Jt913FoNVu3ny0/UCDjpSAqC3qTXMx3otwL DLv/dwARAQABwsF8BBgBAgAmAhsMFiEE5QrdnbBX9Ppk4bbPcTtf4pwUXUUFAmS/xAgFCRew hQYACgkQcTtf4pwUXUWm3Q/8CffJnIqGNBkHHbTE9lVEHYCe0Kq/RTYPv9hpzWmkBqusflBp yZ3IHXdrmlYTd8BX2dZ7UDUz6eZApWoL7R44h+AHIi+pGCe1RFrE8bOI8mQCiLpV+FzwyCe4 dmrdKwFeqfyOIcAZeuXj9a0p3M48A6jN63TK4wImOUQiLHtVMtnEQWFdd/p+Zags9XQ/r417 /gRmLQL8nMrGJVWfnnEMmRGcW2Pmi3yTqHQc8mEe+PJMHp5Po7mv2NXv29YDACtWjdydzY07 4ERRFGNj6JbODc4CbryIgC7lkIAUGUXQoAnEei+rhUtVR0ZR0WCN+IMOAxfdUWYXlOH6X7Sn cB/mA+JtLCp99ongTewiNwVOWT7QDuNX53e6MoCGTzTSJmNIeof6g4hW1iPC3yXTv4p3n0R/ ZjTf6sp+6a0wEm4FUK9gIEQx1qulsSFVqBEU1u5P5PYrMq4QAkpk/DzwkfF3xWpj7o7seNRo eJMnJNUeOnz5R3vMX0lJDbfp+hu+bRyFtjJoWqyaN5SZAieOaMxUkc4I8tLiGKG1gRXs81/d 6TrOqX2RA/kCkpcxDSNck4hY20CrCm/3KwjPsHwsxUDwQQle+MMM41hPIdhxoLwSFE/kkQiT /WrWkF5eTU+WypRO9cvg4m46E/ql0AHEFsZ8HPg55eG23av7Xw/8rRLfJGg= In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-3037.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,KAM_NUMSUBJECT,KAM_STOCKGEN,RCVD_IN_DNSWL_NONE,SPF_HELO_NONE,SPF_PASS,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 List-Id: On 6/5/24 06:01, Uros Bizjak wrote: > On Tue, Jun 4, 2024 at 10:10 PM Evgeny Karpov > wrote: >> >> Richard and Uros, could you please review the changes for v2? > > LGTM for the generic x86 part, OS-specific part (cygming) should also > be reviewed by OS port maintainer (CC'd). > > Thanks, > Uros. > Where is HAVE_64BIT_POINTERS used? >> Additionally, we have detected an issue with GCC GC in winnt-dll.cc. The fix will be included in v2. >> >>>> -ix86_handle_selectany_attribute (tree *node, tree name, tree, int, >>>> +mingw_handle_selectany_attribute (tree *node, tree name, tree, int, >>>> bool *no_add_attrs) >> >>> please reindent the parameters for the new name length. >> >> Richard, could you please clarify how it should be done? >> Thanks! >> >> Regards, >> Evgeny >> >> >> --- >> gcc/config/aarch64/cygming.h | 6 +++++ >> gcc/config/i386/cygming.h | 6 +++++ >> gcc/config/i386/i386-expand.cc | 6 +++-- >> gcc/config/i386/i386-expand.h | 2 -- >> gcc/config/i386/i386.cc | 42 ++++++++++------------------------ >> gcc/config/i386/i386.h | 2 ++ >> gcc/config/mingw/winnt-dll.cc | 8 ++----- >> gcc/config/mingw/winnt-dll.h | 2 +- >> 8 files changed, 33 insertions(+), 41 deletions(-) >> >> diff --git a/gcc/config/aarch64/cygming.h b/gcc/config/aarch64/cygming.h >> index 4beebf9e093..0ff475754e0 100644 >> --- a/gcc/config/aarch64/cygming.h >> +++ b/gcc/config/aarch64/cygming.h >> @@ -183,4 +183,10 @@ still needed for compilation. */ >> #undef MAX_OFILE_ALIGNMENT >> #define MAX_OFILE_ALIGNMENT (8192 * 8) >> >> +#define CMODEL_IS_NOT_LARGE_OR_MEDIUM_PIC 0 >> + >> +#define HAVE_64BIT_POINTERS 1 >> + >> +#define GOT_ALIAS_SET mingw_GOT_alias_set () >> + >> #endif >> diff --git a/gcc/config/i386/cygming.h b/gcc/config/i386/cygming.h >> index ee01e6bb6ce..cd240533dbc 100644 >> --- a/gcc/config/i386/cygming.h >> +++ b/gcc/config/i386/cygming.h >> @@ -469,3 +469,9 @@ do { \ >> #ifndef HAVE_GAS_ALIGNED_COMM >> # define HAVE_GAS_ALIGNED_COMM 0 >> #endif >> + >> +#define CMODEL_IS_NOT_LARGE_OR_MEDIUM_PIC ix86_cmodel != CM_LARGE_PIC && ix86_cmodel != CM_MEDIUM_PIC >> + >> +#define HAVE_64BIT_POINTERS TARGET_64BIT_DEFAULT >> + >> +#define GOT_ALIAS_SET mingw_GOT_alias_set () >> diff --git a/gcc/config/i386/i386-expand.cc b/gcc/config/i386/i386-expand.cc >> index fb460e30d0a..267d0ba257b 100644 >> --- a/gcc/config/i386/i386-expand.cc >> +++ b/gcc/config/i386/i386-expand.cc >> @@ -408,11 +408,12 @@ ix86_expand_move (machine_mode mode, rtx operands[]) >> : UNSPEC_GOT)); >> op1 = gen_rtx_CONST (Pmode, op1); >> op1 = gen_const_mem (Pmode, op1); >> - set_mem_alias_set (op1, ix86_GOT_alias_set ()); >> + set_mem_alias_set (op1, GOT_ALIAS_SET); >> } >> else >> { >> - tmp = ix86_legitimize_pe_coff_symbol (op1, addend != NULL_RTX); >> +#if TARGET_PECOFF >> + tmp = legitimize_pe_coff_symbol (op1, addend != NULL_RTX); >> if (tmp) >> { >> op1 = tmp; >> @@ -424,6 +425,7 @@ ix86_expand_move (machine_mode mode, rtx operands[]) >> op1 = operands[1]; >> break; >> } >> +#endif >> } >> >> if (addend) >> diff --git a/gcc/config/i386/i386-expand.h b/gcc/config/i386/i386-expand.h >> index a8c20993954..5e02df1706d 100644 >> --- a/gcc/config/i386/i386-expand.h >> +++ b/gcc/config/i386/i386-expand.h >> @@ -34,9 +34,7 @@ struct expand_vec_perm_d >> }; >> >> rtx legitimize_tls_address (rtx x, enum tls_model model, bool for_mov); >> -alias_set_type ix86_GOT_alias_set (void); >> rtx legitimize_pic_address (rtx orig, rtx reg); >> -rtx ix86_legitimize_pe_coff_symbol (rtx addr, bool inreg); >> >> bool insn_defines_reg (unsigned int regno1, unsigned int regno2, >> rtx_insn *insn); >> diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc >> index 66845b30446..ee3a59ed498 100644 >> --- a/gcc/config/i386/i386.cc >> +++ b/gcc/config/i386/i386.cc >> @@ -11807,30 +11807,6 @@ constant_address_p (rtx x) >> } >> >> >> >> -#if TARGET_PECOFF >> -rtx ix86_legitimize_pe_coff_symbol (rtx addr, bool inreg) >> -{ >> - return legitimize_pe_coff_symbol (addr, inreg); >> -} >> - >> -alias_set_type >> -ix86_GOT_alias_set (void) >> -{ >> - return mingw_GOT_alias_set (); >> -} >> -#else >> -rtx ix86_legitimize_pe_coff_symbol (rtx addr, bool inreg) >> -{ >> - return NULL_RTX; >> -} >> - >> -alias_set_type >> -ix86_GOT_alias_set (void) >> -{ >> - return -1; >> -} >> -#endif >> - >> /* Return a legitimate reference for ORIG (an address) using the >> register REG. If REG is 0, a new pseudo is generated. >> >> @@ -11867,9 +11843,11 @@ legitimize_pic_address (rtx orig, rtx reg) >> >> if (TARGET_64BIT && TARGET_DLLIMPORT_DECL_ATTRIBUTES) >> { >> - rtx tmp = ix86_legitimize_pe_coff_symbol (addr, true); >> +#if TARGET_PECOFF >> + rtx tmp = legitimize_pe_coff_symbol (addr, true); >> if (tmp) >> return tmp; >> +#endif >> } >> >> if (TARGET_64BIT && legitimate_pic_address_disp_p (addr)) >> @@ -11912,9 +11890,11 @@ legitimize_pic_address (rtx orig, rtx reg) >> on VxWorks, see gotoff_operand. */ >> || (TARGET_VXWORKS_RTP && GET_CODE (addr) == LABEL_REF)) >> { >> - rtx tmp = ix86_legitimize_pe_coff_symbol (addr, true); >> +#if TARGET_PECOFF >> + rtx tmp = legitimize_pe_coff_symbol (addr, true); >> if (tmp) >> return tmp; >> +#endif >> >> /* For x64 PE-COFF there is no GOT table, >> so we use address directly. */ >> @@ -11929,7 +11909,7 @@ legitimize_pic_address (rtx orig, rtx reg) >> UNSPEC_GOTPCREL); >> new_rtx = gen_rtx_CONST (Pmode, new_rtx); >> new_rtx = gen_const_mem (Pmode, new_rtx); >> - set_mem_alias_set (new_rtx, ix86_GOT_alias_set ()); >> + set_mem_alias_set (new_rtx, GOT_ALIAS_SET); >> } >> else >> { >> @@ -11951,7 +11931,7 @@ legitimize_pic_address (rtx orig, rtx reg) >> new_rtx = gen_rtx_PLUS (Pmode, pic_offset_table_rtx, new_rtx); >> >> new_rtx = gen_const_mem (Pmode, new_rtx); >> - set_mem_alias_set (new_rtx, ix86_GOT_alias_set ()); >> + set_mem_alias_set (new_rtx, GOT_ALIAS_SET); >> } >> >> new_rtx = copy_to_suggested_reg (new_rtx, reg, Pmode); >> @@ -12328,7 +12308,7 @@ legitimize_tls_address (rtx x, enum tls_model model, bool for_mov) >> if (pic) >> off = gen_rtx_PLUS (tp_mode, pic, off); >> off = gen_const_mem (tp_mode, off); >> - set_mem_alias_set (off, ix86_GOT_alias_set ()); >> + set_mem_alias_set (off, GOT_ALIAS_SET); >> >> if (TARGET_64BIT || TARGET_ANY_GNU_TLS) >> { >> @@ -12526,9 +12506,11 @@ ix86_legitimize_address (rtx x, rtx, machine_mode mode) >> >> if (TARGET_DLLIMPORT_DECL_ATTRIBUTES) >> { >> - rtx tmp = ix86_legitimize_pe_coff_symbol (x, true); >> +#if TARGET_PECOFF >> + rtx tmp = legitimize_pe_coff_symbol (x, true); >> if (tmp) >> return tmp; >> +#endif >> } >> >> if (flag_pic && SYMBOLIC_CONST (x)) >> diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h >> index 969391d3013..2b3d0c8db75 100644 >> --- a/gcc/config/i386/i386.h >> +++ b/gcc/config/i386/i386.h >> @@ -2261,6 +2261,8 @@ extern int const svr4_debugger_register_map[FIRST_PSEUDO_REGISTER]; >> /* Which processor to tune code generation for. These must be in sync >> with processor_cost_table in i386-options.cc. */ >> >> +#define GOT_ALIAS_SET -1 >> + >> enum processor_type >> { >> PROCESSOR_GENERIC = 0, >> diff --git a/gcc/config/mingw/winnt-dll.cc b/gcc/config/mingw/winnt-dll.cc >> index 591e89cb5c9..c91e95225d3 100644 >> --- a/gcc/config/mingw/winnt-dll.cc >> +++ b/gcc/config/mingw/winnt-dll.cc >> @@ -1,6 +1,6 @@ >> /* Expand a SYMBOL into its corresponding dllimport, far-address, >> or refptr symbol. >> -Copyright (C) 2024 Free Software Foundation, Inc. >> +Copyright (C) 1988-2024 Free Software Foundation, Inc. >> >> GCC is free software; you can redistribute it and/or modify it under >> the terms of the GNU General Public License as published by the Free >> @@ -206,13 +206,9 @@ legitimize_pe_coff_symbol (rtx addr, bool inreg) >> } >> } >> >> -#if !defined (TARGET_AARCH64_MS_ABI) >> - >> - if (ix86_cmodel != CM_LARGE_PIC && ix86_cmodel != CM_MEDIUM_PIC) >> + if (CMODEL_IS_NOT_LARGE_OR_MEDIUM_PIC) >> return NULL_RTX; >> >> -#endif >> - >> if (GET_CODE (addr) == SYMBOL_REF >> && !is_imported_p (addr) >> && SYMBOL_REF_EXTERNAL_P (addr) >> diff --git a/gcc/config/mingw/winnt-dll.h b/gcc/config/mingw/winnt-dll.h >> index 19c16e747a2..0877f10d67e 100644 >> --- a/gcc/config/mingw/winnt-dll.h >> +++ b/gcc/config/mingw/winnt-dll.h >> @@ -23,4 +23,4 @@ extern bool is_imported_p (rtx x); >> extern alias_set_type mingw_GOT_alias_set (void); >> extern rtx legitimize_pe_coff_symbol (rtx addr, bool inreg); >> >> -#endif >> \ No newline at end of file >> +#endif >> -- >> 2.25.1