Fri Aug 12 08:58:41 2022 UTC ()
lang/compiler-rt: llvm update


(pin)
diff -r1.16 -r1.17 pkgsrc/lang/compiler-rt/distinfo
diff -r1.4 -r1.5 pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake
diff -r0 -r1.1 pkgsrc/lang/compiler-rt/patches/patch-lib_asan_CMakeLists.txt
diff -r1.3 -r1.4 pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp
cvs diff -r1.16 -r1.17 pkgsrc/lang/compiler-rt/distinfo (expand / switch to unified diff)

--- pkgsrc/lang/compiler-rt/distinfo 2022/02/03 20:38:39 1.16
+++ pkgsrc/lang/compiler-rt/distinfo 2022/08/12 08:58:41 1.17
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.16 2022/02/03 20:38:39 adam Exp $ 1$NetBSD: distinfo,v 1.17 2022/08/12 08:58:41 pin Exp $
2 2
3BLAKE2s (compiler-rt-13.0.1.src.tar.xz) = f97d407951a05cdcffb43c4ec3c4dcfa3db117d1c79964c660697442e1e9bb9d 3BLAKE2s (compiler-rt-14.0.6.src.tar.xz) = d2c279dadc7d3cd7f8c2999e918d410eaf7c74cfd16095c3db16bcdc83c30fb8
4SHA512 (compiler-rt-13.0.1.src.tar.xz) = 2cdc3d5cfe5fcf7eba497912ccaadcf33dbd2dd029840fbd54c861b24927e5f4dd494b1ecee1c6c8abbd21e1adf08c217448f408d75346147bac15000fe9ec29 4SHA512 (compiler-rt-14.0.6.src.tar.xz) = c0e63071cb99bca837b83fd0e3597cf45cc635f73ab88a1ec48e863a1633f42bd402ea7c5130e8fa0f550b9574c1ecac1799b92b789565e4ead955cf60060907
5Size (compiler-rt-13.0.1.src.tar.xz) = 2290068 bytes 5Size (compiler-rt-14.0.6.src.tar.xz) = 2327352 bytes
6SHA1 (patch-cmake_config-ix.cmake) = 50e38807363e9d4f18106bb2ff71f5247a24d764 6SHA1 (patch-cmake_config-ix.cmake) = 40ee86393c0f9e26eeaa493c5312d2cabf4c2a58
7SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 8a09da1e6e4476f50cfd5e8034060c6a87bfa92c 7SHA1 (patch-lib_asan_CMakeLists.txt) = f91335b88c8c28a25d7dfada85769f799660f82a
 8SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 8d9b35c02f0c8c10d7e7d3bf9935bd0ca3f5f448
cvs diff -r1.4 -r1.5 pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake (expand / switch to unified diff)

--- pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake 2021/07/12 18:46:07 1.4
+++ pkgsrc/lang/compiler-rt/patches/patch-cmake_config-ix.cmake 2022/08/12 08:58:41 1.5
@@ -1,42 +1,42 @@ @@ -1,42 +1,42 @@
1$NetBSD: patch-cmake_config-ix.cmake,v 1.4 2021/07/12 18:46:07 adam Exp $ 1$NetBSD: patch-cmake_config-ix.cmake,v 1.5 2022/08/12 08:58:41 pin Exp $
2 2
3Disable components that aren't ready for SunOS yet. 3Disable components that aren't ready for SunOS yet.
4 4
5--- cmake/config-ix.cmake.orig 2021-04-06 16:38:18.000000000 +0000 5--- cmake/config-ix.cmake.orig 2022-06-22 16:46:24.000000000 +0000
6+++ cmake/config-ix.cmake 6+++ cmake/config-ix.cmake
7@@ -646,7 +646,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD all  7@@ -668,7 +668,7 @@ set(COMPILER_RT_SANITIZERS_TO_BUILD all
8 list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}") 8 list_replace(COMPILER_RT_SANITIZERS_TO_BUILD all "${ALL_SANITIZERS}")
9  9
10 if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND 10 if (SANITIZER_COMMON_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
11- (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia|SunOS" OR 11- (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia|SunOS" OR
12+ (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia" OR 12+ (OS_NAME MATCHES "Android|Darwin|Linux|FreeBSD|NetBSD|Fuchsia" OR
13 (OS_NAME MATCHES "Windows" AND NOT CYGWIN AND 13 (OS_NAME MATCHES "Windows" AND NOT CYGWIN AND
14 (NOT MINGW OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")))) 14 (NOT MINGW OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"))))
15 set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE) 15 set(COMPILER_RT_HAS_SANITIZER_COMMON TRUE)
16@@ -666,7 +666,7 @@ else() 16@@ -688,7 +688,7 @@ else()
17 set(COMPILER_RT_HAS_ASAN FALSE) 17 set(COMPILER_RT_HAS_ASAN FALSE)
18 endif() 18 endif()
19  19
20-if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD|SunOS") 20-if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD|SunOS")
21+if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD") 21+if (OS_NAME MATCHES "Linux|FreeBSD|Windows|NetBSD")
22 set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME TRUE) 22 set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME TRUE)
23 else() 23 else()
24 set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME FALSE) 24 set(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME FALSE)
25@@ -716,7 +716,7 @@ else() 25@@ -738,7 +738,7 @@ else()
26 endif() 26 endif()
27  27
28 if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND 28 if (PROFILE_SUPPORTED_ARCH AND NOT LLVM_USE_SANITIZER AND
29- OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD|AIX") 29- OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|SunOS|NetBSD|AIX")
30+ OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|NetBSD|AIX") 30+ OS_NAME MATCHES "Darwin|Linux|FreeBSD|Windows|Android|Fuchsia|NetBSD|AIX")
31 set(COMPILER_RT_HAS_PROFILE TRUE) 31 set(COMPILER_RT_HAS_PROFILE TRUE)
32 else() 32 else()
33 set(COMPILER_RT_HAS_PROFILE FALSE) 33 set(COMPILER_RT_HAS_PROFILE FALSE)
34@@ -730,7 +730,7 @@ else() 34@@ -763,7 +763,7 @@ else()
35 endif() 35 endif()
36  36
37 if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND 37 if (COMPILER_RT_HAS_SANITIZER_COMMON AND UBSAN_SUPPORTED_ARCH AND
38- OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|SunOS") 38- OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia|SunOS")
39+ OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia") 39+ OS_NAME MATCHES "Darwin|Linux|FreeBSD|NetBSD|Windows|Android|Fuchsia")
40 set(COMPILER_RT_HAS_UBSAN TRUE) 40 set(COMPILER_RT_HAS_UBSAN TRUE)
41 else() 41 else()
42 set(COMPILER_RT_HAS_UBSAN FALSE) 42 set(COMPILER_RT_HAS_UBSAN FALSE)
File Added: pkgsrc/lang/compiler-rt/patches/patch-lib_asan_CMakeLists.txt
$NetBSD: patch-lib_asan_CMakeLists.txt,v 1.1 2022/08/12 08:58:41 pin Exp $

Only use optimized asan code on Linux.
https://github.com/llvm/llvm-project/issues/57086

--- lib/asan/CMakeLists.txt.orig	2022-06-22 16:46:24.000000000 +0000
+++ lib/asan/CMakeLists.txt
@@ -46,7 +46,7 @@ set(ASAN_STATIC_SOURCES
   asan_rtl_static.cpp
   )
 
-if (NOT WIN32 AND NOT APPLE)
+if (LINUX)
   list(APPEND ASAN_STATIC_SOURCES
     asan_rtl_x86_64.S
   )
cvs diff -r1.3 -r1.4 pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp (expand / switch to unified diff)

--- pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp 2021/07/12 18:46:07 1.3
+++ pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp 2022/08/12 08:58:41 1.4
@@ -1,58 +1,58 @@ @@ -1,58 +1,58 @@
1$NetBSD: patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp,v 1.3 2021/07/12 18:46:07 adam Exp $ 1$NetBSD: patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp,v 1.4 2022/08/12 08:58:41 pin Exp $
2 2
3urio and smb have been removed from NetBSD. 3urio and smb have been removed from NetBSD.
4 4
5--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp.orig 2020-10-07 10:10:48.000000000 +0000 5--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp.orig 2022-06-22 16:46:24.000000000 +0000
6+++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp 6+++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
7@@ -803,12 +803,14 @@ unsigned struct_session_op_sz = sizeof(s 7@@ -957,12 +957,14 @@ unsigned struct_session_op_sz = sizeof(s
8 unsigned struct_sgttyb_sz = sizeof(sgttyb); 8 unsigned struct_sgttyb_sz = sizeof(sgttyb);
9 unsigned struct_sioc_sg_req_sz = sizeof(sioc_sg_req); 9 unsigned struct_sioc_sg_req_sz = sizeof(sioc_sg_req);
10 unsigned struct_sioc_vif_req_sz = sizeof(sioc_vif_req); 10 unsigned struct_sioc_vif_req_sz = sizeof(sioc_vif_req);
11+#if __NetBSD_Version__ < 999000000 11+#if __NetBSD_Version__ < 999000000
12 unsigned struct_smbioc_flags_sz = sizeof(smbioc_flags); 12 unsigned struct_smbioc_flags_sz = sizeof(smbioc_flags);
13 unsigned struct_smbioc_lookup_sz = sizeof(smbioc_lookup); 13 unsigned struct_smbioc_lookup_sz = sizeof(smbioc_lookup);
14 unsigned struct_smbioc_oshare_sz = sizeof(smbioc_oshare); 14 unsigned struct_smbioc_oshare_sz = sizeof(smbioc_oshare);
15 unsigned struct_smbioc_ossn_sz = sizeof(smbioc_ossn); 15 unsigned struct_smbioc_ossn_sz = sizeof(smbioc_ossn);
16 unsigned struct_smbioc_rq_sz = sizeof(smbioc_rq); 16 unsigned struct_smbioc_rq_sz = sizeof(smbioc_rq);
17 unsigned struct_smbioc_rw_sz = sizeof(smbioc_rw); 17 unsigned struct_smbioc_rw_sz = sizeof(smbioc_rw);
18+#endif 18+#endif
19 unsigned struct_spppauthcfg_sz = sizeof(spppauthcfg); 19 unsigned struct_spppauthcfg_sz = sizeof(spppauthcfg);
20 unsigned struct_spppauthfailuresettings_sz = sizeof(spppauthfailuresettings); 20 unsigned struct_spppauthfailuresettings_sz = sizeof(spppauthfailuresettings);
21 unsigned struct_spppauthfailurestats_sz = sizeof(spppauthfailurestats); 21 unsigned struct_spppauthfailurestats_sz = sizeof(spppauthfailurestats);
22@@ -833,7 +835,9 @@ unsigned struct_twe_drivecommand_sz = si 22@@ -987,7 +989,9 @@ unsigned struct_twe_drivecommand_sz = si
23 unsigned struct_twe_paramcommand_sz = sizeof(twe_paramcommand); 23 unsigned struct_twe_paramcommand_sz = sizeof(twe_paramcommand);
24 unsigned struct_twe_usercommand_sz = sizeof(twe_usercommand); 24 unsigned struct_twe_usercommand_sz = sizeof(twe_usercommand);
25 unsigned struct_ukyopon_identify_sz = sizeof(ukyopon_identify); 25 unsigned struct_ukyopon_identify_sz = sizeof(ukyopon_identify);
26+#if __NetBSD_Version__ < 999000000 26+#if __NetBSD_Version__ < 999000000
27 unsigned struct_urio_command_sz = sizeof(urio_command); 27 unsigned struct_urio_command_sz = sizeof(urio_command);
28+#endif 28+#endif
29 unsigned struct_usb_alt_interface_sz = sizeof(usb_alt_interface); 29 unsigned struct_usb_alt_interface_sz = sizeof(usb_alt_interface);
30 unsigned struct_usb_bulk_ra_wb_opt_sz = sizeof(usb_bulk_ra_wb_opt); 30 unsigned struct_usb_bulk_ra_wb_opt_sz = sizeof(usb_bulk_ra_wb_opt);
31 unsigned struct_usb_config_desc_sz = sizeof(usb_config_desc); 31 unsigned struct_usb_config_desc_sz = sizeof(usb_config_desc);
32@@ -1422,8 +1426,10 @@ unsigned IOCTL_STICIO_RESET = STICIO_RES 32@@ -1576,8 +1580,10 @@ unsigned IOCTL_STICIO_RESET = STICIO_RES
33 unsigned IOCTL_STICIO_STARTQ = STICIO_STARTQ; 33 unsigned IOCTL_STICIO_STARTQ = STICIO_STARTQ;
34 unsigned IOCTL_STICIO_STOPQ = STICIO_STOPQ; 34 unsigned IOCTL_STICIO_STOPQ = STICIO_STOPQ;
35 unsigned IOCTL_UKYOPON_IDENTIFY = UKYOPON_IDENTIFY; 35 unsigned IOCTL_UKYOPON_IDENTIFY = UKYOPON_IDENTIFY;
36+#if __NetBSD_Version__ < 999000000 36+#if __NetBSD_Version__ < 999000000
37 unsigned IOCTL_URIO_SEND_COMMAND = URIO_SEND_COMMAND; 37 unsigned IOCTL_URIO_SEND_COMMAND = URIO_SEND_COMMAND;
38 unsigned IOCTL_URIO_RECV_COMMAND = URIO_RECV_COMMAND; 38 unsigned IOCTL_URIO_RECV_COMMAND = URIO_RECV_COMMAND;
39+#endif 39+#endif
40 unsigned IOCTL_USB_REQUEST = USB_REQUEST; 40 unsigned IOCTL_USB_REQUEST = USB_REQUEST;
41 unsigned IOCTL_USB_SETDEBUG = USB_SETDEBUG; 41 unsigned IOCTL_USB_SETDEBUG = USB_SETDEBUG;
42 unsigned IOCTL_USB_DISCOVER = USB_DISCOVER; 42 unsigned IOCTL_USB_DISCOVER = USB_DISCOVER;
43@@ -1808,6 +1814,7 @@ unsigned IOCTL_SIOCCONNECTXDEL = SIOCCON 43@@ -1962,6 +1968,7 @@ unsigned IOCTL_SIOCCONNECTXDEL = SIOCCON
44 unsigned IOCTL_SIOCSIFINFO_FLAGS = SIOCSIFINFO_FLAGS; 44 unsigned IOCTL_SIOCSIFINFO_FLAGS = SIOCSIFINFO_FLAGS;
45 unsigned IOCTL_SIOCAADDRCTL_POLICY = SIOCAADDRCTL_POLICY; 45 unsigned IOCTL_SIOCAADDRCTL_POLICY = SIOCAADDRCTL_POLICY;
46 unsigned IOCTL_SIOCDADDRCTL_POLICY = SIOCDADDRCTL_POLICY; 46 unsigned IOCTL_SIOCDADDRCTL_POLICY = SIOCDADDRCTL_POLICY;
47+#if __NetBSD_Version__ < 999000000 47+#if __NetBSD_Version__ < 999000000
48 unsigned IOCTL_SMBIOC_OPENSESSION = SMBIOC_OPENSESSION; 48 unsigned IOCTL_SMBIOC_OPENSESSION = SMBIOC_OPENSESSION;
49 unsigned IOCTL_SMBIOC_OPENSHARE = SMBIOC_OPENSHARE; 49 unsigned IOCTL_SMBIOC_OPENSHARE = SMBIOC_OPENSHARE;
50 unsigned IOCTL_SMBIOC_REQUEST = SMBIOC_REQUEST; 50 unsigned IOCTL_SMBIOC_REQUEST = SMBIOC_REQUEST;
51@@ -1815,6 +1822,7 @@ unsigned IOCTL_SMBIOC_SETFLAGS = SMBIOC_ 51@@ -1969,6 +1976,7 @@ unsigned IOCTL_SMBIOC_SETFLAGS = SMBIOC_
52 unsigned IOCTL_SMBIOC_LOOKUP = SMBIOC_LOOKUP; 52 unsigned IOCTL_SMBIOC_LOOKUP = SMBIOC_LOOKUP;
53 unsigned IOCTL_SMBIOC_READ = SMBIOC_READ; 53 unsigned IOCTL_SMBIOC_READ = SMBIOC_READ;
54 unsigned IOCTL_SMBIOC_WRITE = SMBIOC_WRITE; 54 unsigned IOCTL_SMBIOC_WRITE = SMBIOC_WRITE;
55+#endif 55+#endif
56 unsigned IOCTL_AGPIOC_INFO = AGPIOC_INFO; 56 unsigned IOCTL_AGPIOC_INFO = AGPIOC_INFO;
57 unsigned IOCTL_AGPIOC_ACQUIRE = AGPIOC_ACQUIRE; 57 unsigned IOCTL_AGPIOC_ACQUIRE = AGPIOC_ACQUIRE;
58 unsigned IOCTL_AGPIOC_RELEASE = AGPIOC_RELEASE; 58 unsigned IOCTL_AGPIOC_RELEASE = AGPIOC_RELEASE;