summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2025-08-19 21:57:04 +0200
committerAndreas Enge <andreas@enge.fr>2025-08-19 21:57:08 +0200
commit99ebec55b1949a516a35ddc043f967baf48efdf0 (patch)
treea432cb03b005992fe03aa52d46760f697d7fe10e
parent2e8e1851a3eae1068f47869104ce0ed5c33cb71e (diff)
gnu: Remove clang-runtime-3.5.
* gnu/packages/llvm.scm (clang-runtime-3.5): Delete variable. * gnu/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister file. Change-Id: Iec7ca4be48b71b3546c1a2b9fa89d8736b343c93
-rw-r--r--gnu/local.mk1
-rw-r--r--gnu/packages/llvm.scm28
-rw-r--r--gnu/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch29
3 files changed, 0 insertions, 58 deletions
diff --git a/gnu/local.mk b/gnu/local.mk
index e59e66ca50..511bffe740 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1133,7 +1133,6 @@ dist_patch_DATA = \
%D%/packages/patches/clang-runtime-14-glibc-2.36-compat.patch \
%D%/packages/patches/clang-runtime-9-glibc-2.36-compat.patch \
%D%/packages/patches/clang-runtime-9-libsanitizer-mode-field.patch \
- %D%/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch \
%D%/packages/patches/clang-runtime-3.7-fix-build-with-python3.patch \
%D%/packages/patches/clang-runtime-3.9-libsanitizer-mode-field.patch \
%D%/packages/patches/clang-runtime-3.8-libsanitizer-mode-field.patch \
diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index f6be63ae22..2666d502f2 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1202,34 +1202,6 @@ Library.")
(base32
"0xf5q17kkxsrm2gsi93h4pwlv663kji73r2g4asb97klsmb626a4"))))))
-(define-public clang-runtime-3.5
- (let ((runtime (clang-runtime-from-llvm
- llvm-3.5
- "1hsdnzzdr5kglz6fnv3lcsjs222zjsy14y8ax9dy6zqysanplbal"
- '("clang-runtime-asan-build-fixes.patch"
- "clang-runtime-3.5-libsanitizer-mode-field.patch"
- "clang-3.5-libsanitizer-ustat-fix.patch"))))
- (package/inherit runtime
- (arguments
- (substitute-keyword-arguments (package-arguments runtime)
- ((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- ;; glibc no longer includes rpc/xdr.h, so we use the headers from
- ;; libtirpc.
- (add-after 'unpack 'find-rpc-includes
- (lambda* (#:key inputs #:allow-other-keys)
- (setenv "CPATH"
- (string-append
- (search-input-directory inputs "/include/tirpc")
- ":" (or (getenv "CPATH") "")))
- (setenv "CPLUS_INCLUDE_PATH"
- (string-append
- (search-input-directory inputs "/include/tirpc")
- ":" (or (getenv "CPLUS_INCLUDE_PATH") "")))))))))
- (inputs
- `(("libtirpc" ,libtirpc)
- ("llvm" ,llvm-3.5))))))
-
(define-public llvm-16
(make-llvm "16.0.6"))
diff --git a/gnu/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch b/gnu/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch
deleted file mode 100644
index 9e9d57d265..0000000000
--- a/gnu/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Adjust libsanitizer to ABI change in glibc 2.31.
-
-Adapted to 3.x from this upstream commit:
-https://github.com/llvm/llvm-project/commit/947f9692440836dcb8d88b74b69dd379d85974ce
-
---- a/lib/sanitizer_common/saniniitizer_platform_limits_posix.h.orig 2020-08-11 16:01:32.494882282 +0200 #
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2020-08-11 16:32:49.711383554 +0200
-@@ -176,8 +176,7 @@
- unsigned long __unused1;
- unsigned long __unused2;
- #else
-- unsigned short mode;
-- unsigned short __pad1;
-+ unsigned int mode;
- unsigned short __seq;
- unsigned short __pad2;
- #if defined(__x86_64__) && !defined(_LP64)
---- a/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2020-08-11 16:01:07.926821829 +0200
-+++ b/lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2020-08-11 16:01:03.698811421 +0200
-@@ -1056,7 +1056,9 @@
- CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
- CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
- CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
-+#if !SANITIZER_LINUX || __GLIBC_PREREQ (2, 31)
- CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
-+#endif
-
- CHECK_TYPE_SIZE(shmid_ds);
- CHECK_SIZE_AND_OFFSET(shmid_ds, shm_perm);