From patchwork Thu Nov 16 06:23:03 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: mengqinggang X-Patchwork-Id: 165705 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b909:0:b0:403:3b70:6f57 with SMTP id t9csp3018318vqg; Wed, 15 Nov 2023 22:24:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IG7/PrZzNzGvJBvHgRySRopAORr4MSATyBrKZOifJPk0R5L11GR6chsjJNZ1rFtXzSGa7bS X-Received: by 2002:a05:620a:450f:b0:77b:a837:f6c3 with SMTP id t15-20020a05620a450f00b0077ba837f6c3mr8607526qkp.15.1700115847882; Wed, 15 Nov 2023 22:24:07 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1700115847; cv=pass; d=google.com; s=arc-20160816; b=N01fr0VOsfN8XDFKlegpwWwRNpR997pUgRAlhvsXHnw/9u0ojILhgBrTVDYkXqLNej Tudo/DqPQnp90cH2jwlma0YImdOfe1NSwDtbNtSUj/dR2cmmaOtUzm5tkBzzvZu9Cei8 3mN6sUn8AXKbMQ2Cc4ujIW0ucUpQ+11YbETmcjIdZghvXh633tLpvtBr665xFdpgTEvw 4/Dq8C0l2y//ugBsLN76Trno9+//DZXVLiZZQQvE3/mJIhWdaD/c6V6xL+eoamEqdEwd LgGnGtKg4j6C1EVSyawOFywDxaakSmhBPgkz9PpeqGTv9iLNf7BpZtXPJOd/QNJzwqpa 2ANw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:arc-filter:dmarc-filter:delivered-to; bh=CFsWPRhFddcnGX8PykJrKjYMA15sK8mqYi090G9NxwU=; fh=E++1HYE07Ug0Tb3mwOoH2gQvrrmpXVdxZHa97F1+u1A=; b=lscxJp423zglkgkIvvwA/6KPFW5C3NpK26rPK29ozeKbWxZSvpth6Xmv8SFamj1UZl alxNaLXZI0hEF04IoySm2fn5tbqKkDExzEIpR0nUZotYz/GhDkDVabgDBfMW0yCerg/w CLhQvgIMETWE8y71iY7qCAcw08hwKomYe+mCQvd5Abf/N/0MvSLQll9PTZY4BQq6c/YJ TQCJ3xkLreqdcfKQRNCixAVzPktjlyr1soPttFtDtw2BzOHwV32xpQgRYE5oy9B3yJ/O +Rfxbz/nxcaQHzgSonQL/8rSFenP518vAbwaJH7Z9sNu+OzcG+NgifbaPMqFvnq+TgUy yluw== ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id dv24-20020a05620a1b9800b007788b84dbc7si11333794qkb.496.2023.11.15.22.24.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Nov 2023 22:24:07 -0800 (PST) Received-SPF: pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of binutils-bounces+ouuuleilei=gmail.com@sourceware.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="binutils-bounces+ouuuleilei=gmail.com@sourceware.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B5B4D38654AF for ; Thu, 16 Nov 2023 06:23:57 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail.loongson.cn (mail.loongson.cn [114.242.206.163]) by sourceware.org (Postfix) with ESMTP id 38C073857BA2 for ; Thu, 16 Nov 2023 06:23:27 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 38C073857BA2 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=loongson.cn Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=loongson.cn ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 38C073857BA2 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=114.242.206.163 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700115810; cv=none; b=Hv/CcWT/sL/KPbU4RXIbdcOO3oMWCIO43iij8GJBQi2ZRFG2AvteakZ1Q1ece2uT1a5zGeN1n81s9DszxHzxmtSKVbwasHnTL+inEyMqr4UZzBROnmTyHKG7QRwiotkFoO+QXcAnm5diqaU54w0HIU05A39ynb2swrWwYj3AJso= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1700115810; c=relaxed/simple; bh=XclaRs/KpEX0o0Ln4u2dbEa5u6NErnn91+jLo+Es8sE=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=bPfR8XlvGcL3r4kBbCOakfoODuYSj2jJ7tuHBvK7FtW89FbYb/lMXXZUKSI1ya7Hx/lpIDD09hpjVn3uuoknr89aY0xdTY8ZE0qXMc0wvXmK8lD6utbeF8q4cudmYb55s7AyevuneiEaOKYPPTRHxC/XSGrwbOP7LUM8y2HLIi4= ARC-Authentication-Results: i=1; server2.sourceware.org Received: from loongson.cn (unknown [10.2.6.5]) by gateway (Coremail) with SMTP id _____8CxLOtdtVVlRXk6AA--.44182S3; Thu, 16 Nov 2023 14:23:25 +0800 (CST) Received: from 5.5.5 (unknown [10.2.6.5]) by localhost.localdomain (Coremail) with SMTP id AQAAf8AxndxOtVVlfNJDAA--.16902S4; Thu, 16 Nov 2023 14:23:25 +0800 (CST) From: mengqinggang To: binutils@sourceware.org Cc: xuchenghua@loongson.cn, chenglulu@loongson.cn, liuzhensong@loongson.cn, xry111@xry111.site, i.swmail@xen0n.name, maskray@google.com, mengqinggang Subject: [PATCH v1 2/6] LoongArch: Directly delete relaxed instuctions in first relaxation pass Date: Thu, 16 Nov 2023 14:23:03 +0800 Message-Id: <20231116062307.3292483-3-mengqinggang@loongson.cn> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20231116062307.3292483-1-mengqinggang@loongson.cn> References: <20231116062307.3292483-1-mengqinggang@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8AxndxOtVVlfNJDAA--.16902S4 X-CM-SenderInfo: 5phqw15lqjwttqj6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBj93XoW7uF1fWF48Jw4UJF1UXFyfXwc_yoW8CFW5pa y3uryrJF4ruFn3W3WDZrWUWFs8Jry8Gr12qa43Kwn7CFsrGFyFqr4rAr17WFW5Kw1xurWv vr18Ka47ZFn7CwcCm3ZEXasCq-sJn29KB7ZKAUJUUUU5529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUk2b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r106r15M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Gr0_Xr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVW8Jr0_Cr1UM2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12xvs2x26I8E6xACxx 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q6rW5McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r1j6r4UMIIF0xvE 42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6x kF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU27PEDUUUU X-Spam-Status: No, score=-12.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, 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 X-BeenThere: binutils@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Binutils mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: binutils-bounces+ouuuleilei=gmail.com@sourceware.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782700675098306931 X-GMAIL-MSGID: 1782700675098306931 Directly delete relaxed instuctions in first relaxation pass, not use R_LARCH_DELETE relocation. If not, the PC-relative offset may increase. --- bfd/elfnn-loongarch.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/bfd/elfnn-loongarch.c b/bfd/elfnn-loongarch.c index 1162cb35cd6..9d4ea7e4ae7 100644 --- a/bfd/elfnn-loongarch.c +++ b/bfd/elfnn-loongarch.c @@ -3739,7 +3739,8 @@ loongarch_relax_delete_bytes (bfd *abfd, /* Relax pcalau12i,addi.d => pcaddi. */ static bool loongarch_relax_pcala_addi (bfd *abfd, asection *sec, - Elf_Internal_Rela *rel_hi, bfd_vma symval) + Elf_Internal_Rela *rel_hi, bfd_vma symval, + struct bfd_link_info *info) { bfd_byte *contents = elf_section_data (sec)->this_hdr.contents; Elf_Internal_Rela *rel_lo = rel_hi + 2; @@ -3771,8 +3772,9 @@ loongarch_relax_pcala_addi (bfd *abfd, asection *sec, /* Adjust relocations. */ rel_hi->r_info = ELFNN_R_INFO (ELFNN_R_SYM (rel_hi->r_info), R_LARCH_PCREL20_S2); - rel_lo->r_info = ELFNN_R_INFO (ELFNN_R_SYM (rel_hi->r_info), - R_LARCH_DELETE); + rel_lo->r_info = ELFNN_R_INFO (0, R_LARCH_NONE); + + loongarch_relax_delete_bytes (abfd, sec, rel_lo->r_offset, 4, info); return true; } @@ -4004,14 +4006,14 @@ loongarch_elf_relax_section (bfd *abfd, asection *sec, break; case R_LARCH_PCALA_HI20: if (0 == info->relax_pass && (i + 4) <= sec->reloc_count) - loongarch_relax_pcala_addi (abfd, sec, rel, symval); + loongarch_relax_pcala_addi (abfd, sec, rel, symval, info); break; case R_LARCH_GOT_PC_HI20: if (local_got && 0 == info->relax_pass && (i + 4) <= sec->reloc_count) { if (loongarch_relax_pcala_ld (abfd, sec, rel)) - loongarch_relax_pcala_addi (abfd, sec, rel, symval); + loongarch_relax_pcala_addi (abfd, sec, rel, symval, info); } break; default: