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

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

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
	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
	compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt

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

Merged upstream:
[compiler-rt] r348027 - Add a new interceptor for getvfsstat(2) from NetBSD

Try to apply a xray patch, fix applied upstream to link with libterminfo.
Patch for this by mgorny@.

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

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 ++++++------
 ...zer__common_sanitizer__common__interceptors.inc | 25 +++++-----------------
 ...zer__common_sanitizer__platform__interceptors.h |  7 +++---
 ...__common_sanitizer__platform__limits__netbsd.cc |  6 +++---
 ...r__common_sanitizer__platform__limits__netbsd.h |  4 ++--
 ...r__common_sanitizer__platform__limits__posix.cc |  4 ++--
 ...er__common_sanitizer__platform__limits__posix.h |  4 ++--
 .../patches/patch-lib_xray_tests_CMakeLists.txt    |  2 +-
 9 files changed, 26 insertions(+), 42 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 5faf9b3671..07ff3524f6 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=	347270
+SVN_REVISION.compiler-rt=	348027
 
 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 5860ddf969..dd5b073a60 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -3,11 +3,11 @@ $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) = 4e4585484684b1bb70938a0c4dfb4c640718534b
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 934f7318250490286f397b370c830f016a9cab7c
 SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 845a516a43bbaa82b2522c395965fd8f64e09bdb
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 6f76bd3bc938f130940ab6ef52d9bec8891745ce
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 5175c4eee720a130277cc59e4111fb10e3516ca5
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 49636e7e44aa1f05d73a77b4781e52e6567387a8
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 7c16ba866352f3a695a544094ca46f0f561c43c5
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 9f535e84c3e1ab5704b11e388ac240439a9900d6
-SHA1 (patch-lib_xray_tests_CMakeLists.txt) = 3e36be790ac2e03a6873d502486f2d4e21a4a1a0
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 347271ac1494ee6b85044de237f10915c6493d05
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 1297b65dcc640313fade4b1783e98422d7e017d5
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 69190e87731a0cec10b955be9cc3e07a378ecf52
+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_xray_tests_CMakeLists.txt) = a5bee64ac6e4c0ff43aad200072d15c128ca03ad
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 a0db9d7ac0..e9549aafe2 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-19 23:14:50.000000000 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-11-30 20:02:43.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
 @@ -77,6 +77,11 @@
  #define ctime __ctime50
@@ -69,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);
-@@ -7313,6 +7330,1517 @@ INTERCEPTOR(int, setvbuf, __sanitizer_FI
- #define INIT_SETVBUF
+@@ -7362,6 +7379,1503 @@ INTERCEPTOR(int, getvfsstat, void *buf, 
+ #define INIT_GETVFSSTAT
  #endif
  
 +#if SANITIZER_INTERCEPT_SYSCTL
@@ -1013,20 +1013,6 @@ $NetBSD$
 +#define INIT_MD5
 +#endif
 +
-+#if SANITIZER_INTERCEPT_GETVFSSTAT
-+INTERCEPTOR(int, getvfsstat, void *buf, SIZE_T bufsize, int flags) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, getvfsstat, buf, bufsize, flags);
-+  int ret = REAL(getvfsstat)(buf, bufsize, flags);
-+  if (buf && ret > 0)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, ret * struct_statvfs_sz);
-+  return ret;
-+}
-+#define INIT_GETVFSSTAT COMMON_INTERCEPT_FUNCTION(getvfsstat)
-+#else
-+#define INIT_GETVFSSTAT
-+#endif
-+
 +#if SANITIZER_INTERCEPT_NL_LANGINFO
 +INTERCEPTOR(char *, nl_langinfo, long item) {
 +  void *ctx;
@@ -1587,10 +1573,10 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7569,6 +9097,26 @@ static void InitializeCommonInterceptors
-   INIT_GETMNTINFO;
+@@ -7619,6 +9133,25 @@ static void InitializeCommonInterceptors
    INIT_MI_VECTOR_HASH;
    INIT_SETVBUF;
+   INIT_GETVFSSTAT;
 +  INIT_SYSCTL;
 +  INIT_FTS;
 +  INIT_REGEX;
@@ -1600,7 +1586,6 @@ $NetBSD$
 +  INIT_MD2;
 +  INIT_MD4;
 +  INIT_MD5;
-+  INIT_GETVFSSTAT;
 +  INIT_NL_LANGINFO;
 +  INIT_FPARSELN;
 +  INIT_MODCTL;
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 0b6ed37f7e..88c1025274 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-11-19 23:14:50.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-11-30 20:02:43.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -520,4 +520,25 @@
- #define SANITIZER_INTERCEPT_GETMNTINFO SI_NETBSD
+@@ -522,4 +522,24 @@
  #define SANITIZER_INTERCEPT_MI_VECTOR_HASH SI_NETBSD
+ #define SANITIZER_INTERCEPT_GETVFSSTAT SI_NETBSD
  
 +#define SANITIZER_INTERCEPT_SYSCTL SI_NETBSD
 +#define SANITIZER_INTERCEPT_FTS SI_NETBSD
@@ -15,7 +15,6 @@ $NetBSD$
 +#define SANITIZER_INTERCEPT_MD2 SI_NETBSD
 +#define SANITIZER_INTERCEPT_MD4 SI_NETBSD
 +#define SANITIZER_INTERCEPT_MD5 SI_NETBSD
-+#define SANITIZER_INTERCEPT_GETVFSSTAT SI_NETBSD
 +#define SANITIZER_INTERCEPT_NL_LANGINFO SI_POSIX
 +#define SANITIZER_INTERCEPT_FPARSELN SI_POSIX
 +#define SANITIZER_INTERCEPT_MODCTL 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 d57a962d4c..fc139f8c0d 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-10-31 22:51:05.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-11-30 20:02:43.000000000 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
 @@ -253,6 +253,10 @@ unsigned struct_rlimit_sz = sizeof(struc
  unsigned struct_timespec_sz = sizeof(struct timespec);
@@ -13,7 +13,7 @@ $NetBSD$
  unsigned struct_utimbuf_sz = sizeof(struct utimbuf);
  unsigned struct_itimerspec_sz = sizeof(struct itimerspec);
  unsigned struct_timex_sz = sizeof(struct timex);
-@@ -2090,6 +2094,38 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
+@@ -2092,6 +2096,38 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
  
  const int si_SEGV_MAPERR = SEGV_MAPERR;
  const int si_SEGV_ACCERR = SEGV_ACCERR;
@@ -52,7 +52,7 @@ $NetBSD$
  }  // namespace __sanitizer
  
  using namespace __sanitizer;
-@@ -2251,4 +2287,10 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
+@@ -2253,4 +2289,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 9705468d7e..2ce07e9b63 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-10-31 22:51:05.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-11-30 20:02:43.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,7 @@ $NetBSD$
  struct __sanitizer_ptrace_io_desc {
    int piod_op;
    void *piod_offs;
-@@ -2200,6 +2210,78 @@ extern unsigned IOCTL_SNDCTL_DSP_SILENCE
+@@ -2202,6 +2212,78 @@ 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 13e934cb79..5559814a13 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-09-26 10:51:26.000000000 +0000
+--- 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
-@@ -945,6 +945,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
+@@ -948,6 +948,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 f1d3e332ff..2b300f9c5e 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-08-21 21:25:39.000000000 +0000
+--- 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
-@@ -1504,6 +1504,7 @@ struct __sanitizer_cookie_io_functions_t
+@@ -1506,6 +1506,7 @@ struct __sanitizer_cookie_io_functions_t
  
    extern const int si_SEGV_MAPERR;
    extern const int si_SEGV_ACCERR;
diff --git a/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt b/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
index 867c128410..68bbbd58f1 100644
--- a/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_xray_tests_CMakeLists.txt
@@ -6,7 +6,7 @@ $NetBSD$
      list(APPEND XRAY_UNITTEST_LINK_FLAGS -lLLVMXRay -lLLVMSupport -lLLVMTestingSupport)
    endif()
  
-+  list(APPEND XRAY_UNITTEST_LINK_FLAGS -lterminfo -lexecinfo -lLLVMDemangle)
++  list(APPEND XRAY_UNITTEST_LINK_FLAGS -lexecinfo -lLLVMDemangle)
    append_list_if(COMPILER_RT_HAS_LIBM -lm XRAY_UNITTEST_LINK_FLAGS)
    append_list_if(COMPILER_RT_HAS_LIBRT -lrt XRAY_UNITTEST_LINK_FLAGS)
    append_list_if(COMPILER_RT_HAS_LIBDL -ldl XRAY_UNITTEST_LINK_FLAGS)
Prev by Date: mackerel-agent-plugin: update to v0.53.0
Next by Date: dmenu-git: Import dmenu-4.8 as wip/dmenu-git
Previous by Thread: mackerel-agent-plugin: update to v0.53.0
Next by Thread: dmenu-git: Import dmenu-4.8 as wip/dmenu-git
Indexes:
Home | Main Index | Thread Index | Old Index