From patchwork Wed Feb 1 07:38:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fangrui Song X-Patchwork-Id: 64066 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 C59A83858000 for ; Wed, 1 Feb 2023 07:39:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C59A83858000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1675237185; bh=PDkDPvXKrp847a8vZ+j4k75GKoQstCbQK2bCA7LHOTw=; h=Date:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=kaU+nt22rtKZazbDglLB1y8/iTM1v+nkhE8G/y7mV2jBX6Mu1Cpo8GphxFk6d7pwb qwdSxT0ITD0LM+wiXCBsBtr6WDxkUawpojrvxpg2Hv/q6mXY3SCFOyonfEXoa7ClZc LicrHwcV++Zfy7+GFcw/qssjbLK+yBhfq/vAxutY= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by sourceware.org (Postfix) with ESMTPS id 5C6EA3858D38 for ; Wed, 1 Feb 2023 07:39:03 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5C6EA3858D38 Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-4fee82718afso192044547b3.5 for ; Tue, 31 Jan 2023 23:39:03 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:from:subject:message-id :mime-version:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=PDkDPvXKrp847a8vZ+j4k75GKoQstCbQK2bCA7LHOTw=; b=qj3EaFej95yicgHXGyMQ5tsJBGtLioru+/y09RO13okir7766FqtVc6Skrp5jybZaB /Wvc5t3/7a0L96HzkHkDpIEN96tUZ0c5skoPTrl1wnUj7zNnxT7n/DJW9m3n5QOET/vg a8KERSzlrPnJgCtqfmGC/w770TFLmO/l4nGwzHFImsfTHPGOR1U0/1XDBS7YWeLKCGkj 4hYLQeXz6ZBm54QoEcjbFTnLbqKxyeR4LEm0ooCQeFXMpDzx+aLi/2n9YWM6YgZ2Fn0c ThAB/oQQF2RkxmNm7NnPtQIPabtSZk5K7cuop7NlkQHwXEezEcpg2tYaNggrvWL59Ecz WTBw== X-Gm-Message-State: AO0yUKV11Pm+5u4Go5QWUEchSrJEn50lhWjI39oOrhTo2e3Q8Rj7BXJr wVtNomMknPKj1W9f56O3MMzxQYQhCKmGadw/nSgEf9UyAC5pusxBqShV1rwTq0e4yV+0bJ2TWZE S/wVR85k3s0xxp6V0mKPUrrX+uFX0aodgOwltWVCW3Dam7iWnfqCWlDhDnNQMCAMpbQ== X-Google-Smtp-Source: AK7set8NXgQg1i6MI9ro6jSTiMy9vgWbZxZTOEHKxmqA/s7Mh8EYwEBC+WbIoUwKjdXtZGWuGSC0wFVWNjVL X-Received: from maskray.svl.corp.google.com ([2620:15c:2d3:205:4b25:4a18:11d7:112]) (user=maskray job=sendgmr) by 2002:a81:e30a:0:b0:507:77a2:f50f with SMTP id q10-20020a81e30a000000b0050777a2f50fmr155599ywl.420.1675237142646; Tue, 31 Jan 2023 23:39:02 -0800 (PST) Date: Tue, 31 Jan 2023 23:38:59 -0800 Mime-Version: 1.0 Message-ID: <20230201073859.3920910-1-maskray@google.com> Subject: [PATCH] x86: Use DW_EH_PE_indirect|DW_EH_PE_pcrel encodings for -fno-pic code To: gcc-patches@gcc.gnu.org Cc: Fangrui Song X-Spam-Status: No, score=-19.6 required=5.0 tests=BAYES_00, DKIMWL_WL_MED, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, USER_IN_DEF_DKIM_WL 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.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Fangrui Song via Gcc-patches From: Fangrui Song Reply-To: Fangrui Song Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Follow aarch64 and riscv ports by using (global ? DW_EH_PE_indirect : 0) | DW_EH_PE_pcrel for -fno-pic code. This avoids a canonical PLT entry for a personality reference in .eh_frame and a copy relocation for a typeinfo reference in .gcc_except_table, when the definition is in libstdc++.so.6. gcc/ PR target/108622 * config/i386/i386.cc (asm_preferred_eh_data_format): Always use the PIC encoding. Use DW_EH_PE_indirect if global. --- gcc/config/i386/i386.cc | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/gcc/config/i386/i386.cc b/gcc/config/i386/i386.cc index 3cacf738c4a..b572dd46a62 100644 --- a/gcc/config/i386/i386.cc +++ b/gcc/config/i386/i386.cc @@ -22851,22 +22851,13 @@ ix86_stack_protect_fail (void) int asm_preferred_eh_data_format (int code, int global) { - /* PE-COFF is effectively always -fPIC because of the .reloc section. */ - if (flag_pic || TARGET_PECOFF || !ix86_direct_extern_access) - { - int type = DW_EH_PE_sdata8; - if (ptr_mode == SImode - || ix86_cmodel == CM_SMALL_PIC - || (ix86_cmodel == CM_MEDIUM_PIC && (global || code))) - type = DW_EH_PE_sdata4; - return (global ? DW_EH_PE_indirect : 0) | DW_EH_PE_pcrel | type; - } - - if (ix86_cmodel == CM_SMALL - || (ix86_cmodel == CM_MEDIUM && code)) - return DW_EH_PE_udata4; - - return DW_EH_PE_absptr; + int type = DW_EH_PE_sdata8; + if (ptr_mode == SImode || ix86_cmodel == CM_SMALL || + ix86_cmodel == CM_SMALL_PIC || + (ix86_cmodel == CM_MEDIUM && code) || + (ix86_cmodel == CM_MEDIUM_PIC && (global || code))) + type = DW_EH_PE_sdata4; + return (global ? DW_EH_PE_indirect : 0) | DW_EH_PE_pcrel | type; } /* Implement targetm.vectorize.builtin_vectorization_cost. */