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

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Rebase to SVN r. 347088
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Fri, 16 Nov 2018 20:23:55 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Nov 16 21:23:55 2018 +0100
Changeset:	e14c7288577cf467f3aa9473424c2acba987218a

Modified Files:
	compiler-rt-netbsd/Makefile
	compiler-rt-netbsd/distinfo
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
	compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__interceptors.h

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

Merged upstream:
[PATCH] D54530: Add new interceptor for mi_vector_hash(3)
[PATCH] D54611: Add new interceptor for getmntinfo(3) from NetBSD

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

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                        |  4 +-
 ...zer__common_sanitizer__common__interceptors.inc | 58 ++++------------------
 ...zer__common_sanitizer__platform__interceptors.h | 10 ++--
 4 files changed, 17 insertions(+), 57 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 98a29e6323..d7a44f1eb3 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=	346579
+SVN_REVISION.compiler-rt=	347088
 
 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 a308188236..5406c68a9d 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -3,9 +3,9 @@ $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_msan_msan__linux.cc) = b5df0f4f5930d7c1681b1ad867c893d01d6e5cf7
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 9b231748b4e1f97dc9b96d5f9dd4106fee4883cb
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 63af4752c6696475ada66c9c40c425a2a8fbeee3
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 845a516a43bbaa82b2522c395965fd8f64e09bdb
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 7c08be2280466995e8ba8ff42e804c11ff2f4b82
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 71136713c3a88b5d21bbf601adce810223915a14
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 9e4e6625f756f248650f1f17d30b3e0bd6b7559e
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = eb112d60396d34a25ed4d150bf5282bc4265f738
 SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 7c16ba866352f3a695a544094ca46f0f561c43c5
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 02d58631b8..a087e95f96 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-11-07 20:58:31.924162314 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-11-16 20:22:47.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -77,6 +77,11 @@
  #define ctime __ctime50
@@ -12,18 +12,17 @@ $NetBSD$
 +#define fts_read __fts_read60
 +#define fts_set __fts_set60
  #define getitimer __getitimer50
+ #define getmntinfo __getmntinfo13
  #define getpwent __getpwent50
- #define getpwnam __getpwnam50
-@@ -111,6 +116,8 @@
+@@ -112,6 +117,7 @@
  #define times __times13
  #define wait3 __wait350
  #define wait4 __wait450
-+#define getmntinfo __getmntinfo13
 +#define mount __mount50
  extern const unsigned short *_ctype_tab_;
  extern const short *_toupper_tab_;
  extern const short *_tolower_tab_;
-@@ -3077,17 +3084,28 @@ INTERCEPTOR(int, sendmmsg, int fd, struc
+@@ -3078,17 +3084,28 @@ INTERCEPTOR(int, sendmmsg, int fd, struc
  #endif
  
  #if SANITIZER_INTERCEPT_GETPEERNAME
@@ -61,7 +60,7 @@ $NetBSD$
    return res;
  }
  #define INIT_GETPEERNAME COMMON_INTERCEPT_FUNCTION(getpeername);
-@@ -4257,7 +4275,7 @@ INTERCEPTOR(int, fstatfs64, int fd, void
+@@ -4258,7 +4275,7 @@ INTERCEPTOR(int, fstatfs64, int fd, void
  #endif
  
  #if SANITIZER_INTERCEPT_STATVFS
@@ -70,8 +69,8 @@ $NetBSD$
    void *ctx;
    COMMON_INTERCEPTOR_ENTER(ctx, statvfs, path, buf);
    if (path) COMMON_INTERCEPTOR_READ_RANGE(ctx, path, REAL(strlen)(path) + 1);
-@@ -7264,6 +7282,1588 @@ INTERCEPTOR(struct __sanitizer_netent *,
- #define INIT_NETENT
+@@ -7298,6 +7315,1553 @@ INTERCEPTOR(void, mi_vector_hash, const 
+ #define INIT_MI_VECTOR_HASH
  #endif
  
 +#if SANITIZER_INTERCEPT_SYSCTL
@@ -714,26 +713,7 @@ $NetBSD$
 +#define INIT_VIS
 +#endif
 +
-+#if SANITIZER_INTERCEPT_GETMNTINFO
-+INTERCEPTOR(int, getmntinfo, void **mntbufp, int flags) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getmntinfo, mntbufp, flags);
-+  int cnt = REAL(getmntinfo)(mntbufp, flags);
-+  if (cnt > 0 && mntbufp) {
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, mntbufp, sizeof(void *));
-+    if (*mntbufp)
-+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *mntbufp, cnt * struct_statvfs_sz);
-+  }
-+  return cnt;
-+}
-+
-+#define INIT_GETMNTINFO COMMON_INTERCEPT_FUNCTION(getmntinfo)
-+#else
-+#define INIT_GETMNTINFO
-+#endif
-+
 +#if SANITIZER_INTERCEPT_SHA1
-+
 +INTERCEPTOR(void, SHA1Init, void *context) {
 +  void *ctx;
 +  COMMON_INTERCEPTOR_ENTER(ctx, SHA1Init, context);
@@ -1639,36 +1619,19 @@ $NetBSD$
 +#else
 +#define INIT_SETVBUF
 +#endif
-+
-+#if SANITIZER_INTERCEPT_MI_VECTOR_HASH
-+INTERCEPTOR(void, mi_vector_hash, const void *key, SIZE_T len, u32 seed,
-+            u32 hashes[3]) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, mi_vector_hash, key, len, seed, hashes);
-+  if (key)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, key, len);
-+  REAL(mi_vector_hash)(key, len, seed, hashes);
-+  if (hashes)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, hashes, sizeof(hashes[0]) * 3);
-+}
-+#define INIT_MI_VECTOR_HASH COMMON_INTERCEPT_FUNCTION(mi_vector_hash)
-+#else
-+#define INIT_MI_VECTOR_HASH
-+#endif
 +
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7517,6 +9117,29 @@ static void InitializeCommonInterceptors
-   INIT_TTYENT;
-   INIT_PROTOENT;
+@@ -7553,6 +9117,27 @@ static void InitializeCommonInterceptors
    INIT_NETENT;
+   INIT_GETMNTINFO;
+   INIT_MI_VECTOR_HASH;
 +  INIT_SYSCTL;
 +  INIT_FTS;
 +  INIT_REGEX;
 +  INIT_STRTONUM;
 +  INIT_VIS;
-+  INIT_GETMNTINFO;
 +  INIT_SHA1;
 +  INIT_MD2;
 +  INIT_MD4;
@@ -1685,7 +1648,6 @@ $NetBSD$
 +  INIT_SHA2;
 +  INIT_GETCHAR;
 +  INIT_SETVBUF;
-+  INIT_MI_VECTOR_HASH;
  
    INIT___PRINTF_CHK;
  }
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 a1f8c7fdc0..087d2d04d5 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,17 +1,16 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-11-07 20:58:31.925226974 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-11-16 20:22:47.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -517,4 +517,28 @@
- #define SANITIZER_INTERCEPT_PROTOENT SI_NETBSD
- #define SANITIZER_INTERCEPT_NETENT SI_NETBSD
+@@ -519,4 +519,26 @@
+ #define SANITIZER_INTERCEPT_GETMNTINFO SI_NETBSD
+ #define SANITIZER_INTERCEPT_MI_VECTOR_HASH SI_NETBSD
  
 +#define SANITIZER_INTERCEPT_SYSCTL SI_NETBSD
 +#define SANITIZER_INTERCEPT_FTS SI_NETBSD
 +#define SANITIZER_INTERCEPT_REGEX SI_NETBSD
 +#define SANITIZER_INTERCEPT_STRTONUM SI_NETBSD
 +#define SANITIZER_INTERCEPT_VIS SI_NETBSD
-+#define SANITIZER_INTERCEPT_GETMNTINFO SI_NETBSD
 +#define SANITIZER_INTERCEPT_SHA1 SI_NETBSD
 +#define SANITIZER_INTERCEPT_MD2 SI_NETBSD
 +#define SANITIZER_INTERCEPT_MD4 SI_NETBSD
@@ -28,6 +27,5 @@ $NetBSD$
 +#define SANITIZER_INTERCEPT_SHA2 SI_NETBSD
 +#define SANITIZER_INTERCEPT_GETCHAR SI_POSIX
 +#define SANITIZER_INTERCEPT_SETVBUF SI_POSIX
-+#define SANITIZER_INTERCEPT_MI_VECTOR_HASH SI_NETBSD
 +
  #endif  // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H
Prev by Date: wyeb-git: partial patch merged upstream
Next by Date: gcr: Update wip/gcr to 3.28.0
Previous by Thread: wyeb-git: partial patch merged upstream
Next by Thread: gcr: Update wip/gcr to 3.28.0
Indexes:
Home | Main Index | Thread Index | Old Index