From patchwork Sun Dec 3 22:54:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Modra X-Patchwork-Id: 81236 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 7F4AD3857C58 for ; Sun, 3 Dec 2023 22:54:43 +0000 (GMT) X-Original-To: binutils@sourceware.org Delivered-To: binutils@sourceware.org Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by sourceware.org (Postfix) with ESMTPS id 95F773858C78 for ; Sun, 3 Dec 2023 22:54:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 95F773858C78 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 95F773858C78 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62a ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701644068; cv=none; b=d/4o2amrCB93uecPs33B1/66B71eC///vnHo0+2Klmi8XfpPl7VGDLw6gckcLlOlqvpKD2l4RlELSDrvGlKJ4l0/gaPyRKL/n/SXEd/ZrzSZl+H/ujk4fazN8SPN9392H/yrfiF9CseTPYi0kedkfyxNo85ILAwuaHkIxzgz3J0= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701644068; c=relaxed/simple; bh=QjgbNbwM9mhAmPvdvCBbTLjG+Hj8e4UNO9xbXyvzkXo=; h=DKIM-Signature:Date:From:To:Subject:Message-ID:MIME-Version; b=A68TqXaZwbjOsxclZoEWhFK6l9K3bdyv7WhAA+9d0yKten01Xn0k5WSQAxWKUp4GDtC3ah1nACoA/XIarPOZGBLRmgCshINQ5VApjGoyGN+UoLYF+tmPhOaCtQA5oVt8Rd903chKipszW7MuanyhxWPNg5kWtfUEC7PO5t6m/iw= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-1d0897e99e0so2395295ad.3 for ; Sun, 03 Dec 2023 14:54:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1701644065; x=1702248865; darn=sourceware.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=trV7jx5nmfkf04jY6gssyQvQ8pFGTmlVP1ak7xht6ko=; b=LiaaJnnP3jWvltQkCk/u1NMWjmbHKiq8twLUbvGw9qBBN3tKwELKAIwtuEGfscRd9T /+9cbe5jUMrdJMWifUOUPdqEkiZZCrohavQBHQ7R96s9xilhdO7u1uUynibrijnqptfH UV+Acjs99dC8REgP0EO6+k0rFtLUjUUgNQF0nIrz/zYealTeW3b6ESJTIriAPc7lrACj 5FZS0o1VxsCZO187KsFhAhlScrWK/i6UsOR0nDdjkr5gyeumgOQbA5rPpfYRWUQhHFi+ Yj1Ht6aM2zApBfNX2uchIte7wEcx+Xu5jbZfL4sXeY5oTCwJBhCCu0ThWtHLzfJDSeax 42aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701644065; x=1702248865; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=trV7jx5nmfkf04jY6gssyQvQ8pFGTmlVP1ak7xht6ko=; b=ci3XkknzB57XQXak4IL/8N9Z/2TrF7YUZc7Fq2MhwTOEiICVChajRLym+T4Vwu/aoc Ax7VofwX7LED8ykchXs40i2SQeOGmR/wnzQMMu95wV6ChaQ4Y/XDJr9Bz6BvnMCNn4pL Qg4cyblK+UICEUAuy+pzAbM4eHVWazBWkEYHA9eDFyM39gUzk/tIdIrmi/jx1BHgE8nI v5tjF1jO7Ft70PF/+6MDB5TWKLW1vt/lg4t8hDvwnWxwn7LDzsCTWBbybCYBgNPeLLw9 Jq4fGXL1OtfWjWZWuuw6NtLWldVNAKh5aOt/vRMlaP3aliAhENDquD58dJM5QxN3BJ0p kJ2w== X-Gm-Message-State: AOJu0Yzt73SQrFEhWD/ELcHVaDfJ1/pGWvKG3woO3hi+lBR1/JxggPcG gGcoGMloGzJYmRDljS6y0xZxw/Pw+14= X-Google-Smtp-Source: AGHT+IGGNFv4aC7ZWIgaDabvGpgzvc4JQ4HyOFdIiclv65ysWWzS22Kbg8YPdtn6pJeb5Wkpawjttg== X-Received: by 2002:a17:902:748c:b0:1d0:b033:4a98 with SMTP id h12-20020a170902748c00b001d0b0334a98mr17114pll.17.1701644065197; Sun, 03 Dec 2023 14:54:25 -0800 (PST) Received: from squeak.grove.modra.org ([2406:3400:51d:8cc0:b81a:7f7d:80ce:2e42]) by smtp.gmail.com with ESMTPSA id f18-20020a170902ce9200b001cff026df52sm7071811plg.221.2023.12.03.14.54.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 14:54:24 -0800 (PST) Received: by squeak.grove.modra.org (Postfix, from userid 1000) id 1F3CE1140CFB; Mon, 4 Dec 2023 09:24:21 +1030 (ACDT) Date: Mon, 4 Dec 2023 09:24:21 +1030 From: Alan Modra To: binutils@sourceware.org Cc: Szabolcs Nagy Subject: aarch64-elf: FAIL: Check indirect call stub to BTI stub relaxation Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-3033.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, 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 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+patchwork=sourceware.org@sourceware.org aarch64-elf fails the ld-aarch64/bfd-far-3.d test, due to the stubs being emitted in a different order to that of aarch64-linux. They are emitted in a different order due to stub names for local symbols having the section id in the stub name. aarch64-linux-ld generates one more section than aarch64-elf-ld. That section is .gnu.hash. So the stub names differ and are hashed to different slots in stub_hash_table. Fix this by running the test with --hash-style=sysv, and adjust expected output. I've also changed the branch over stubs emitted at the start of a group of stubs to not care about the symbol, for all groups not just the one that needed changing. I'll commit this after waiting a little while for any objection. * ld-aarch64/bti-far-3.d: Add --hash-style=sysv. Adjust expected output. diff --git a/ld/testsuite/ld-aarch64/bti-far-3.d b/ld/testsuite/ld-aarch64/bti-far-3.d index b27d8b56548..f04ce94f0ac 100644 --- a/ld/testsuite/ld-aarch64/bti-far-3.d +++ b/ld/testsuite/ld-aarch64/bti-far-3.d @@ -2,7 +2,7 @@ #source: bti-far-3a.s #source: bti-far-3b.s #source: bti-far-3c.s -#ld: -shared -T bti-far-3.ld +#ld: -shared --hash-style=sysv -T bti-far-3.ld #objdump: -dr [^:]*: *file format elf64-.*aarch64 @@ -25,7 +25,7 @@ Disassembly of section \.plt: 20024: f9401211 ldr x17, \[x16, #32\] 20028: 91008210 add x16, x16, #0x20 2002c: d61f0220 br x17 - 20030: 14000004 b 20040 <__extern_func_bti_veneer\+0x8> + 20030: 14000004 b 20040 .* 20034: d503201f nop 0000000000020038 <__extern_func_bti_veneer>: @@ -38,12 +38,12 @@ Disassembly of section \.text: 30000: 15c00004 b 7030010 <__b_func_veneer> 30004: 17ffc007 b 20020 \.\.\. - 7030008: 1400000a b 7030030 <__a_func_bti_veneer\+0x8> + 7030008: 1400000a b 7030030 .* 703000c: d503201f nop 0000000007030010 <__b_func_veneer>: 7030010: 90040010 adrp x16, f030000 - 7030014: 9101e210 add x16, x16, #0x78 + 7030014: 91018210 add x16, x16, #0x60 7030018: d61f0200 br x16 \.\.\. @@ -53,34 +53,33 @@ Disassembly of section \.text: \.\.\. 0000000008030030 : - 8030030: 15c00004 b f030040 <__c_func_veneer> - 8030034: 15c00005 b f030048 <__a_func_veneer> + 8030030: 15c0000a b f030058 <__c_func_veneer> + 8030034: 15c00003 b f030040 <__a_func_veneer> \.\.\. - f030038: 14000012 b f030080 <__b_func_bti_veneer\+0x8> + f030038: 14000012 b f030080 .* f03003c: d503201f nop -000000000f030040 <__c_func_veneer>: - f030040: d503245f bti c - f030044: 1440000f b 10030080 - -000000000f030048 <__a_func_veneer>: - f030048: 90fc0010 adrp x16, 7030000 - f03004c: 9100a210 add x16, x16, #0x28 - f030050: d61f0200 br x16 +000000000f030040 <__a_func_veneer>: + f030040: 90fc0010 adrp x16, 7030000 + f030044: 9100a210 add x16, x16, #0x28 + f030048: d61f0200 br x16 \.\.\. -000000000f030060 <__extern_func_veneer>: - f030060: 90f87f90 adrp x16, 20000 <\.plt> - f030064: 9100e210 add x16, x16, #0x38 - f030068: d61f0200 br x16 - \.\.\. +000000000f030058 <__c_func_veneer>: + f030058: d503245f bti c + f03005c: 14400009 b 10030080 + +000000000f030060 <__b_func_bti_veneer>: + f030060: d503245f bti c + f030064: 163ffff3 b 8030030 -000000000f030078 <__b_func_bti_veneer>: - f030078: d503245f bti c - f03007c: 163fffed b 8030030 +000000000f030068 <__extern_func_veneer>: + f030068: 90f87f90 adrp x16, 20000 <\.plt> + f03006c: 9100e210 add x16, x16, #0x38 + f030070: d61f0200 br x16 \.\.\. 0000000010030080 : - 10030080: 17bffff2 b f030048 <__a_func_veneer> - 10030084: 17bffffd b f030078 <__b_func_bti_veneer> - 10030088: 17bffff6 b f030060 <__extern_func_veneer> + 10030080: 17bffff0 b f030040 <__a_func_veneer> + 10030084: 17bffff7 b f030060 <__b_func_bti_veneer> + 10030088: 17bffff8 b f030068 <__extern_func_veneer>