CVS commit: pkgsrc/lang/compiler-rt

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Feb 14 13:45:10 UTC 2025

Modified Files:
        pkgsrc/lang/compiler-rt: distinfo
        pkgsrc/lang/compiler-rt/patches:
            patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp

Log Message:
compiler-rt: try fixing build on NetBSD-current differently

after hints from riastradh@ to avoid breaking the build on NetBSD<=10


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 pkgsrc/lang/compiler-rt/distinfo
cvs rdiff -u -r1.7 -r1.8 \
    pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/compiler-rt/distinfo
diff -u pkgsrc/lang/compiler-rt/distinfo:1.28 pkgsrc/lang/compiler-rt/distinfo:1.29
--- pkgsrc/lang/compiler-rt/distinfo:1.28       Mon Feb  3 19:55:34 2025
+++ pkgsrc/lang/compiler-rt/distinfo    Fri Feb 14 13:45:09 2025
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2025/02/03 19:55:34 wiz Exp $
+$NetBSD: distinfo,v 1.29 2025/02/14 13:45:09 wiz Exp $
 
 BLAKE2s (cmake-18.1.8.src.tar.xz) = 77d99e6cf6210475bda352d49bd823ecd428ffd92c4b5bc0147583e1f2628c64
 SHA512 (cmake-18.1.8.src.tar.xz) = e02243b491f9e688db28d7b53270fcf87debf09d3c95b136a7c7b96e26890de68712c60a1e85f5a448a95ad8c81f2d8ae77047780822443bbe39f1a9e6211007
@@ -13,4 +13,4 @@ SHA1 (patch-CMakeLists.txt) = f8b0a0ad43
 SHA1 (patch-cmake_config-ix.cmake) = 40ee86393c0f9e26eeaa493c5312d2cabf4c2a58
 SHA1 (patch-lib_fuzzer_FuzzerUtilLinux.cpp) = 9de59ffcb31d511f67f10fa4ec55cfa7c7f64b31
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cpp) = bc04e2d792c8eaffb26b60fdaceef261ffe03371
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp) = f3635b56ab3d97cd1035fdea7f593d255fe14c24
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp) = 47f5f33c016a429ac3b02dafcd015de072a9997b

Index: pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
diff -u pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp:1.7 pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp:1.8
--- pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp:1.7       Mon Feb  3 19:55:34 2025
+++ pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp   Fri Feb 14 13:45:09 2025
@@ -1,21 +1,22 @@
-$NetBSD: patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp,v 1.7 2025/02/03 19:55:34 wiz Exp $
+$NetBSD: patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp,v 1.8 2025/02/14 13:45:09 wiz Exp $
 
 Fix build on NetBSD-current, where some symbols moved to a new header.
 https://github.com/llvm/llvm-project/issues/125566
 
 --- lib/sanitizer_common/sanitizer_linux_libcdep.cpp.orig      2024-06-15 17:21:32.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_linux_libcdep.cpp
-@@ -29,7 +29,13 @@
+@@ -29,7 +29,14 @@
  #  include "sanitizer_solaris.h"
  
  #  if SANITIZER_NETBSD
 -#    define _RTLD_SOURCE  // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
 +#    // for __lwp_gettcb_fast() / __lwp_getprivate_fast()
++#    define _RTLD_SOURCE
++#    include <machine/mcontext.h>
++#    undef _RTLD_SOURCE
 +#    include <sys/param.h>
-+#    if defined(__NetBSD_Version__) && (__NetBSD_Version__ >= 1099001200)
++#    if __NetBSD_Version__ >= 1099001200
 +#      include <machine/lwp_private.h>
-+#    else
-+#      define _RTLD_SOURCE
 +#    endif
  #  endif