compiler-rt-netbsd: Fix build after rebase

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Fix build after rebase
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Tue, 21 Aug 2018 22:02:45 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Wed Aug 22 00:02:45 2018 +0200
Changeset:	248ba5698a75edd2ef54fc8365f311a4ba48b082

Modified Files:
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
Added Files:
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
	compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk
Removed Files:
	compiler-rt-netbsd/patches/patch-cmake_Modules_CompilerRTUtils.cmake

Log Message:
compiler-rt-netbsd: Fix build after rebase

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=248ba5698a75edd2ef54fc8365f311a4ba48b082

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

diffstat:
 compiler-rt-netbsd/distinfo                        |  7 +++--
 .../patch-cmake_Modules_CompilerRTUtils.cmake      |  0
 ...mmon_sanitizer__interceptors__ioctl__netbsd.inc | 12 ++++++++
 ...__common_sanitizer__platform__limits__netbsd.cc | 15 +++++++--
 ...r__common_sanitizer__platform__limits__netbsd.h | 12 ++++++--
 .../patch-utils_generate__netbsd__ioctls.awk       | 36 ++++++++++++++++++++++
 6 files changed, 74 insertions(+), 8 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 95d0f44480..bd6fb5bc3d 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
 SHA1 (patch-CMakeLists.txt) = d266456097955589919b5163f6fe5f1cfd95eecd
-SHA1 (patch-cmake_Modules_CompilerRTUtils.cmake) = da39a3ee5e6b4b0d3255bfef95601890afd80709
 SHA1 (patch-cmake_Modules_HandleCompilerRT.cmake) = 2456af23f62cc919aba7358b8af25ef86cc64dc1
 SHA1 (patch-cmake_config-ix.cmake) = fc637abe72ed27d5baba1308087bb0372f8fbbe2
 SHA1 (patch-lib_asan_asan__posix.cc) = 0f596061c078eaab0b5b4b183550aa7820677f46
@@ -11,12 +10,13 @@ SHA1 (patch-lib_interception_interception.h) = a7f97b191769c846be27e17430bbe3943
 SHA1 (patch-lib_msan_msan__interceptors.cc) = bfb0d6ba97382a26d54141c3e4cc0c0f584178a1
 SHA1 (patch-lib_msan_msan__linux.cc) = dc3431b7606f3e1c106ffd2568ab4a6c77321731
 SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = f9dce4a714af9644b862c3d705646c4e52923825
+SHA1 (patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc) = 1c6e8c4a755af57d523d06b12f08a1946f1aef25
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9ffcb3ae5ccfcb99d842efe55f6d698cd2e02846
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 83636321cef6a17281a27e2ed3dd1b71e5429a6a
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = ac04d9b155c7281dde98741b7f79714e98c2bbc3
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = cdf1461c641ca6f9e13f3d3319170e4aad76e367
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = b15685e72af975a7e6ca300034193475fc02fa88
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = b818a42be1119ef41c45eb448749fd95b6ff7fd3
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = b52e02792201d54d1f9e9336a8cf74ff8c9eca68
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = e8a0d9389f3ddd41f911e00f8ff62e214441296d
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 95fef4690641063603db1b1dcb00c610948142f1
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = b2c0149501713bc16b657344b8b9a3a0ce48b107
 SHA1 (patch-lib_sanitizer__common_sanitizer__procmaps__bsd.cc) = 8b629840ff7f56c670d322a9dbbdf7e33ce90cb5
@@ -30,3 +30,4 @@ SHA1 (patch-test_fuzzer_NullDerefTest.cpp) = 80b63f1c77fef2747af03c3c09a8b805ed2
 SHA1 (patch-test_fuzzer_lit.cfg) = 98e8e0589d68bb17b1794634256ac03ddb9af293
 SHA1 (patch-test_lsan_lit.common.cfg) = b09b4ab3a97dc881b701a3583b0b126b8206cfe2
 SHA1 (patch-test_scudo_lit.cfg) = 35e4f0524a8fd26e90e5d968b73d75f277da3779
+SHA1 (patch-utils_generate__netbsd__ioctls.awk) = 56c92131aa95b64765af3e9b60fd7d7cc55facbc
diff --git a/compiler-rt-netbsd/patches/patch-cmake_Modules_CompilerRTUtils.cmake b/compiler-rt-netbsd/patches/patch-cmake_Modules_CompilerRTUtils.cmake
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
new file mode 100644
index 0000000000..d2a0759502
--- /dev/null
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__interceptors__ioctl__netbsd.inc
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc.orig	2018-08-21 21:25:40.000000000 +0000
++++ lib/sanitizer_common/sanitizer_interceptors_ioctl_netbsd.inc
+@@ -1095,7 +1095,6 @@ static void ioctl_table_fill() {
+   /* Entries from file: sys/power.h */
+   _(POWER_EVENT_RECVDICT, READWRITE, struct_plistref_sz);
+   _(POWER_IOC_GET_TYPE, WRITE, struct_power_type_sz);
+-  _(POWER_IOC_GET_TYPE_WITH_LOSSAGE, WRITE, sizeof(uptr));
+   /* Entries from file: sys/radioio.h */
+   _(RIOCGINFO, WRITE, struct_radio_info_sz);
+   _(RIOCSINFO, READWRITE, struct_radio_info_sz);
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
index 3438d3d990..a3663358f5 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-04-25 21:13:40.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-08-21 21:25:40.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
 @@ -15,9 +15,15 @@
  #include "sanitizer_platform.h"
@@ -91,7 +91,16 @@ $NetBSD$
  unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
  unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
  unsigned struct_timex_sz = sizeof(struct timex);
-@@ -2063,6 +2085,39 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
+@@ -1804,8 +1826,6 @@ unsigned IOCTL_MTIOCSLOCATE = MTIOCSLOCA
+ unsigned IOCTL_MTIOCHLOCATE = MTIOCHLOCATE;
+ unsigned IOCTL_POWER_EVENT_RECVDICT = POWER_EVENT_RECVDICT;
+ unsigned IOCTL_POWER_IOC_GET_TYPE = POWER_IOC_GET_TYPE;
+-unsigned IOCTL_POWER_IOC_GET_TYPE_WITH_LOSSAGE =
+-    POWER_IOC_GET_TYPE_WITH_LOSSAGE;
+ unsigned IOCTL_RIOCGINFO = RIOCGINFO;
+ unsigned IOCTL_RIOCSINFO = RIOCSINFO;
+ unsigned IOCTL_RIOCSSRCH = RIOCSSRCH;
+@@ -2063,6 +2083,39 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
  
  const int si_SEGV_MAPERR = SEGV_MAPERR;
  const int si_SEGV_ACCERR = SEGV_ACCERR;
@@ -131,7 +140,7 @@ $NetBSD$
  }  // namespace __sanitizer
  
  using namespace __sanitizer;
-@@ -2224,4 +2279,10 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
+@@ -2224,4 +2277,10 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
  CHECK_SIZE_AND_OFFSET(group, gr_gid);
  CHECK_SIZE_AND_OFFSET(group, gr_mem);
  
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
index cb3c949af6..28bd3cd409 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-04-25 21:13:40.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-08-21 21:25:38.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
 @@ -60,6 +60,15 @@ extern unsigned struct_timespec_sz;
  extern unsigned struct_sembuf_sz;
@@ -26,7 +26,15 @@ $NetBSD$
  struct __sanitizer_ptrace_io_desc {
    int piod_op;
    void *piod_offs;
-@@ -2194,6 +2204,80 @@ extern unsigned IOCTL_SNDCTL_DSP_SILENCE
+@@ -1936,7 +1946,6 @@ extern unsigned IOCTL_MTIOCSLOCATE;
+ extern unsigned IOCTL_MTIOCHLOCATE;
+ extern unsigned IOCTL_POWER_EVENT_RECVDICT;
+ extern unsigned IOCTL_POWER_IOC_GET_TYPE;
+-extern unsigned IOCTL_POWER_IOC_GET_TYPE_WITH_LOSSAGE;
+ extern unsigned IOCTL_RIOCGINFO;
+ extern unsigned IOCTL_RIOCSINFO;
+ extern unsigned IOCTL_RIOCSSRCH;
+@@ -2194,6 +2203,80 @@ extern unsigned IOCTL_SNDCTL_DSP_SILENCE
  
  extern const int si_SEGV_MAPERR;
  extern const int si_SEGV_ACCERR;
diff --git a/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk b/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk
new file mode 100644
index 0000000000..20b868d5eb
--- /dev/null
+++ b/compiler-rt-netbsd/patches/patch-utils_generate__netbsd__ioctls.awk
@@ -0,0 +1,36 @@
+$NetBSD$
+
+--- utils/generate_netbsd_ioctls.awk.orig	2018-08-21 21:25:37.000000000 +0000
++++ utils/generate_netbsd_ioctls.awk
+@@ -314,6 +314,7 @@ FNR == 1 {
+       $0 ~ /PRIQ_IF_DETACH/ ||
+       $0 ~ /PRIQ_ENABLE/ ||
+       $0 ~ /WFQ_IF_ATTACH/ ||
++      $0 ~ /POWER_IOC_GET_TYPE_WITH_LOSSAGE/ ||
+       $0 ~ /HFSC_DEL_FILTER/) {
+     # There are entries with duplicate codes.. disable the less used ones
+     next
+@@ -345,17 +346,12 @@ FNR == 1 {
+ 
+   # This !NONE check allows to skip some unparsable entries
+   if (ioctl_mode[ioctl_table_max] != "NONE") {
+-    # special cases first
+-    if ($0 ~ /POWER_IOC_GET_TYPE_WITH_LOSSAGE/) {
+-      ioctl_type[ioctl_table_max] = "sizeof(uptr)"
+-    } else {
+-      n = split($0, a, ",")
+-      if (n == 3) {
+-        gsub(/^[ ]+/, "", a[3])
+-        match(a[3], /[a-zA-Z0-9_* ]+/)
+-        type = get_type(substr(a[3], 0, RLENGTH))
+-        ioctl_type[ioctl_table_max] = type
+-      }
++    n = split($0, a, ",")
++    if (n == 3) {
++      gsub(/^[ ]+/, "", a[3])
++      match(a[3], /[a-zA-Z0-9_* ]+/)
++      type = get_type(substr(a[3], 0, RLENGTH))
++      ioctl_type[ioctl_table_max] = type
+     }
+   }
+
Prev by Date: compiler-rt-netbsd: Rebase to SVN r. 340168
Next by Date: compiler-rt-netbsd: Update TODO lists
Previous by Thread: compiler-rt-netbsd: Rebase to SVN r. 340168
Next by Thread: compiler-rt-netbsd: Update TODO lists
Indexes:
Home | Main Index | Thread Index | Old Index