git: 270bf9855c79 - main - devel/llvm1[234567]: enable qsort sanatizer wrapper

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Brooks Davis <brooks_at_FreeBSD.org>
Date: Mon, 11 Dec 2023 17:42:35 UTC
The branch main has been updated by brooks:

URL: https://cgit.FreeBSD.org/ports/commit/?id=270bf9855c799ac55fcf181229eee7d0063497a4

commit 270bf9855c799ac55fcf181229eee7d0063497a4
Author:     Brooks Davis <brooks@FreeBSD.org>
AuthorDate: 2023-12-08 23:48:11 +0000
Commit:     Brooks Davis <brooks@FreeBSD.org>
CommitDate: 2023-12-11 17:42:25 +0000

    devel/llvm1[234567]: enable qsort sanatizer wrapper
    
    I'd disabled it in 10.0.0 when it was found to be broken.  It was then
    fixed in LLVM 12, but the patch was never never removed and I propogated
    it along for several year.
    
    Reported by:    Brad Smith <brad@comstyle.com>
    See also:       https://github.com/llvm/llvm-project/issues/46176
---
 devel/llvm12/Makefile                                         |  2 +-
 ...-lib_sanitizer__common_sanitizer__platform__interceptors.h | 11 -----------
 devel/llvm13/Makefile                                         |  2 +-
 ...-lib_sanitizer__common_sanitizer__platform__interceptors.h | 11 -----------
 devel/llvm14/Makefile                                         |  2 +-
 ...-lib_sanitizer__common_sanitizer__platform__interceptors.h | 11 -----------
 devel/llvm15/Makefile                                         |  2 +-
 ...-lib_sanitizer__common_sanitizer__platform__interceptors.h | 11 -----------
 devel/llvm16/Makefile                                         |  2 +-
 ...-lib_sanitizer__common_sanitizer__platform__interceptors.h | 11 -----------
 devel/llvm17/Makefile                                         |  2 +-
 ...-lib_sanitizer__common_sanitizer__platform__interceptors.h | 11 -----------
 12 files changed, 6 insertions(+), 72 deletions(-)

diff --git a/devel/llvm12/Makefile b/devel/llvm12/Makefile
index ffab8372d11e..1c57b3c8dfc8 100644
--- a/devel/llvm12/Makefile
+++ b/devel/llvm12/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	12.0.1
-PORTREVISION=	11
+PORTREVISION=	12
 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}
diff --git a/devel/llvm12/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/devel/llvm12/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
deleted file mode 100644
index 7664513d6c89..000000000000
--- a/devel/llvm12/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
-+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -576,7 +576,7 @@
- #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
- #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD
- #define SANITIZER_INTERCEPT_QSORT \
--  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID)
-+  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID && !SI_FREEBSD)
- #define SANITIZER_INTERCEPT_QSORT_R SI_GLIBC
- // sigaltstack on i386 macOS cannot be intercepted due to setjmp()
- // calling it and assuming that it does not clobber registers.
diff --git a/devel/llvm13/Makefile b/devel/llvm13/Makefile
index df0008427fb3..0ea6554be046 100644
--- a/devel/llvm13/Makefile
+++ b/devel/llvm13/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	13.0.1
-PORTREVISION=	5
+PORTREVISION=	6
 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}
diff --git a/devel/llvm13/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/devel/llvm13/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
deleted file mode 100644
index 7664513d6c89..000000000000
--- a/devel/llvm13/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
-+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -576,7 +576,7 @@
- #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
- #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD
- #define SANITIZER_INTERCEPT_QSORT \
--  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID)
-+  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID && !SI_FREEBSD)
- #define SANITIZER_INTERCEPT_QSORT_R SI_GLIBC
- // sigaltstack on i386 macOS cannot be intercepted due to setjmp()
- // calling it and assuming that it does not clobber registers.
diff --git a/devel/llvm14/Makefile b/devel/llvm14/Makefile
index dd1e036bb435..5afea3b82bde 100644
--- a/devel/llvm14/Makefile
+++ b/devel/llvm14/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	14.0.6
-PORTREVISION=	2
+PORTREVISION=	3
 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}
diff --git a/devel/llvm14/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/devel/llvm14/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
deleted file mode 100644
index 7664513d6c89..000000000000
--- a/devel/llvm14/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
-+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -576,7 +576,7 @@
- #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
- #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD
- #define SANITIZER_INTERCEPT_QSORT \
--  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID)
-+  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID && !SI_FREEBSD)
- #define SANITIZER_INTERCEPT_QSORT_R SI_GLIBC
- // sigaltstack on i386 macOS cannot be intercepted due to setjmp()
- // calling it and assuming that it does not clobber registers.
diff --git a/devel/llvm15/Makefile b/devel/llvm15/Makefile
index 90b0fbbf2903..9684141fa744 100644
--- a/devel/llvm15/Makefile
+++ b/devel/llvm15/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	15.0.7
-PORTREVISION=	7
+PORTREVISION=	8
 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}/
diff --git a/devel/llvm15/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/devel/llvm15/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
deleted file mode 100644
index 7664513d6c89..000000000000
--- a/devel/llvm15/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
-+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -576,7 +576,7 @@
- #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
- #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD
- #define SANITIZER_INTERCEPT_QSORT \
--  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID)
-+  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID && !SI_FREEBSD)
- #define SANITIZER_INTERCEPT_QSORT_R SI_GLIBC
- // sigaltstack on i386 macOS cannot be intercepted due to setjmp()
- // calling it and assuming that it does not clobber registers.
diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile
index fe47ead79817..2eba04e5a8b7 100644
--- a/devel/llvm16/Makefile
+++ b/devel/llvm16/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	16.0.6
-PORTREVISION=	7
+PORTREVISION=	8
 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}/
diff --git a/devel/llvm16/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/devel/llvm16/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
deleted file mode 100644
index 7664513d6c89..000000000000
--- a/devel/llvm16/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
-+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -576,7 +576,7 @@
- #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
- #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD
- #define SANITIZER_INTERCEPT_QSORT \
--  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID)
-+  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID && !SI_FREEBSD)
- #define SANITIZER_INTERCEPT_QSORT_R SI_GLIBC
- // sigaltstack on i386 macOS cannot be intercepted due to setjmp()
- // calling it and assuming that it does not clobber registers.
diff --git a/devel/llvm17/Makefile b/devel/llvm17/Makefile
index 37d3444cf7c3..b3b68f775d0f 100644
--- a/devel/llvm17/Makefile
+++ b/devel/llvm17/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	llvm
 DISTVERSION=	17.0.6
-PORTREVISION=	0
+PORTREVISION=	1
 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}/
diff --git a/devel/llvm17/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/devel/llvm17/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
deleted file mode 100644
index 7664513d6c89..000000000000
--- a/devel/llvm17/files/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h.orig
-+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -576,7 +576,7 @@
- #define SANITIZER_INTERCEPT_PTHREAD_ATFORK SI_NETBSD
- #define SANITIZER_INTERCEPT_GETENTROPY SI_FREEBSD
- #define SANITIZER_INTERCEPT_QSORT \
--  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID)
-+  (SI_POSIX && !SI_IOSSIM && !SI_WATCHOS && !SI_TVOS && !SI_ANDROID && !SI_FREEBSD)
- #define SANITIZER_INTERCEPT_QSORT_R SI_GLIBC
- // sigaltstack on i386 macOS cannot be intercepted due to setjmp()
- // calling it and assuming that it does not clobber registers.