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. 348679
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Sat Dec 8 03:07:41 2018 +0100
Changeset: a647917dd110f74aa646f8a628356301abe49c9e
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. 348679
Merged upstream:
[compiler-rt] r348676 - Add interceptors for the sha1(3) from NetBSD
[compiler-rt] r348677 - Add interceptors for the md4(3) from NetBSD
[compiler-rt] r348678 - Add interceptors for the rmd160(3) from NetBSD
[compiler-rt] r348679 - Add interceptors for md5(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=a647917dd110f74aa646f8a628356301abe49c9e
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 | 2 +-
...zer__common_sanitizer__common__interceptors.inc | 329 +--------------------
...zer__common_sanitizer__platform__interceptors.h | 16 +-
...__common_sanitizer__platform__limits__netbsd.cc | 21 +-
...r__common_sanitizer__platform__limits__netbsd.h | 22 +-
...r__common_sanitizer__platform__limits__posix.cc | 2 +-
...er__common_sanitizer__platform__limits__posix.h | 2 +-
9 files changed, 32 insertions(+), 378 deletions(-)
diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index ef38e24206..d44fd5edf9 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= 348663
+SVN_REVISION.compiler-rt= 348679
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 4a07fe67bb..24c6981554 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) = 3b426037456d89c0cdbfbedee47cdd4f31ec975d
+SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = 7210cbe6a3a65846a4229349b9a610a83ff3632f
SHA1 (patch-lib_msan_msan__linux.cc) = b5df0f4f5930d7c1681b1ad867c893d01d6e5cf7
-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_sanitizer__common_sanitizer__common__interceptors.inc) = 00a8b2239c8002ed8a9aafb2ac0e9df0a07f64dd
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = ac261e100bb9d4b34ae17f13317eb96f2538848a
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 55a514bd07b1e0445108f34c6b876c9ccd599fdd
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = c25596386e1cc3a711e60cbd8ea7270c0b839952
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc) = 9fe7fc43f98262800921cf19edecb00b1cc9da3e
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h) = 873d121dbc5baab1ce5e7ab19bf7e2c2b81eff67
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 13e7293b9c..1a2bc33411 100644
--- a/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
+++ b/compiler-rt-netbsd/patches/patch-lib_fuzzer_tests_CMakeLists.txt
@@ -1,6 +1,6 @@
$NetBSD$
---- lib/fuzzer/tests/CMakeLists.txt.orig 2018-12-07 22:43:41.824209454 +0000
+--- lib/fuzzer/tests/CMakeLists.txt.orig 2018-12-07 22:43:41.000000000 +0000
+++ lib/fuzzer/tests/CMakeLists.txt
@@ -15,6 +15,9 @@ add_custom_target(FuzzerUnitTests)
set_target_properties(FuzzerUnitTests PROPERTIES FOLDER "Compiler-RT Tests")
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 baedfda910..bb6dcd0433 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-07 22:43:42.617621156 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig 2018-12-08 02:06:46.222205063 +0000
+++ lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -117,6 +117,7 @@
#define times __times13
@@ -48,8 +48,8 @@ $NetBSD$
return res;
}
#define INIT_GETPEERNAME COMMON_INTERCEPT_FUNCTION(getpeername);
-@@ -7840,6 +7852,1051 @@ INTERCEPTOR(UINTMAX_T, strtou, const cha
- #define INIT_STRTOI
+@@ -8228,6 +8240,740 @@ INTERCEPTOR(char *, MD5Data, const unsig
+ #define INIT_MD5
#endif
+#if SANITIZER_INTERCEPT_VIS
@@ -347,89 +347,7 @@ $NetBSD$
+#define INIT_VIS
+#endif
+
-+#if SANITIZER_INTERCEPT_SHA1
-+INTERCEPTOR(void, SHA1Init, void *context) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, SHA1Init, context);
-+ REAL(SHA1Init)(context);
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, SHA1_CTX_sz);
-+}
-+
-+INTERCEPTOR(void, SHA1Update, void *context, const u8 *data, unsigned len) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, SHA1Update, context, data, len);
-+ if (data)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+ if (context)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA1_CTX_sz);
-+ REAL(SHA1Update)(context, data, len);
-+}
-+
-+INTERCEPTOR(void, SHA1Final, u8 digest[20], void *context) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, SHA1Final, digest, context);
-+ REAL(SHA1Final)(digest, context);
-+ if (digest)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(u8) * 20);
-+}
-+
-+INTERCEPTOR(void, SHA1Transform, u32 state[5], u8 buffer[64]) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, SHA1Transform, state, buffer);
-+ if (state)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, state, sizeof(u32) * 5);
-+ if (buffer)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, buffer, sizeof(u8) * 64);
-+ REAL(SHA1Transform)(state, buffer);
-+}
-+
-+INTERCEPTOR(char *, SHA1End, void *context, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, SHA1End, context, buf);
-+ if (context)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA1_CTX_sz);
-+ char *ret = REAL(SHA1End)(context, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA1_return_length);
-+ return ret;
-+}
-+
-+INTERCEPTOR(char *, SHA1File, char *filename, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, SHA1File, filename, buf);
-+ if (filename)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);
-+ char *ret = REAL(SHA1File)(filename, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA1_return_length);
-+ return ret;
-+}
-+
-+INTERCEPTOR(char *, SHA1Data, u8 *data, SIZE_T len, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, SHA1Data, data, len, buf);
-+ if (data)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+ char *ret = REAL(SHA1Data)(data, len, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA1_return_length);
-+ return ret;
-+}
-+
-+#define INIT_SHA1 \
-+ COMMON_INTERCEPT_FUNCTION(SHA1Init); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1Update); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1Final); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1Transform); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1End); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1File); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1Data)
-+#else
-+#define INIT_SHA1
-+#endif
-+
+#if SANITIZER_INTERCEPT_MD2
-+
+INTERCEPTOR(void, MD2Init, void *context) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, MD2Init, context);
@@ -501,152 +419,6 @@ $NetBSD$
+#define INIT_MD2
+#endif
+
-+#if SANITIZER_INTERCEPT_MD4
-+
-+INTERCEPTOR(void, MD4Init, void *context) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD4Init, context);
-+ REAL(MD4Init)(context);
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD4_CTX_sz);
-+}
-+
-+INTERCEPTOR(void, MD4Update, void *context, const unsigned char *data,
-+ unsigned int len) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD4Update, context, data, len);
-+ if (data)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+ if (context)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD4_CTX_sz);
-+ REAL(MD4Update)(context, data, len);
-+}
-+
-+INTERCEPTOR(void, MD4Final, unsigned char digest[16], void *context) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD4Final, digest, context);
-+ REAL(MD4Final)(digest, context);
-+ if (digest)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(unsigned char) * 16);
-+}
-+
-+INTERCEPTOR(char *, MD4End, void *context, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD4End, context, buf);
-+ if (context)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD4_CTX_sz);
-+ char *ret = REAL(MD4End)(context, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD4_return_length);
-+ return ret;
-+}
-+
-+INTERCEPTOR(char *, MD4File, const char *filename, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD4File, filename, buf);
-+ if (filename)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);
-+ char *ret = REAL(MD4File)(filename, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD4_return_length);
-+ return ret;
-+}
-+
-+INTERCEPTOR(char *, MD4Data, const unsigned char *data, unsigned int len,
-+ char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD4Data, data, len, buf);
-+ if (data)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+ char *ret = REAL(MD4Data)(data, len, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD4_return_length);
-+ return ret;
-+}
-+
-+#define INIT_MD4 \
-+ COMMON_INTERCEPT_FUNCTION(MD4Init); \
-+ COMMON_INTERCEPT_FUNCTION(MD4Update); \
-+ COMMON_INTERCEPT_FUNCTION(MD4Final); \
-+ COMMON_INTERCEPT_FUNCTION(MD4End); \
-+ COMMON_INTERCEPT_FUNCTION(MD4File); \
-+ COMMON_INTERCEPT_FUNCTION(MD4Data)
-+#else
-+#define INIT_MD4
-+#endif
-+
-+#if SANITIZER_INTERCEPT_MD5
-+
-+INTERCEPTOR(void, MD5Init, void *context) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD5Init, context);
-+ REAL(MD5Init)(context);
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD5_CTX_sz);
-+}
-+
-+INTERCEPTOR(void, MD5Update, void *context, const unsigned char *data,
-+ unsigned int len) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD5Update, context, data, len);
-+ if (data)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+ if (context)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz);
-+ REAL(MD5Update)(context, data, len);
-+}
-+
-+INTERCEPTOR(void, MD5Final, unsigned char digest[16], void *context) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD5Final, digest, context);
-+ REAL(MD5Final)(digest, context);
-+ if (digest)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(unsigned char) * 16);
-+}
-+
-+INTERCEPTOR(char *, MD5End, void *context, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD5End, context, buf);
-+ if (context)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD5_CTX_sz);
-+ char *ret = REAL(MD5End)(context, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length);
-+ return ret;
-+}
-+
-+INTERCEPTOR(char *, MD5File, const char *filename, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD5File, filename, buf);
-+ if (filename)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);
-+ char *ret = REAL(MD5File)(filename, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length);
-+ return ret;
-+}
-+
-+INTERCEPTOR(char *, MD5Data, const unsigned char *data, unsigned int len,
-+ char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, MD5Data, data, len, buf);
-+ if (data)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+ char *ret = REAL(MD5Data)(data, len, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD5_return_length);
-+ return ret;
-+}
-+
-+#define INIT_MD5 \
-+ COMMON_INTERCEPT_FUNCTION(MD5Init); \
-+ COMMON_INTERCEPT_FUNCTION(MD5Update); \
-+ COMMON_INTERCEPT_FUNCTION(MD5Final); \
-+ COMMON_INTERCEPT_FUNCTION(MD5End); \
-+ COMMON_INTERCEPT_FUNCTION(MD5File); \
-+ COMMON_INTERCEPT_FUNCTION(MD5Data)
-+#else
-+#define INIT_MD5
-+#endif
-+
+#if SANITIZER_INTERCEPT_NETBSD_MOUNT
+INTERCEPTOR(int, mount, const char *type, const char *dir, int flags,
+ void *data, SIZE_T data_len) {
@@ -837,89 +609,6 @@ $NetBSD$
+#define INIT_CDBR
+#endif
+
-+#if SANITIZER_INTERCEPT_RMD160
-+
-+INTERCEPTOR(void, RMD160Init, void *context) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, RMD160Init, context);
-+ REAL(RMD160Init)(context);
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, RMD160_CTX_sz);
-+}
-+
-+INTERCEPTOR(void, RMD160Update, void *context,
-+ const unsigned char *data, unsigned int len) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, RMD160Update, context, data, len);
-+ if (data)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+ if (context)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, context, RMD160_CTX_sz);
-+ REAL(RMD160Update)(context, data, len);
-+}
-+
-+INTERCEPTOR(void, RMD160Final, unsigned char digest[20], void *context) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, RMD160Final, digest, context);
-+ REAL(RMD160Final)(digest, context);
-+ if (digest)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(unsigned char) * 20);
-+}
-+
-+INTERCEPTOR(void, RMD160Transform, u32 state[5], const u32 buffer[16]) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, RMD160Transform, state, buffer);
-+ if (state)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, state, sizeof(u32) * 5);
-+ if (buffer)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, buffer, sizeof(u32) * 16);
-+ REAL(RMD160Transform)(state, buffer);
-+}
-+
-+INTERCEPTOR(char *, RMD160End, void *context, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, RMD160End, context, buf);
-+ if (context)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, context, RMD160_CTX_sz);
-+ char *ret = REAL(RMD160End)(context, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, RMD160_return_length);
-+ return ret;
-+}
-+
-+INTERCEPTOR(char *, RMD160File, char *filename, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, RMD160File, filename, buf);
-+ if (filename)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);
-+ char *ret = REAL(RMD160File)(filename, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, RMD160_return_length);
-+ return ret;
-+}
-+
-+INTERCEPTOR(char *, RMD160Data, unsigned char *data, SIZE_T len, char *buf) {
-+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, RMD160Data, data, len, buf);
-+ if (data)
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+ char *ret = REAL(RMD160Data)(data, len, buf);
-+ if (ret)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, RMD160_return_length);
-+ return ret;
-+}
-+
-+#define INIT_RMD160 \
-+ COMMON_INTERCEPT_FUNCTION(RMD160Init); \
-+ COMMON_INTERCEPT_FUNCTION(RMD160Update); \
-+ COMMON_INTERCEPT_FUNCTION(RMD160Final); \
-+ COMMON_INTERCEPT_FUNCTION(RMD160Transform); \
-+ COMMON_INTERCEPT_FUNCTION(RMD160End); \
-+ COMMON_INTERCEPT_FUNCTION(RMD160File); \
-+ COMMON_INTERCEPT_FUNCTION(RMD160Data)
-+#else
-+#define INIT_RMD160
-+#endif
-+
+#if SANITIZER_INTERCEPT_SHA2
+
+#define SHA2_INTERCEPTORS(LEN, SHA2_STATE_T) \
@@ -1099,20 +788,16 @@ $NetBSD$
+
static void InitializeCommonInterceptors() {
static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
- interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -8109,5 +9166,17 @@ static void InitializeCommonInterceptors
- INIT_STATVFS1;
- INIT_STRTOI;
+ interceptor_metadata_map =
+@@ -8503,5 +9249,13 @@ static void InitializeCommonInterceptors
+ INIT_RMD160;
+ INIT_MD5;
+ INIT_VIS;
-+ INIT_SHA1;
+ INIT_MD2;
-+ INIT_MD4;
-+ INIT_MD5;
+ INIT_NETBSD_MOUNT;
+ INIT_FSEEK;
+ INIT_CDBR;
-+ INIT_RMD160;
+ INIT_SHA2;
+ INIT_GETCHAR;
+
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 aa5bc637f6..ac3d4e1b9f 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,24 +1,16 @@
$NetBSD$
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig 2018-12-07 22:43:42.618116216 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig 2018-12-08 02:06:46.220686904 +0000
+++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -534,4 +534,20 @@
- #define SANITIZER_INTERCEPT_STATVFS1 SI_NETBSD
- #define SANITIZER_INTERCEPT_STRTOI SI_NETBSD
+@@ -540,4 +540,12 @@
+ #define SANITIZER_INTERCEPT_RMD160 SI_NETBSD
+ #define SANITIZER_INTERCEPT_MD5 SI_NETBSD
-+
-+#define SANITIZER_INTERCEPT_STRTONUM SI_NETBSD
+#define SANITIZER_INTERCEPT_VIS SI_NETBSD
-+#define SANITIZER_INTERCEPT_SHA1 SI_NETBSD
+#define SANITIZER_INTERCEPT_MD2 SI_NETBSD
-+#define SANITIZER_INTERCEPT_MD4 SI_NETBSD
-+#define SANITIZER_INTERCEPT_MD5 SI_NETBSD
-+#define SANITIZER_INTERCEPT_FPARSELN SI_POSIX
-+#define SANITIZER_INTERCEPT_STATVFS1 SI_NETBSD
+#define SANITIZER_INTERCEPT_NETBSD_MOUNT SI_NETBSD
+#define SANITIZER_INTERCEPT_FSEEK SI_POSIX
+#define SANITIZER_INTERCEPT_CDBR SI_NETBSD
-+#define SANITIZER_INTERCEPT_RMD160 SI_NETBSD
+#define SANITIZER_INTERCEPT_SHA2 SI_NETBSD
+#define SANITIZER_INTERCEPT_GETCHAR SI_POSIX
+
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 843c96e458..b2a1272b3c 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,22 +1,11 @@
$NetBSD$
---- 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.orig 2018-12-08 02:06:46.221494609 +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;
- const int modctl_stat = MODCTL_STAT;
- const int modctl_exists = MODCTL_EXISTS;
-+
-+const unsigned SHA1_CTX_sz = sizeof(SHA1_CTX);
-+const unsigned SHA1_return_length = SHA1_DIGEST_STRING_LENGTH; // 41
-+const unsigned MD2_CTX_sz = sizeof(MD2_CTX);
-+const unsigned MD2_return_length = MD2_DIGEST_STRING_LENGTH; // 33
-+const unsigned MD4_CTX_sz = sizeof(MD4_CTX);
-+const unsigned MD4_return_length = 33;
-+const unsigned MD5_CTX_sz = sizeof(MD5_CTX);
-+const unsigned MD5_return_length = MD5_DIGEST_STRING_LENGTH; // 33
-+const unsigned RMD160_CTX_sz = sizeof(RMD160_CTX);
-+const unsigned RMD160_return_length = RMD160_DIGEST_STRING_LENGTH;// 41
+@@ -2113,6 +2113,24 @@ const unsigned RMD160_return_length = RM
+
+ const unsigned MD5_CTX_sz = sizeof(MD5_CTX);
+ const unsigned MD5_return_length = MD5_DIGEST_STRING_LENGTH;
+
+#define SHA2_CONST(LEN) \
+ const unsigned SHA##LEN##_CTX_sz = sizeof(SHA##LEN##_CTX); \
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 313695c5f3..3ed57980d2 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,24 +1,13 @@
$NetBSD$
---- 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.orig 2018-12-08 02:06:46.221060404 +0000
+++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
-@@ -2225,6 +2225,68 @@ extern unsigned IOCTL_SNDCTL_DSP_SILENCE
+@@ -2237,6 +2237,56 @@ extern const unsigned RMD160_return_leng
- extern const int si_SEGV_MAPERR;
- extern const int si_SEGV_ACCERR;
+ extern const unsigned MD5_CTX_sz;
+ extern const unsigned MD5_return_length;
+
-+extern const unsigned SHA1_CTX_sz;
-+extern const unsigned SHA1_return_length;
-+extern const unsigned MD2_CTX_sz;
-+extern const unsigned MD2_return_length;
-+extern const unsigned MD4_CTX_sz;
-+extern const unsigned MD4_return_length;
-+extern const unsigned MD5_CTX_sz;
-+extern const unsigned MD5_return_length;
-+extern const unsigned RMD160_CTX_sz;
-+extern const unsigned RMD160_return_length;
-+
-+#define SHA2_EXTERN(LEN)\
++#define SHA2_EXTERN(LEN) \
+ extern const unsigned SHA##LEN##_CTX_sz; \
+ extern const unsigned SHA##LEN##_return_length; \
+ extern const unsigned SHA##LEN##_block_length; \
@@ -67,7 +56,6 @@ $NetBSD$
+ u64 __ss_align;
+ char __ss_pad2[128 - 2 - (sizeof(u64) - 2) - sizeof(u64)];
+};
-+
} // namespace __sanitizer
#define CHECK_TYPE_SIZE(TYPE) \
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 6f5e9f5902..d04dcd4128 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,6 +1,6 @@
$NetBSD$
---- 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.orig 2018-12-07 22:43:42.000000000 +0000
+++ lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -912,6 +912,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
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 b48551ad1a..ba369babf9 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,6 +1,6 @@
$NetBSD$
---- 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.orig 2018-12-07 22:43:42.000000000 +0000
+++ lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -1426,6 +1426,7 @@ struct __sanitizer_cookie_io_functions_t
Home |
Main Index |
Thread Index |
Old Index