pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

compiler-rt-netbsd: Remove more local code



Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Fri Feb 2 20:36:34 2018 +0100
Changeset:	8cac276d4fe4aaf36bf1466be410e1416b070eb0

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

Log Message:
compiler-rt-netbsd: Remove more local code

devname(3) and devname_r(3) has been already merged upstream.

Sponsored by <The NetBSD Foundation>

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

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

diffstat:
 compiler-rt-netbsd/distinfo                        |  2 +-
 ...zer__common_sanitizer__common__interceptors.inc | 36 +++-------------------
 2 files changed, 5 insertions(+), 33 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 7f906a8d24..2080329242 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -10,7 +10,7 @@ SHA1 (patch-lib_hwasan_hwasan__interceptors.cc) = 27038b764c7d3d4f1885d85dc6d76c
 SHA1 (patch-lib_msan_msan__interceptors.cc) = f6388495e44c2ddf2cdfa4cf59e9da0e5e60c2d7
 SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
 SHA1 (patch-lib_sanitizer__common_CMakeLists.txt) = 2a0a50c9fccf4be9328aa5ecd7c55adace841fe8
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 1e17b58f002ab896dbdfc63ed1d54bd55ec21af7
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = ab1fcaf0e5ff7122bb6db43f18c7a503b3e9f823
 SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors__ioctl.inc) = a4b00d19eb5528a320255e8b0dcbaf07f1f8aa16
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = a6ce44f3cfd42640c6fbe514814e8e485fac1dfc
 SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = a9d86ca4c434faca53db8ccb81f96a44ca309a0f
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 f98e696e28..06a80c3e69 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-02-02 19:10:23.884232247 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-02-02 19:10:23.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -36,6 +36,7 @@
  //   COMMON_INTERCEPTOR_MEMCPY_IMPL
@@ -171,7 +171,7 @@ $NetBSD$
  #if SANITIZER_INTERCEPT___XSTAT
  INTERCEPTOR(int, __xstat, int version, const char *path, void *buf) {
    void *ctx;
-@@ -6788,6 +6836,897 @@ INTERCEPTOR(int, devname_r, u64 dev, u32
+@@ -6788,6 +6836,869 @@ INTERCEPTOR(int, devname_r, u64 dev, u32
  #define INIT_DEVNAME_R
  #endif
  
@@ -497,34 +497,6 @@ $NetBSD$
 +#define INIT_KVM
 +#endif
 +
-+#if SANITIZER_INTERCEPT_DEVNAME
-+INTERCEPTOR(char *, devname, u64 dev, u32 type) {
-+  void *ctx;
-+  char *name;
-+  COMMON_INTERCEPTOR_ENTER(ctx, devname, dev, type);
-+  name = REAL(devname)(dev, type);
-+  if (name)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, name, REAL(strlen)(name) + 1);
-+  return name;
-+}
-+
-+INTERCEPTOR(int, devname_r, u64 dev, u32 type, const char *path, uptr len) {
-+  void *ctx;
-+  int res;
-+  COMMON_INTERCEPTOR_ENTER(ctx, devname_r, dev, type, path, len);
-+  res = REAL(devname_r)(dev, type, path, len);
-+  if (!res)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, path, REAL(strlen)(path) + 1);
-+  return res;
-+}
-+
-+#define INIT_DEVNAME \
-+  COMMON_INTERCEPT_FUNCTION(devname); \
-+  COMMON_INTERCEPT_FUNCTION(devname_r)
-+#else
-+#define INIT_DEVNAME
-+#endif
-+
 +#if SANITIZER_INTERCEPT_SYSCTL
 +INTERCEPTOR(int, sysctl, int *name, unsigned int namelen, void *oldp,
 +            SIZE_T *oldlenp, void *newp, SIZE_T newlen) {
@@ -1069,7 +1041,7 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -6990,6 +7929,7 @@ static void InitializeCommonInterceptors
+@@ -6990,6 +7901,7 @@ static void InitializeCommonInterceptors
    INIT_SEND_SENDTO;
    INIT_STAT;
    INIT_EVENTFD_READ_WRITE;
@@ -1077,7 +1049,7 @@ $NetBSD$
    INIT___XSTAT;
    INIT___XSTAT64;
    INIT___LXSTAT;
-@@ -7015,6 +7955,16 @@ static void InitializeCommonInterceptors
+@@ -7015,6 +7927,16 @@ static void InitializeCommonInterceptors
    INIT_STRLCPY;
    INIT_DEVNAME;
    INIT_DEVNAME_R;


Home | Main Index | Thread Index | Old Index