pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compiler-rt-netbsd: Rebase to SVN r. 347270
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Tue Nov 20 00:29:04 2018 +0100
Changeset: e2d02c128008e062a620bda2f5ea161dcd396071
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
Log Message:
compiler-rt-netbsd: Rebase to SVN r. 347270
Merged upstream:
[compiler-rt] r347270 - Add interceptor for the setvbuf(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=e2d02c128008e062a620bda2f5ea161dcd396071
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 | 8 ++--
...zer__common_sanitizer__common__interceptors.inc | 47 +++-------------------
...zer__common_sanitizer__platform__interceptors.h | 5 +--
...__common_sanitizer__platform__limits__netbsd.cc | 5 +--
...r__common_sanitizer__platform__limits__netbsd.h | 4 +-
6 files changed, 15 insertions(+), 56 deletions(-)
diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index d7a44f1eb3..5faf9b3671 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= 347088
+SVN_REVISION.compiler-rt= 347270
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 5406c68a9d..5860ddf969 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) = 63af4752c6696475ada66c9c40c425a2a8fbeee3
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 4e4585484684b1bb70938a0c4dfb4c640718534b
SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 845a516a43bbaa82b2522c395965fd8f64e09bdb
-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__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
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 a087e95f96..a0db9d7ac0 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-16 20:22:47.000000000 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig 2018-11-19 23:14:50.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);
-@@ -7298,6 +7315,1553 @@ INTERCEPTOR(void, mi_vector_hash, const
- #define INIT_MI_VECTOR_HASH
+@@ -7313,6 +7330,1517 @@ INTERCEPTOR(int, setvbuf, __sanitizer_FI
+ #define INIT_SETVBUF
#endif
+#if SANITIZER_INTERCEPT_SYSCTL
@@ -1583,50 +1583,14 @@ $NetBSD$
+#else
+#define INIT_GETCHAR
+#endif
-+
-+#if SANITIZER_INTERCEPT_SETVBUF
-+
-+INTERCEPTOR(void, setbuf, __sanitizer_FILE *stream, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, setbuf, stream, buf);
-+ REAL(setbuf)(stream, buf);
-+ if (buf)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, buf, setvbuf_bufsiz);
-+}
-+
-+INTERCEPTOR(int, setvbuf, __sanitizer_FILE *stream, char *buf, int mode,
-+ SIZE_T size) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, setvbuf, stream, buf, mode, size);
-+ int ret = REAL(setvbuf)(stream, buf, mode, size);
-+ if (buf)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, size);
-+ return ret;
-+}
-+
-+INTERCEPTOR(void, setbuffer, __sanitizer_FILE *stream, char *buf, SIZE_T size) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, setbuffer, stream, buf, size);
-+ REAL(setbuffer)(stream, buf, size);
-+ if (buf)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, buf, size);
-+}
-+
-+#define INIT_SETVBUF \
-+ COMMON_INTERCEPT_FUNCTION(setbuf); \
-+ COMMON_INTERCEPT_FUNCTION(setbuffer); \
-+ COMMON_INTERCEPT_FUNCTION(setvbuf)
-+#else
-+#define INIT_SETVBUF
-+#endif
+
static void InitializeCommonInterceptors() {
static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7553,6 +9117,27 @@ static void InitializeCommonInterceptors
- INIT_NETENT;
+@@ -7569,6 +9097,26 @@ static void InitializeCommonInterceptors
INIT_GETMNTINFO;
INIT_MI_VECTOR_HASH;
+ INIT_SETVBUF;
+ INIT_SYSCTL;
+ INIT_FTS;
+ INIT_REGEX;
@@ -1647,7 +1611,6 @@ $NetBSD$
+ INIT_RMD160;
+ INIT_SHA2;
+ INIT_GETCHAR;
-+ INIT_SETVBUF;
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 087d2d04d5..0b6ed37f7e 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,8 +1,8 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig 2018-11-16 20:22:47.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig 2018-11-19 23:14:50.000000000 +0000
+++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -519,4 +519,26 @@
+@@ -520,4 +520,25 @@
#define SANITIZER_INTERCEPT_GETMNTINFO SI_NETBSD
#define SANITIZER_INTERCEPT_MI_VECTOR_HASH SI_NETBSD
@@ -26,6 +26,5 @@ $NetBSD$
+#define SANITIZER_INTERCEPT_RMD160 SI_NETBSD
+#define SANITIZER_INTERCEPT_SHA2 SI_NETBSD
+#define SANITIZER_INTERCEPT_GETCHAR SI_POSIX
-+#define SANITIZER_INTERCEPT_SETVBUF SI_POSIX
+
#endif // #ifndef SANITIZER_PLATFORM_INTERCEPTORS_H
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 426886ce36..d57a962d4c 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
@@ -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,39 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
+@@ -2090,6 +2094,38 @@ unsigned IOCTL_SNDCTL_DSP_SILENCE = SNDC
const int si_SEGV_MAPERR = SEGV_MAPERR;
const int si_SEGV_ACCERR = SEGV_ACCERR;
@@ -49,11 +49,10 @@ $NetBSD$
+const int modctl_stat = MODCTL_STAT;
+const int modctl_exists = MODCTL_EXISTS;
+const unsigned fpos_t_sz = sizeof(fpos_t);
-+const int setvbuf_bufsiz = BUFSIZ;
} // namespace __sanitizer
using namespace __sanitizer;
-@@ -2251,4 +2288,10 @@ CHECK_SIZE_AND_OFFSET(group, gr_passwd);
+@@ -2251,4 +2287,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 b60449f6b7..9705468d7e 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
@@ -26,7 +26,7 @@ $NetBSD$
struct __sanitizer_ptrace_io_desc {
int piod_op;
void *piod_offs;
-@@ -2200,6 +2210,80 @@ extern unsigned IOCTL_SNDCTL_DSP_SILENCE
+@@ -2200,6 +2210,78 @@ extern unsigned IOCTL_SNDCTL_DSP_SILENCE
extern const int si_SEGV_MAPERR;
extern const int si_SEGV_ACCERR;
@@ -94,8 +94,6 @@ $NetBSD$
+ u8 entries_index_s1, entries_index_s2;
+};
+
-+extern const int setvbuf_bufsiz;
-+
+struct __sanitizer_sockaddr_storage {
+ u8 ss_len;
+ u8 ss_family;
Home |
Main Index |
Thread Index |
Old Index