Date: Tuesday, November 29, 2022 @ 18:13:47 Author: svenstaro Revision: 462771
upgpkg: nvidia-open 525.60.11-1 Modified: nvidia-open/trunk/PKGBUILD nvidia-open/trunk/nvidia-open-gcc-ibt-sls.patch -------------------------------+ PKGBUILD | 8 ++++---- nvidia-open-gcc-ibt-sls.patch | 32 +++++++------------------------- 2 files changed, 11 insertions(+), 29 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-11-29 18:12:47 UTC (rev 462770) +++ PKGBUILD 2022-11-29 18:13:47 UTC (rev 462771) @@ -1,8 +1,8 @@ # Maintainer: Sven-Hendrik Haase <[email protected]> pkgbase=nvidia-open pkgname=(nvidia-open nvidia-open-dkms) -pkgver=520.56.06 -pkgrel=11 +pkgver=525.60.11 +pkgrel=1 pkgdesc="NVIDIA open kernel modules" arch=('x86_64') url="https://github.com/NVIDIA/open-gpu-kernel-modules"; @@ -12,8 +12,8 @@ options=('!lto' '!buildflags') 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=('de641acbe16803eef9ef84d0afb4158f5ad392b0f3a5a43ab5a7c3dab064c0a73ae6cf95477602c657ff991324aa01713711408f884383fde1729c83b1a0cb8f' - 'a8821f36c7515bfe4f50d7e3d15a6a8464ec833ca19818d674e300199f3867971f6fba35e1a357fa8ced08cc91d36c2f7fb37cb247bcbf18fa706f97916639b5') +sha512sums=('cbd782ebecbfbbd3597c2f9563f09c89afb4a227268b9c87e4bd6c4ee17638d503dbeb89ab84e1b1219f66fcd5dddfc971553b9779fa9f3d60ef31f937fae296' + '263c4c5e75ef8cb8ca2641c022dfaf8bd9222fadf68ed15120b0ae7dd9cc901a04ce2e55625d513a0995759c9d82dfbdc4c33d4751159124915d7404b1400e34') prepare() { cd open-gpu-kernel-modules-${pkgver} Modified: nvidia-open-gcc-ibt-sls.patch =================================================================== --- nvidia-open-gcc-ibt-sls.patch 2022-11-29 18:12:47 UTC (rev 462770) +++ nvidia-open-gcc-ibt-sls.patch 2022-11-29 18:13:47 UTC (rev 462771) @@ -1,28 +1,10 @@ -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 +@@ -142,6 +142,7 @@ ifeq ($(TARGET_ARCH),x86_64) + CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -fno-jump-tables) + CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch=thunk-extern) + CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mindirect-branch-register) ++ CONDITIONAL_CFLAGS += $(call TEST_CC_ARG, -mharden-sls=all) + endif --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) + CFLAGS += $(CONDITIONAL_CFLAGS)
