From nobody Mon Oct 30 17:56:18 2023 X-Original-To: dev-commits-src-main@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 4SK1D265DQz4yDkH; Mon, 30 Oct 2023 17:56:18 +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 4SK1D25Ft5z3YBw; Mon, 30 Oct 2023 17:56:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688578; 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=tlhXwM04eA4BoUV8N2fd9LhhjCjXjlSg6SlCo/E+gyI=; b=n+0ymktyifB9inoGQZkNvzl9poQHGptTyGPXZ+807TOdyKSfZhdlESACrsbttHPQP13B9f HQQylzeMf0XmdenE6X6xmcRtUIuJgtw42KyA1BQFKYTjB/cHi5a1Eq2RvqXJ7NuEEwyQMB LImvYarSYeb1gu2CBeE9nr6VnX4aRRQjPEWCUAMrSMPlJ0LMjN352cO9wDDMJU9iLNj9S/ 4NrQj8vgGRzMwUkXQKv8BTzaqK0btqRYlp9Ei8V3BFq+7vDoYw6fH6Gh8GbIin5oL/guE0 efTamVQ8IxGYnHx/mnoQO8mnIcSSAZN2+g5SyiLfV7AtRL3QbTMK050w3prO/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698688578; 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=tlhXwM04eA4BoUV8N2fd9LhhjCjXjlSg6SlCo/E+gyI=; b=rJjHR27sC4sns69JOZE+vKwCy3ixJYct/fMha94nfYRjks/fKOAmU+sntWCDAxGaWBcUjC pdBlYddWlzGdjlrxvx33pG483bpxJugARpD4yCrY6bidKNoDS1VexiPghtLfuwIkLQNMH3 NNASeLA474nTvg+hzPb9+LtAaaJXuPgx3OWfakoHCxdRjhKYWreZSqHyQ+lOPeWssE5IVw /DSuHmVb2QzFulnD9BuYibLDEOm1F18S1xQLP1g12ummNDp8HAwXzgFQde5BmdOyBaapFH hxAoPKFQixvsJv6uJrcgI3ofrWpS93WP4BrZTp+Ws2mwe5VmnCsyep0mL4qoyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698688578; a=rsa-sha256; cv=none; b=oyGtdBwCc4JEA9qRRAQQoUdyYuDb3c+RVblj9r8CTmtDM9gf9a2evKLqPh8T00N+DRg6NG NwYV22nbADcdIG0O6uSxtjYDSHwIrFhjAAuI4Gzf5g1iaK75GVyzz3FbihPSNeuMvnewn8 5OWKktGcAP4Rk/nTXOaCb3xtK/kIXQqm1R1+hFnXwgtJh3UquaJVbWMj0+2H2DZOsw6FMj 90Ax409/gEZTfO7mDUNHt8r8aCIwoazO+fNSNnjL2Zn8sMUiDzApArsOmeKegyhxELask6 87veY2q/dVaZXVFWQqSKy8VEu+fnXDQBr4jjCp0F6y1WnjnMRCP0X+jRX+RIDw== 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 4SK1D243rczWwb; Mon, 30 Oct 2023 17:56:18 +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 39UHuISY028581; Mon, 30 Oct 2023 17:56:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39UHuI0M028578; Mon, 30 Oct 2023 17:56:18 GMT (envelope-from git) Date: Mon, 30 Oct 2023 17:56:18 GMT Message-Id: <202310301756.39UHuI0M028578@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 5270cc9757fb - main - rtld: Teach rtld about the BTI elf note List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 5270cc9757fb4e0c1303ec44c2602b75acf3806d Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5270cc9757fb4e0c1303ec44c2602b75acf3806d commit 5270cc9757fb4e0c1303ec44c2602b75acf3806d Author: Andrew Turner AuthorDate: 2023-10-12 16:29:46 +0000 Commit: Andrew Turner CommitDate: 2023-10-30 17:55:44 +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 --- 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)