CVS commit: pkgsrc/lang/compiler-rt

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

Module Name:    pkgsrc
Committed By:   wiz
Date:           Fri Mar  3 09:47:20 UTC 2023

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

Log Message:
compiler-rt: fix build on NetBSD-current


To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 pkgsrc/lang/compiler-rt/distinfo
cvs rdiff -u -r1.4 -r1.5 \
    pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.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.21 pkgsrc/lang/compiler-rt/distinfo:1.22
--- pkgsrc/lang/compiler-rt/distinfo:1.21       Thu Jan 12 19:32:53 2023
+++ pkgsrc/lang/compiler-rt/distinfo    Fri Mar  3 09:47:19 2023
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2023/01/12 19:32:53 adam Exp $
+$NetBSD: distinfo,v 1.22 2023/03/03 09:47:19 wiz Exp $
 
 BLAKE2s (cmake-15.0.7.src.tar.xz) = 2c299f2c58800bcb0c5930562d24baed0e94806df8b8d5295c0866ffeaaf233f
 SHA512 (cmake-15.0.7.src.tar.xz) = 85097a6eaee0df004567905f7e5ce8ca02e3b46c6fc66fa552fe99734642e6ee61685de4e5e6e8b505963334d7b91d98ecd9c5870e6bdd3f0018ee5b963ffa96
@@ -9,4 +9,4 @@ Size (compiler-rt-15.0.7.src.tar.xz) = 2
 SHA1 (patch-cmake_config-ix.cmake) = 40ee86393c0f9e26eeaa493c5312d2cabf4c2a58
 SHA1 (patch-lib_asan_CMakeLists.txt) = f91335b88c8c28a25d7dfada85769f799660f82a
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cpp) = 32befa87b3487518ce6423ab197c3a587e53bb2f
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = 8d9b35c02f0c8c10d7e7d3bf9935bd0ca3f5f448
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp) = b7071efbff73aa0d67414e76ae1dc4f7a73fdcd6

Index: pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp
diff -u pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp:1.4 
pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp:1.5
--- pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp:1.4     Fri Aug 12 08:58:41 2022
+++ pkgsrc/lang/compiler-rt/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp Fri Mar  3 09:47:20 2023
@@ -1,8 +1,9 @@
-$NetBSD: patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp,v 1.4 2022/08/12 08:58:41 pin Exp $
+$NetBSD: patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cpp,v 1.5 2023/03/03 09:47:20 wiz Exp $
 
 urio and smb have been removed from NetBSD.
+TIOCRCVFRAME and TIOCXMTFRAME as well.
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp.orig     2022-06-22 16:46:24.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp.orig     2023-01-12 07:12:30.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cpp
 @@ -957,12 +957,14 @@ unsigned struct_session_op_sz = sizeof(s
  unsigned struct_sgttyb_sz = sizeof(sgttyb);
@@ -56,3 +57,16 @@ urio and smb have been removed from NetB
  unsigned IOCTL_AGPIOC_INFO = AGPIOC_INFO;
  unsigned IOCTL_AGPIOC_ACQUIRE = AGPIOC_ACQUIRE;
  unsigned IOCTL_AGPIOC_RELEASE = AGPIOC_RELEASE;
+@@ -2342,8 +2350,12 @@ unsigned IOCTL_TIOCDRAIN = TIOCDRAIN;
+ unsigned IOCTL_TIOCGFLAGS = TIOCGFLAGS;
+ unsigned IOCTL_TIOCSFLAGS = TIOCSFLAGS;
+ unsigned IOCTL_TIOCDCDTIMESTAMP = TIOCDCDTIMESTAMP;
++#ifdef TIOCRCVFRAME
+ unsigned IOCTL_TIOCRCVFRAME = TIOCRCVFRAME;
++#endif
++#ifdef TIOCXMTFRAME
+ unsigned IOCTL_TIOCXMTFRAME = TIOCXMTFRAME;
++#endif
+ unsigned IOCTL_TIOCPTMGET = TIOCPTMGET;
+ unsigned IOCTL_TIOCGRANTPT = TIOCGRANTPT;
+ unsigned IOCTL_TIOCPTSNAME = TIOCPTSNAME;