From nobody Mon Feb 19 16:45:15 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TdpLN2t4Sz5C9Hv; Mon, 19 Feb 2024 16:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TdpLN1007z4bpS; Mon, 19 Feb 2024 16:45:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JjPeGSQY2E/3tdjOmKBeWuUxaRQznVKvOc/UFJatiHM=; b=Wyic/liovu2Q+57w195/brh13B5RhArhSBvj5fr/yGKZoXymz59zb9Oj95GCdDLX8SdhK6 WavfnINdWS/PZsASfaOcJT8ADLe5l7sQEcRacbA4kBMtVB08Yjc1I5ToBjpHMnfPgrvuqO Ye+3LtqzZwfZxG1IM65OAbuUhIB3WCJn0tyCuJR+yd1qDcxnTmXeWCTBeSREj2iSg5xhl8 8xCoX+TUXuA9vWvfHAaRwJ6nrfDTurRfNYdRj6Gk+80g3EwsjNKyVa/lbe9A+ssXg3cBUU DVRyjG1jXtbHRTGE874KOIPMu+ln1WogHDvS87726ap4cw6zBvXmpLIMjWPYwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1708361116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JjPeGSQY2E/3tdjOmKBeWuUxaRQznVKvOc/UFJatiHM=; b=OBorI2R9y5zAisymHbGlgewsQsDfdqM3y+nE4qpD4hvHJheuLrEumiGaTYjzP1vbkI1y/L qsA/nKfqb8aVeTlZk0y77KgFuU55+KDv+euqS8T4u+2qXPGD4TTt0tbJTMGqDHRPc3lcX4 IBKmyh1z0JrSWn0I1s9TbZ0h2vFM/IQKoMO67HarpHg8RMyeycigtKdy86ekIx3j0M8NTd JZuJZC8FVp2dqg56XZ1b8UAH/A2CDa6EX+vky7wBXdq2vEpHC+aaglnO4YhnFAJCYzl3rz 3vz6WpRTXELcYGXn2LMo/GagkCw5CywjhPpUlrpTYBv+iEwFKOA73cQsu1PTlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1708361116; a=rsa-sha256; cv=none; b=Tk2r48Hk/wUp+Ojb3Jxhv2sROqH+U+Fc1LepbllmWALozfRywDPwaJFRjxGF8H8bwAptJ6 BPUGjKqQm1W8JEkBhdduaZKhlNiI+axivju4DNOoMXYzqZCT72wWwzBYD6yi5Van52nxbC KAa6s/usY3UpkgXKWm5Fa9x35/GPTG/UE0MTsFkXSqfHW/lGcMw08l3ET2YtYLke3F/z1U CTK+i2GyJ2r88m9a6s4LN0CsvA6Zh0u0zYFBxAW2i54kpizfGo8E8WvXgD+/MRLKdj+mrv t0mbvB3qegAzkfdTTniVh+yR07zDjWJrJQ6Ss/OZUXZWmVfBuf2ZO5eP3UwGYw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TdpLM6pSKzj9S; Mon, 19 Feb 2024 16:45:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 41JGjF5W095915; Mon, 19 Feb 2024 16:45:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 41JGjFKx095912; Mon, 19 Feb 2024 16:45:15 GMT (envelope-from git) Date: Mon, 19 Feb 2024 16:45:15 GMT Message-Id: <202402191645.41JGjFKx095912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: d4163257401c - stable/14 - rtld: Teach rtld about the BTI elf note List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d4163257401ce2fbf1023453992fbf15111beb48 Auto-Submitted: auto-generated The branch stable/14 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d4163257401ce2fbf1023453992fbf15111beb48 commit d4163257401ce2fbf1023453992fbf15111beb48 Author: Andrew Turner AuthorDate: 2023-10-12 16:29:46 +0000 Commit: Andrew Turner CommitDate: 2024-02-19 13:12:18 +0000 rtld: Teach rtld about the BTI elf note Add the Branch Target Identification (BTI) note to libc assembly sources. As all obect files need the note for rtld to have it we need to insert it in all asm files. Reviewed by: markj, emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D42228 (cherry picked from commit 5270cc9757fb4e0c1303ec44c2602b75acf3806d) --- libexec/rtld-elf/aarch64/rtld_start.S | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libexec/rtld-elf/aarch64/rtld_start.S b/libexec/rtld-elf/aarch64/rtld_start.S index 7dc87213b5fb..8de3e021d567 100644 --- a/libexec/rtld-elf/aarch64/rtld_start.S +++ b/libexec/rtld-elf/aarch64/rtld_start.S @@ -28,6 +28,8 @@ */ #include +#include + ENTRY(.rtld_start) .cfi_undefined x30 mov x19, x0 /* Put ps_strings in a callee-saved register */ @@ -249,3 +251,5 @@ ENTRY(_rtld_tlsdesc_dynamic) .cfi_adjust_cfa_offset -2 * 16 ret END(_rtld_tlsdesc_dynamic) + +GNU_PROPERTY_AARCH64_FEATURE_1_NOTE(GNU_PROPERTY_AARCH64_FEATURE_1_VAL)