[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 1/2] tools/firmware: fix setting of fcf-protection=none
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>
- From: Roger Pau Monne <roger.pau@xxxxxxxxxx>
- Date: Fri, 1 Apr 2022 16:37:18 +0200
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=citrix.com; dmarc=pass action=none header.from=citrix.com; dkim=pass header.d=citrix.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=TYFUjWIXSm5BoiX9qqkGPY3DZbe1Ux6jWsFf+dsp8l0=; b=OFL9nZFLZn+gMkl8z+fQ2sPzEguNvRqHmNDHfQZ6vIr0n6xK0oFiadLxoohcRN9kljjg8R3RWd2dfIRlB5iSXY8QPTXtIf9vXz0E2qyYmyugqGNu7d4zWOA5JY1MvbL7r8DaFLMePlJY+C/jmb9QRT51P19a1+umh8AwaJPDgGhq96ekxjVgCPCeFWb2Lgf3wOZ+y8L7xMZ+AyfUx7vJ9jPQlkyesxoOYHuvtupDTjYHnkmAay8rO72HmUP0Qzd771NBId1NPZ6OttxumOmZjsp6HS+h52ndnQpBZ8quIB7TaKmvWPmBk2wOkeeIn7jY5mO2ONVOOdD5eWYW9e+dvg==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=CFiuzCjOlIrhdZYuKlhYgyK4O9dhq+9EQiDR0v4W5uEzXcpVYjz6ztXC+MASFMN6/6vP8vN8/dLL5PDLPAIGU5nddulvngYLi7bLg3AMOc88dCOBgFqM0wegndb1DgtN9RTwyfxVK2xfeemyrr4MJLoV/0XH8jWCSkKZqDHrCyjc/xRK61MuvMuCEobVpN4mjN2pJvcNxCDtX+tfyPSdflFEKgxwmTLqx8gqRnvIAFkiIhyncHtkRygRVw1QaAu+flkpNzj3qa0h6mM60Qc9/U+MwBq86dajwel7UCuw6FwEsk5Zl9qPyGjaK5cbYCCTJScdydV46YtXPo+2lK6e9w==
- Authentication-results: esa2.hc3370-68.iphmx.com; dkim=pass (signature verified) header.i=@citrix.onmicrosoft.com
- Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>, Anthony PERARD <anthony.perard@xxxxxxxxxx>
- Delivery-date: Fri, 01 Apr 2022 14:38:44 +0000
- Ironport-data: A9a23:ah1P46x90oQXAl1BAJd6t+dNxirEfRIJ4+MujC+fZmUNrF6WrkUDn GUZDTiEaP3bN2KgKdF+PYXg9BxS6JbVydViGwc9+yAxQypGp/SeCIXCJC8cHc8zwu4v7q5Dx 59DAjUVBJlsFhcwnj/0bv656yMUOZigHtIQMsadUsxKbVIiGX9JZS5LwbZj2NY02YHhWWthh PupyyHhEA79s9JLGjp8B5Kr8HuDa9yr5Vv0FnRnDRx6lAe2e0s9VfrzFonoR5fMeaFGH/bSe gr25OrRElU1XfsaIojNfr7TKiXmS1NJVOSEoiI+t6OK2nCuqsGuu0qS2TV1hUp/0l20c95NJ Nplq428TgQtG4f1hcMaCz99A3tYPe54weqSSZS/mZT7I0zudnLtx7NlDV0sPJ1e8eFyaY1M3 aVGcnZXNEnF3r/ohuLgIgVvrp1LwM3DJoQQt2sm1TjEJf0nXYrCU+PB4towMDIY2J8RTaaCN pNxhTxHR0XMaSUUBxAsFa0AzfWatED2KTFbpwfAzUYwyzeKl1EguFT3C/LKfvSaSMMTmVyXz krW8mK8DhwEOdi3zTue7mnqluLJhTn8Wo8ZCPu/7PECvbGI7jVNUltMDwL9+KTnzB7lMz5CF 6AK0jQ/oa8x8GmBd8TaWEWehW7emB5fZeMFRoXW9zqx4qbT5g+YAE0NQThAdMEquacKeNA66 rOat4i3XGIy6dV5XVrYr+7J9m3qZUD5OEdYPUc5oR05D84PSW3ZpjbGVZ5dHaG8lbUZ8hmgk mnR/EDSa1j+5PPnNplXH3ia21pARbCTF2bZAzk7uEr/sWuVg6b/O+SVBaDzt6ooEWpgZgDpU II4s8af9vsSKpqGiTaARu4AdJnwuarVb2CG2wY+TsR8n9hIx5JFVdoPiN2ZDB00WvvohBezO BOD0e+vzME70ISWgV9fPNvqVpVCIVnIHtX5TPHEBueikbAqHDJrCBpGPBbKt0i0yRBEufhmZ f+zLJb9ZV5HWP8P5GfnGI8gPUoDm3lWKZX7HsugkXxKENO2ORaodFvyGADQNrpgtvPV/V29H hQ2H5Li9iizmdbWO0H/2YUSMUoLPT48A5X3oNZQbemNPkxtH2RJNhMb6epJl1BN90iNqtr1w w==
- Ironport-hdrordr: A9a23:MkXqe612+7eaxtpPs0ZvFAqjBURyeYIsimQD101hICG9Lfb2qy n+ppgmPEHP5Qr5OEtApTiBUJPwJU80kqQFm7X5XI3SJzUO3VHHEGgM1/qF/9SNIVydygc/79 YeT0EdMqyIMbESt6+Ti2PZYrUdKbG8gdyVbIzlvhBQpG9RGsRdB1ATMHfnLqQ6fngxObMJUL 6nouZXrTupfnoaKuy9G3k+RuDG4/nGjojvbxIqDwMurFDmt0Lh1JfKVzyjmjsOWTJGxrkvtU DDjgzC/62m99W20AXV2WP/54lf3PHh1txALsqRjdV9EESkti+YIKBaH5GStjE8p++irH4sjd n3uh8le/9+7nvAF1vF1CfF6k3F6nID+nXiwViXjT/IusriXg83DMJHmMZwbgbZw1BIhqAw7I t7m0ai87ZHBxLJmyrwo/LSUQtxq0ayqX0+1cYOkn1kV5cEYrM5l/1UwKpsKuZOIMvG0vFoLA E3Z/uspcq+MGnqJEwxh1MfjOBFBR8Ib1e7qktrgL3m79EZpgE786Ii/r1vop4xzuNCd3B63Z W1Dk0RrsA3ciY3V9MIOA5Te7rBNoTyKSi8Q156Z26XVp06Bw==
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
Setting the fcf-protection=none option in EMBEDDED_EXTRA_CFLAGS in the
Makefile doesn't get it propagated to the subdirectories, so instead
set the flag in firmware/Rules.mk, like it's done for other compiler
flags.
Fixes: 3667f7f8f7 ('x86: Introduce support for CET-IBT')
Signed-off-by: Roger Pau Monné <roger.pau@xxxxxxxxxx>
---
tools/firmware/Makefile | 2 --
tools/firmware/Rules.mk | 2 ++
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/firmware/Makefile b/tools/firmware/Makefile
index 53ed4f161e..345037b93b 100644
--- a/tools/firmware/Makefile
+++ b/tools/firmware/Makefile
@@ -6,8 +6,6 @@ TARGET := hvmloader/hvmloader
INST_DIR := $(DESTDIR)$(XENFIRMWAREDIR)
DEBG_DIR := $(DESTDIR)$(DEBUG_DIR)$(XENFIRMWAREDIR)
-EMBEDDED_EXTRA_CFLAGS += -fcf-protection=none
-
SUBDIRS-y :=
SUBDIRS-$(CONFIG_OVMF) += ovmf-dir
SUBDIRS-$(CONFIG_SEABIOS) += seabios-dir
diff --git a/tools/firmware/Rules.mk b/tools/firmware/Rules.mk
index 9f78a7dec9..efbbc73a45 100644
--- a/tools/firmware/Rules.mk
+++ b/tools/firmware/Rules.mk
@@ -13,6 +13,8 @@ endif
CFLAGS += -Werror
+EMBEDDED_EXTRA_CFLAGS += -fcf-protection=none
+
$(call cc-options-add,CFLAGS,CC,$(EMBEDDED_EXTRA_CFLAGS))
# Extra CFLAGS suitable for an embedded type of environment.
--
2.35.1
|