compiler-rt: fix building on netbsd-9/amd64

3 files changed, 24 insertions, 5 deletions

diff --git a/lang/compiler-rt/PLIST.NetBSD-x86_64 b/lang/compiler-rt/PLIST.NetBSD-x86_64
new file mode 100644
index 00000000000..352f238e443
--- /dev/null
+++ b/lang/compiler-rt/PLIST.NetBSD-x86_64
@@ -0,0 +1,18 @@
+@comment $NetBSD: PLIST.NetBSD-x86_64,v 1.1 2020/09/26 02:08:10 khorben Exp $
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-i386.so
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan-preinit-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.asan_cxx-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.builtins-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.cfi_diag-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.lsan-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.profile-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.safestack-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.stats_client-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_minimal-i386.so
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-i386.a
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone-i386.so
+lib/clang/${PKGVERSION}/lib/netbsd/libclang_rt.ubsan_standalone_cxx-i386.a
diff --git a/lang/compiler-rt/distinfo b/lang/compiler-rt/distinfo
index 5c2a82f6152..4f6ef6a6837 100644
--- a/lang/compiler-rt/distinfo
+++ b/lang/compiler-rt/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2020/07/26 19:20:13 adam Exp $
+$NetBSD: distinfo,v 1.10 2020/09/26 02:08:10 khorben Exp $
 
 SHA1 (compiler-rt-10.0.1.src.tar.xz) = ee6077b4728b3c750e476938cead11cea45b49ff
 RMD160 (compiler-rt-10.0.1.src.tar.xz) = 7912cb7c636894f0682b91d04ea0dfe512f01124
 SHA512 (compiler-rt-10.0.1.src.tar.xz) = a1d2e3f5ad529a04f87059903b31fc3c9803cd86f44aed1aebd87ce7e423d8dd2b6776be12e85a0374a6215f581420438d224c130aad5e6355920af32c02aa7b
 Size (compiler-rt-10.0.1.src.tar.xz) = 2085712 bytes
 SHA1 (patch-cmake_config-ix.cmake) = e950d8781f00638310b523b6933889a9d15611c5
-SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp) = 313d453302efa05db50cd6a34dec05f4d75a668f
+SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp) = f812d5a5f6870e1ed2fe31d0bca1f79d8c16fa9a
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 53c60eb4a1e7be5a60c7b4fff2d245daef54653d
diff --git a/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp b/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
index 20a3c358a62..a4889686b64 100644
--- a/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
+++ b/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp
@@ -1,8 +1,8 @@
-$NetBSD: patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp,v 1.1 2020/04/18 08:03:53 adam Exp $
+$NetBSD: patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp,v 1.2 2020/09/26 02:08:10 khorben Exp $
 
 Fix building on NetBSD.
 
---- lib/sanitizer_common/sanitizer_linux_libcdep.cpp.orig	2018-10-07 10:50:07.000000000 +0000
+--- lib/sanitizer_common/sanitizer_linux_libcdep.cpp.orig	2020-03-23 15:01:02.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_linux_libcdep.cpp
 @@ -520,13 +520,13 @@ void GetThreadStackAndTls(bool main, upt
  #endif
@@ -11,7 +11,8 @@ Fix building on NetBSD.
 -#if !SANITIZER_FREEBSD && !SANITIZER_OPENBSD
 +#if !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_OPENBSD
  typedef ElfW(Phdr) Elf_Phdr;
- #elif SANITIZER_WORDSIZE == 32 && __FreeBSD_version <= 902001 // v9.2
+-#elif SANITIZER_WORDSIZE == 32 && __FreeBSD_version <= 902001 // v9.2
++#elif SANITIZER_WORDSIZE == 32 && SANITIZER_FREEBSD && __FreeBSD_version <= 902001 // v9.2
  #define Elf_Phdr XElf32_Phdr
  #define dl_phdr_info xdl_phdr_info
  #define dl_iterate_phdr(c, b) xdl_iterate_phdr((c), (b))