From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by mx.groups.io with SMTP id smtpd.web10.31901.1679914928466998722 for ; Mon, 27 Mar 2023 04:02:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=OztwTsG9; spf=pass (domain: kernel.org, ip: 139.178.84.217, mailfrom: ardb@kernel.org) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 0B464611A9; Mon, 27 Mar 2023 11:02:08 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5A31C4339B; Mon, 27 Mar 2023 11:02:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1679914927; bh=9M8N9GRO3kDQ8tEB/o+WJLpI1LLfyKjbijPsysPRDcA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OztwTsG97rVFiToxB0AaJ/10CGmwpoRoxbHrUofYCdncmDnhvmevEQ1QZReCrbCg4 YpggddO8yjOrwurmuHFPkeAWJQFjTK1zRLd3SLdDK/nbBTSaWxTBtmkpmCIukf+54j 1KjeuRAEPFdiuINX8eSotv+UXayPc0I3HKmYMKNf04/A0/G+uC4Lv5zzSIT8NCK7pr YydxdpCnxW7QEf/J/olYbtcuSDcZTPDgrdHGyN+YoaQu4VZjLcMsKCSjusKKDCEE3i +Gw1F+euXI0Bcj/OHUZh29bOVIebPzlcGfBEKadzsPd+1qNBqIgnIcv9VevHYcZSJF kK5Fbhqmfc5Hw== From: "Ard Biesheuvel" To: devel@edk2.groups.io Cc: Ard Biesheuvel , Michael Kinney , Liming Gao , Jiewen Yao , Michael Kubacki , Sean Brogan , Rebecca Cran , Leif Lindholm , Sami Mujawar , Taylor Beebe , =?UTF-8?q?Marvin=20H=C3=A4user?= , Bob Feng Subject: [PATCH v2 12/17] ArmPlatformPkg/PrePeiCore: Make vector table object BTI compatible Date: Mon, 27 Mar 2023 13:01:07 +0200 Message-Id: <20230327110112.262503-13-ardb@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230327110112.262503-1-ardb@kernel.org> References: <20230327110112.262503-1-ardb@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable The object file containing the vector table does not contain any callable functions, so it will not be implicitly annotated as BTI compatible on BTI builds. So add the annotation by hand, and use the 'empty' type so we get the GNU ELF note but not the actual BTI opcode. Signed-off-by: Ard Biesheuvel --- ArmPlatformPkg/PrePeiCore/AArch64/Exception.S | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S b/ArmPlatformPkg= /PrePeiCore/AArch64/Exception.S index 43e40f97c3eed5ff..5a84fefe3fb55216 100644 --- a/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S +++ b/ArmPlatformPkg/PrePeiCore/AArch64/Exception.S @@ -112,3 +112,5 @@ _DefaultSError_LowerA32: TO_HANDLER=0D =0D VECTOR_END(PeiVectorTable)=0D +=0D +AARCH64_BTI()=0D --=20 2.39.2