compiler-rt-netbsd: Rebase to SVN r. 348663

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Rebase to SVN r. 348663
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Fri, 07 Dec 2018 22:44:29 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Dec 7 23:44:29 2018 +0100
Changeset:	bd647340c810fe6930f89986142faf8ab9174e31

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
	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
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h

Log Message:
compiler-rt-netbsd:  Rebase to SVN r. 348663

Merged upstream:
[compiler-rt] r348654 - Add a new interceptor for fparseln(3) from NetBSD
[compiler-rt] r348656 - Add a new interceptors for statvfs1(2) and fstatvfs1(2) from NetBSD
[compiler-rt] r348663 - Add interceptors for the strtoi(3)/strtou(3) from NetBSD
D54527 Add new interceptor for strtonum(3)

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

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

diffstat:
 compiler-rt-netbsd/Makefile                        |   2 +-
 compiler-rt-netbsd/distinfo                        |  14 +--
 .../patches/patch-lib_fuzzer_tests_CMakeLists.txt  |   4 +-
 ...zer__common_sanitizer__common__interceptors.inc | 124 +--------------------
 ...zer__common_sanitizer__platform__interceptors.h |   8 +-
 ...__common_sanitizer__platform__limits__netbsd.cc |   2 +-
 ...r__common_sanitizer__platform__limits__netbsd.h |   4 +-
 ...r__common_sanitizer__platform__limits__posix.cc |   4 +-
 ...er__common_sanitizer__platform__limits__posix.h |   4 +-
 9 files changed, 27 insertions(+), 139 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 87bb90b355..ef38e24206 100644
--- a/compiler-rt-netbsd/Makefile
+++ b/compiler-rt-netbsd/Makefile
@@ -5,7 +5,7 @@ CATEGORIES=	lang devel
 
 SVN_REPOSITORIES=		compiler-rt
 SVN_REPO.compiler-rt=		http://llvm.org/svn/llvm-project/compiler-rt/trunk
-SVN_REVISION.compiler-rt=	348378
+SVN_REVISION.compiler-rt=	348663
 
 MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	http://compiler-rt.llvm.org/
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index ede52a16b8..4a07fe67bb 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -1,12 +1,12 @@
 $NetBSD: distinfo,v 1.35 2015/09/11 01:21:57 tnn Exp $
 
 SHA1 (patch-lib_asan_asan__posix.cc) = be7e47c252e30184639f7ed1c98c75a8667fd261
-SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 2a81399dddc19de5bd51e77ef52b8b5cd61b7dc4
+SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 3b426037456d89c0cdbfbedee47cdd4f31ec975d
 SHA1 (patch-lib_msan_msan__linux.cc) = b5df0f4f5930d7c1681b1ad867c893d01d6e5cf7
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = e7437622dcfc0f20e4a68eefad2a7ab2cb2e91cd
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 30efde105e5fdea6e09bbc34eb4e307008ce819d
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 9420e76fdf63ac419bde42b4ad80ab578a39b9e0
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 8bd78ea09db18d51829d9b58b58bdef7b7b261e6
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = ff76b8b19863cdb28f243580ece33db5abd03a80
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 21b7becbd2289e9b29d3bae94b8dd83e828965fb
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 5f351ef38b246d4546606af932ef3b9e28dafb41
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 10d0b67ff90cc05e880c9599af191734195a6bc4
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = e2bdff5f6e25ec1d8c0f71c0dfcf0b1da2fe3116
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 510a77801a9d68b19344a8665e5345f4c2e2649e
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 18fa37323f6e7debf70a999260a014bac78c30ad
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 09cda70bafbb344ac9b17afcca3159a99fddf1f8
 SHA1 (patch-lib_xray_tests_CMakeLists.txt) = a5bee64ac6e4c0ff43aad200072d15c128ca03ad
diff --git a/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
index 3e548ef2af..13e7293b9c 100644
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/fuzzer/tests/CMakeLists.txt.orig	2018-11-04 15:43:06.000000000 +0000
+--- lib/fuzzer/tests/CMakeLists.txt.orig	2018-12-07 22:43:41.824209454 +0000
 +++ lib/fuzzer/tests/CMakeLists.txt
-@@ -13,6 +13,9 @@ add_custom_target(FuzzerUnitTests)
+@@ -15,6 +15,9 @@ add_custom_target(FuzzerUnitTests)
  set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
  
  set(LIBFUZZER_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_LINK_FLAGS})
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
index 7af1d79df3..baedfda910 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-12-05 15:17:53.888571701 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-12-07 22:43:42.617621156 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -117,6 +117,7 @@
  #define times __times13
@@ -48,72 +48,10 @@ $NetBSD$
    return res;
  }
  #define INIT_GETPEERNAME COMMON_INTERCEPT_FUNCTION(getpeername);
-@@ -7724,6 +7736,1160 @@ INTERCEPTOR(int, modctl, int operation, 
- #define INIT_MODCTL
+@@ -7840,6 +7852,1051 @@ INTERCEPTOR(UINTMAX_T, strtou, const cha
+ #define INIT_STRTOI
  #endif
  
-+#if SANITIZER_INTERCEPT_STRTONUM
-+INTERCEPTOR(long long, strtonum, const char *nptr, long long minval,
-+            long long maxval, const char **errstr) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, strtonum, nptr, minval, maxval, errstr);
-+
-+  if (nptr)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, nptr, REAL(strlen)(nptr) + 1);
-+  long long ret = REAL(strtonum)(nptr, minval, maxval, errstr);
-+  if (errstr) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, errstr, sizeof(const char *));
-+    if (*errstr)
-+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *errstr, REAL(strlen)(*errstr) + 1);
-+  }
-+  return ret;
-+}
-+
-+INTERCEPTOR(INTMAX_T, strtoi, const char *nptr, char **endptr, int base,
-+            INTMAX_T low, INTMAX_T high, int *rstatus) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, strtoi, nptr, endptr, base, low, high, rstatus);
-+
-+  if (nptr)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, nptr, REAL(strlen)(nptr) + 1);
-+  INTMAX_T ret = REAL(strtoi)(nptr, endptr, base, low, high, rstatus);
-+  if (endptr) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, endptr, sizeof(char *));
-+    if (*endptr)
-+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *endptr, REAL(strlen)(*endptr) + 1);
-+  }
-+  if (rstatus)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, rstatus, sizeof(int));
-+  return ret;
-+}
-+
-+INTERCEPTOR(UINTMAX_T, strtou, const char *nptr, char **endptr, int base,
-+            UINTMAX_T low, UINTMAX_T high, int *rstatus) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, strtou, nptr, endptr, base, low, high, rstatus);
-+
-+  if (nptr)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, nptr, REAL(strlen)(nptr) + 1);
-+  UINTMAX_T ret = REAL(strtou)(nptr, endptr, base, low, high, rstatus);
-+  if (endptr) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, endptr, sizeof(char *));
-+    if (*endptr)
-+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *endptr, REAL(strlen)(*endptr) + 1);
-+  }
-+  if (rstatus)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, rstatus, sizeof(int));
-+  return ret;
-+}
-+
-+#define INIT_STRTONUM                                                          \
-+  COMMON_INTERCEPT_FUNCTION(strtonum);                                         \
-+  COMMON_INTERCEPT_FUNCTION(strtoi);                                           \
-+  COMMON_INTERCEPT_FUNCTION(strtou)
-+
-+#else
-+#define INIT_STRTONUM
-+#endif
-+
 +#if SANITIZER_INTERCEPT_VIS
 +INTERCEPTOR(char *, vis, char *dst, int c, int flag, int nextc) {
 +  void *ctx;
@@ -709,54 +647,7 @@ $NetBSD$
 +#define INIT_MD5
 +#endif
 +
-+#if SANITIZER_INTERCEPT_FPARSELN
-+INTERCEPTOR(char *, fparseln, __sanitizer_FILE *stream, SIZE_T *len,
-+            SIZE_T *lineno, const char delim[3], int flags) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, fparseln, stream, len, lineno, delim, flags);
-+  if (len)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, len, sizeof(*len));
-+  if (lineno)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, lineno, sizeof(*lineno));
-+  if (delim)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, delim, sizeof(delim[0]) * 3);
-+  char *ret = REAL(fparseln)(stream, len, lineno, delim, flags);
-+  if (ret)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, REAL(strlen)(ret) + 1);
-+  return ret;
-+}
-+#define INIT_FPARSELN COMMON_INTERCEPT_FUNCTION(fparseln)
-+#else
-+#define INIT_FPARSELN
-+#endif
-+
-+#if SANITIZER_INTERCEPT_STATVFS1
-+INTERCEPTOR(int, statvfs1, const char *path, void *buf, int flags) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, statvfs1, path, buf, flags);
-+  if (path) COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1);
-+
-+  int res = REAL(statvfs1)(path, buf, flags);
-+  if (!res) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, struct_statvfs_sz);
-+  return res;
-+}
-+INTERCEPTOR(int, fstatvfs1, int fd, void *buf, int flags) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, fstatvfs1, fd, buf, flags);
-+
-+  int res = REAL(fstatvfs1)(fd, buf, flags);
-+  if (!res) COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, struct_statvfs_sz);
-+  return res;
-+}
-+#define INIT_STATVFS1                  \
-+  COMMON_INTERCEPT_FUNCTION(statvfs1);  \
-+  COMMON_INTERCEPT_FUNCTION(fstatvfs1);
-+#else
-+#define INIT_STATVFS1
-+#endif
-+
 +#if SANITIZER_INTERCEPT_NETBSD_MOUNT
-+
 +INTERCEPTOR(int, mount, const char *type, const char *dir, int flags,
 +            void *data, SIZE_T data_len) {
 +  void *ctx;
@@ -1209,18 +1100,15 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7989,5 +9155,20 @@ static void InitializeCommonInterceptors
-   INIT_NL_LANGINFO;
-   INIT_MODCTL;
+@@ -8109,5 +9166,17 @@ static void InitializeCommonInterceptors
+   INIT_STATVFS1;
+   INIT_STRTOI;
  
-+  INIT_STRTONUM;
 +  INIT_VIS;
 +  INIT_SHA1;
 +  INIT_MD2;
 +  INIT_MD4;
 +  INIT_MD5;
-+  INIT_FPARSELN;
-+  INIT_STATVFS1;
 +  INIT_NETBSD_MOUNT;
 +  INIT_FSEEK;
 +  INIT_CDBR;
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
index 995b5c0c4f..aa5bc637f6 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h
@@ -1,10 +1,10 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-12-05 15:17:53.889092850 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-12-07 22:43:42.618116216 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -529,4 +529,20 @@
- #define SANITIZER_INTERCEPT_NL_LANGINFO SI_NETBSD
- #define SANITIZER_INTERCEPT_MODCTL SI_NETBSD
+@@ -534,4 +534,20 @@
+ #define SANITIZER_INTERCEPT_STATVFS1 SI_NETBSD
+ #define SANITIZER_INTERCEPT_STRTOI SI_NETBSD
  
 +
 +#define SANITIZER_INTERCEPT_STRTONUM SI_NETBSD
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 6d31302112..843c96e458 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-12-05 15:17:53.889846309 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-12-05 15:17:53.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
 @@ -2101,6 +2101,35 @@ const int modctl_load = MODCTL_LOAD;
  const int modctl_unload = MODCTL_UNLOAD;
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 b4cdb27f2b..313695c5f3 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,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-12-05 15:17:53.889431418 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-12-07 22:43:42.615556581 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
-@@ -2223,6 +2223,68 @@ extern unsigned IOCTL_SNDCTL_DSP_SILENCE
+@@ -2225,6 +2225,68 @@ 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-lib_sanitizer__common_sanitizer__platform__limits__posix.cc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
index 5559814a13..6f5e9f5902 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2018-11-30 20:02:43.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2018-12-07 22:43:42.616492532 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_posix.cc
-@@ -948,6 +948,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+@@ -912,6 +912,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
  
    const int si_SEGV_MAPERR = SEGV_MAPERR;
    const int si_SEGV_ACCERR = SEGV_ACCERR;
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
index 2b300f9c5e..b48551ad1a 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2018-11-30 20:02:43.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_posix.h.orig	2018-12-07 22:43:42.614681158 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_posix.h
-@@ -1506,6 +1506,7 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1426,6 +1426,7 @@ struct __sanitizer_cookie_io_functions_t
  
    extern const int si_SEGV_MAPERR;
    extern const int si_SEGV_ACCERR;
Prev by Date: libcanlock: remove, used for updating news/libcanlock
Next by Date: compiler-rt-netbsd: Rebase to SVN r. 348679
Previous by Thread: libcanlock: remove, used for updating news/libcanlock
Next by Thread: compiler-rt-netbsd: Rebase to SVN r. 348679
Indexes:
Home | Main Index | Thread Index | Old Index