[arch-commits] Commit in nvidia-open/trunk (PKGBUILD nvidia-open-gcc-ibt-sls.patch)

[Sven-Hendrik Haase]

    Date: Monday, June 6, 2022 @ 00:37:33
  Author: svenstaro
Revision: 447607

upgpkg: nvidia-open 515.48.07-2: Try to fix FS#74886

Added:
  nvidia-open/trunk/nvidia-open-gcc-ibt-sls.patch
Modified:
  nvidia-open/trunk/PKGBUILD

-------------------------------+
 PKGBUILD                      |   12 +++++++++---
 nvidia-open-gcc-ibt-sls.patch |   28 ++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-06-05 23:59:59 UTC (rev 447606)
+++ PKGBUILD	2022-06-06 00:37:33 UTC (rev 447607)
@@ -2,7 +2,7 @@
 pkgbase=nvidia-open
 pkgname=(nvidia-open nvidia-open-dkms)
 pkgver=515.48.07
-pkgrel=1
+pkgrel=2
 pkgdesc="NVIDIA open kernel modules"
 arch=('x86_64')
 url="https://github.com/NVIDIA/open-gpu-kernel-modules"
@@ -10,11 +10,17 @@
 makedepends=('linux-headers')
 license=('GPL')
 options=('!lto' '!buildflags')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${pkgver}.tar.gz")
-sha512sums=('b5f8b608343c93e0755d0c847d472a68f773c9d9ffb268462489d3d4aad3ab0abe8fb11860ec637abea135bda4eef55c4ffd00d4f817fa48161b5908a09bdf34')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/NVIDIA/open-gpu-kernel-modules/archive/refs/tags/${pkgver}.tar.gz"
+        nvidia-open-gcc-ibt-sls.patch)
+sha512sums=('b5f8b608343c93e0755d0c847d472a68f773c9d9ffb268462489d3d4aad3ab0abe8fb11860ec637abea135bda4eef55c4ffd00d4f817fa48161b5908a09bdf34'
+            'a8821f36c7515bfe4f50d7e3d15a6a8464ec833ca19818d674e300199f3867971f6fba35e1a357fa8ced08cc91d36c2f7fb37cb247bcbf18fa706f97916639b5')
 
 prepare() {
   cd open-gpu-kernel-modules-${pkgver}
+
+  # Fix for https://bugs.archlinux.org/task/74886
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/nvidia-open-gcc-ibt-sls.patch
+
   # Attempt to make this reproducible
   sed -i "s/^HOSTNAME.*/HOSTNAME = echo archlinux"/ utils.mk
   sed -i "s/^WHOAMI.*/WHOAMI = echo archlinux-builder"/ utils.mk

Added: nvidia-open-gcc-ibt-sls.patch
===================================================================
--- nvidia-open-gcc-ibt-sls.patch	                        (rev 0)
+++ nvidia-open-gcc-ibt-sls.patch	2022-06-06 00:37:33 UTC (rev 447607)
@@ -0,0 +1,28 @@
+diff --git a/src/nvidia-modeset/Makefile b/src/nvidia-modeset/Makefile
+index c63b86b..a67d2fc 100644
+--- a/src/nvidia-modeset/Makefile
++++ b/src/nvidia-modeset/Makefile
+@@ -95,7 +95,8 @@ CFLAGS += -ffunction-sections
+ CFLAGS += -fdata-sections
+ CFLAGS += -ffreestanding
+ 
+-CONDITIONAL_CFLAGS := $(call TEST_CC_ARG, -fcf-protection=none)
++CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fcf-protection=branch)
++CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mharden-sls=all)
+ CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -Wformat-overflow=2)
+ CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -Wformat-truncation=1)
+ ifeq ($(TARGET_ARCH),x86_64)
+diff --git a/src/nvidia/Makefile b/src/nvidia/Makefile
+index 9bdb826..3f1e330 100644
+--- a/src/nvidia/Makefile
++++ b/src/nvidia/Makefile
+@@ -119,7 +119,8 @@ CFLAGS += -fdata-sections
+ NV_KERNEL_O_LDFLAGS += --gc-sections
+ EXPORTS_LINK_COMMAND = exports_link_command.txt
+ 
+-CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fcf-protection=none)
++CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fcf-protection=branch -mindirect-branch-register)
++CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mharden-sls=all)
+ 
+ ifeq ($(TARGET_ARCH),x86_64)
+   CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch-register)