3 files changed, 0 insertions(+), 58 deletions(-)

M gnu/local.mk
M gnu/packages/llvm.scm
D gnu/packages/patches/clang-runtime-3.5-libsanitizer-mode-field.patch

@@ 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	\

@@ 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"))
 

@@ 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);