git: 772e9ff110df - main - devel/llvm18: Backport __stack_chk_guard fix
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 15 Jul 2024 21:52:11 UTC
The branch main has been updated by brooks:
URL: https://cgit.FreeBSD.org/ports/commit/?id=772e9ff110df8a8485f4e417c648b626dd829e9e
commit 772e9ff110df8a8485f4e417c648b626dd829e9e
Author: Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2024-07-15 21:50:48 +0000
Commit: Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2024-07-15 21:51:05 +0000
devel/llvm18: Backport __stack_chk_guard fix
Backport upstream commit commit 26464f2662d1 which marks __stack_chk_guard
dso_local except for PPC64 to fix loading an x86 kernel build with
--fstack-protector.
Also update to 18.1.8. From a packaging perspective this only bumps the
version number since it only touchs libc++ which we don't ship. As such,
I'd waited to bundle this bump with a functional change.
Drop releases.llvm.org, the LLVM project seems to nonlonger update it.
Co-authored by: Ahmad Khalifa <ahmadkhalifa570@gmail.com>
Pull Request: https://github.com/freebsd/freebsd-ports/pull/283
---
devel/llvm18/Makefile | 5 +-
devel/llvm18/distinfo | 6 +--
devel/llvm18/files/patch-backport-26464f2662d1 | 70 ++++++++++++++++++++++++++
3 files changed, 75 insertions(+), 6 deletions(-)
diff --git a/devel/llvm18/Makefile b/devel/llvm18/Makefile
index 1b1f759ba50e..5148732975be 100644
--- a/devel/llvm18/Makefile
+++ b/devel/llvm18/Makefile
@@ -1,9 +1,8 @@
PORTNAME= llvm
-DISTVERSION= 18.1.7
+DISTVERSION= 18.1.8
PORTREVISION= 0
CATEGORIES= devel lang
-MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \
- https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/
+MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/
PKGNAMESUFFIX= ${LLVM_SUFFIX}
DISTNAME= llvm-project-${DISTVERSION}.src
DISTFILES= llvm-project-${DISTVERSION}.src${EXTRACT_SUFX}
diff --git a/devel/llvm18/distinfo b/devel/llvm18/distinfo
index 990cb1881098..f7c8f9816f75 100644
--- a/devel/llvm18/distinfo
+++ b/devel/llvm18/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1717778597
-SHA256 (llvm-project-18.1.7.src.tar.xz) = 74446ab6943f686391954cbda0d77ae92e8a60c432eff437b8666e121d748ec4
-SIZE (llvm-project-18.1.7.src.tar.xz) = 132063384
+TIMESTAMP = 1719009196
+SHA256 (llvm-project-18.1.8.src.tar.xz) = 0b58557a6d32ceee97c8d533a59b9212d87e0fc4d2833924eb6c611247db2f2a
+SIZE (llvm-project-18.1.8.src.tar.xz) = 132067260
diff --git a/devel/llvm18/files/patch-backport-26464f2662d1 b/devel/llvm18/files/patch-backport-26464f2662d1
new file mode 100644
index 000000000000..94fb0c94e94f
--- /dev/null
+++ b/devel/llvm18/files/patch-backport-26464f2662d1
@@ -0,0 +1,70 @@
+From 26464f2662d13c7c6ef9f8180b1653c046cd60a7 Mon Sep 17 00:00:00 2001
+From: Justin Cady <desk@justincady.com>
+Date: Wed, 27 Mar 2024 09:03:46 -0400
+Subject: [PATCH] [FreeBSD] Mark __stack_chk_guard dso_local except for PPC64
+ (#86665)
+
+Adjust logic of 1cb9f37a17ab to match freebsd/freebsd-src@9a4d48a645a7a.
+
+D113443 is the original attempt to bring this FreeBSD patch to
+llvm-project,
+but it never landed. This change is required to build FreeBSD kernel
+modules
+with -fstack-protector using a standard LLVM toolchain. The FreeBSD
+kernel
+loader does not handle R_X86_64_REX_GOTPCRELX relocations.
+
+Fixes #50932.
+---
+ llvm/lib/CodeGen/TargetLoweringBase.cpp | 3 ++-
+ llvm/test/CodeGen/X86/stack-protector.ll | 9 +++++++++
+ 2 files changed, 11 insertions(+), 1 deletion(-)
+
+diff --git llvm/lib/CodeGen/TargetLoweringBase.cpp llvm/lib/CodeGen/TargetLoweringBase.cpp
+index 9990556f89ed8..b16e78daf5861 100644
+--- llvm/lib/CodeGen/TargetLoweringBase.cpp
++++ llvm/lib/CodeGen/TargetLoweringBase.cpp
+@@ -2073,7 +2073,8 @@ void TargetLoweringBase::insertSSPDeclarations(Module &M) const {
+ // FreeBSD has "__stack_chk_guard" defined externally on libc.so
+ if (M.getDirectAccessExternalData() &&
+ !TM.getTargetTriple().isWindowsGNUEnvironment() &&
+- !TM.getTargetTriple().isOSFreeBSD() &&
++ !(TM.getTargetTriple().isPPC64() &&
++ TM.getTargetTriple().isOSFreeBSD()) &&
+ (!TM.getTargetTriple().isOSDarwin() ||
+ TM.getRelocationModel() == Reloc::Static))
+ GV->setDSOLocal(true);
+diff --git llvm/test/CodeGen/X86/stack-protector.ll llvm/test/CodeGen/X86/stack-protector.ll
+index a277f9f862ab2..f4f3ae4f55f2e 100644
+--- llvm/test/CodeGen/X86/stack-protector.ll
++++ llvm/test/CodeGen/X86/stack-protector.ll
+@@ -1,6 +1,7 @@
+ ; RUN: llc -mtriple=i386-pc-linux-gnu < %s -o - | FileCheck --check-prefix=LINUX-I386 %s
+ ; RUN: llc -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck --check-prefix=LINUX-X64 %s
+ ; RUN: llc -code-model=kernel -mtriple=x86_64-pc-linux-gnu < %s -o - | FileCheck --check-prefix=LINUX-KERNEL-X64 %s
++; RUN: llc -code-model=kernel -mtriple=x86_64-unknown-freebsd < %s -o - | FileCheck --check-prefix=FREEBSD-KERNEL-X64 %s
+ ; RUN: llc -mtriple=x86_64-apple-darwin < %s -o - | FileCheck --check-prefix=DARWIN-X64 %s
+ ; RUN: llc -mtriple=amd64-pc-openbsd < %s -o - | FileCheck --check-prefix=OPENBSD-AMD64 %s
+ ; RUN: llc -mtriple=i386-pc-windows-msvc < %s -o - | FileCheck -check-prefix=MSVC-I386 %s
+@@ -75,6 +76,10 @@ entry:
+ ; LINUX-X64: mov{{l|q}} %fs:
+ ; LINUX-X64: callq __stack_chk_fail
+
++; FREEBSD-KERNEL-X64-LABEL: test1b:
++; FREEBSD-KERNEL-X64-NOT: mov{{l|q}} __stack_chk_guard@GOTPCREL
++; FREEBSD-KERNEL-X64: callq __stack_chk_fail
++
+ ; LINUX-KERNEL-X64-LABEL: test1b:
+ ; LINUX-KERNEL-X64: mov{{l|q}} %gs:
+ ; LINUX-KERNEL-X64: callq __stack_chk_fail
+@@ -118,6 +123,10 @@ entry:
+ ; LINUX-X64: mov{{l|q}} %fs:
+ ; LINUX-X64: callq __stack_chk_fail
+
++; FREEBSD-KERNEL-X64-LABEL: test1c:
++; FREEBSD-KERNEL-X64: mov{{l|q}} __stack_chk_guard(%rip)
++; FREEBSD-KERNEL-X64: callq __stack_chk_fail
++
+ ; LINUX-KERNEL-X64-LABEL: test1c:
+ ; LINUX-KERNEL-X64: mov{{l|q}} %gs:
+ ; LINUX-KERNEL-X64: callq __stack_chk_fail