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

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: compiler-rt-netbsd: Rebase to SVN r. 348747
From: Kamil Rytarowski <n54%gmx.com@localhost>
Date: Mon, 10 Dec 2018 09:31:01 +0000
Module Name:	pkgsrc-wip
Committed By:	Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By:	kamil
Date:		Mon Dec 10 10:31:01 2018 +0100
Changeset:	1d99d9a56bbc76ff872343a3f04701967a19b38e

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
Removed Files:
	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. 348747

Merged upstream:
D55471 Add new interceptors for FILE repositioning stream
[compiler-rt] r348744 - Add interceptors for md2(3) from NetBSD
[compiler-rt] r348745 - Add interceptors for the sha2(3) from NetBSD
[compiler-rt] r348747 - Add data types needed for md2(3)/NetBSD interceptors

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

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                        |  10 +-
 ...zer__common_sanitizer__common__interceptors.inc | 295 +--------------------
 ...zer__common_sanitizer__platform__interceptors.h |  11 +-
 ...__common_sanitizer__platform__limits__netbsd.cc |  26 +-
 ...r__common_sanitizer__platform__limits__netbsd.h |  26 +-
 ...r__common_sanitizer__platform__limits__posix.cc |  12 -
 ...er__common_sanitizer__platform__limits__posix.h |  12 -
 8 files changed, 25 insertions(+), 369 deletions(-)

diffs:
diff --git a/compiler-rt-netbsd/Makefile b/compiler-rt-netbsd/Makefile
index 0885cb5fce..4e57960f66 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=	348680
+SVN_REVISION.compiler-rt=	348747
 
 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 87512d9d15..8d60752fda 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -3,10 +3,8 @@ $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) = 7210cbe6a3a65846a4229349b9a610a83ff3632f
 SHA1 (patch-lib_msan_msan__linux.cc) = b5df0f4f5930d7c1681b1ad867c893d01d6e5cf7
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = a6c5b59ed0d8aa2598b5f18ed9daf72178ac9ce4
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = c4f6d6934f010dace16fa1267582512f91a89e00
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 356df3e1959c3a8764d3ace43297a3b8585963bf
-SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 4c669f65a5cbe7f14290ca5de96c8903653792ff
-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_sanitizer__common_sanitizer__common__interceptors.inc) = ff84583e1f5ad0a644e9bca2e939837eb782c1ba
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__interceptors.h) = 2ecd108dbb5ccb30a3346edfd5cad93999fabc46
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.cc) = 41d4c0080f4c5eb93e7a32535275105df423ce2c
+SHA1 (patch-lib_sanitizer__common_sanitizer__platform__limits__netbsd.h) = 7c91e2cf50c83bfb1b06d406f86f0df19d98ebc9
 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 00b817fa9d..4bbb34db5e 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,8 +1,8 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-12-08 02:06:46.000000000 +0000
+--- lib/sanitizer_common/sanitizer_common_interceptors.inc.orig	2018-12-10 09:29:18.792901648 +0000
 +++ lib/sanitizer_common/sanitizer_common_interceptors.inc
-@@ -117,6 +117,7 @@
+@@ -119,6 +119,7 @@
  #define times __times13
  #define wait3 __wait350
  #define wait4 __wait450
@@ -10,7 +10,7 @@ $NetBSD$
  extern const unsigned short *_ctype_tab_;
  extern const short *_toupper_tab_;
  extern const short *_tolower_tab_;
-@@ -3083,17 +3084,28 @@ INTERCEPTOR(int, sendmmsg, int fd, struc
+@@ -3085,17 +3086,28 @@ INTERCEPTOR(int, sendmmsg, int fd, struc
  #endif
  
  #if SANITIZER_INTERCEPT_GETPEERNAME
@@ -48,8 +48,8 @@ $NetBSD$
    return res;
  }
  #define INIT_GETPEERNAME COMMON_INTERCEPT_FUNCTION(getpeername);
-@@ -8228,6 +8240,740 @@ INTERCEPTOR(char *, MD5Data, const unsig
- #define INIT_MD5
+@@ -8460,6 +8472,464 @@ SHA2_INTERCEPTORS(512, u64);
+ #define INIT_SHA2
  #endif
  
 +#if SANITIZER_INTERCEPT_VIS
@@ -347,78 +347,6 @@ $NetBSD$
 +#define INIT_VIS
 +#endif
 +
-+#if SANITIZER_INTERCEPT_MD2
-+INTERCEPTOR(void, MD2Init, void *context) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, MD2Init, context);
-+  REAL(MD2Init)(context);
-+  COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, MD2_CTX_sz);
-+}
-+
-+INTERCEPTOR(void, MD2Update, void *context, const unsigned char *data,
-+            unsigned int len) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, MD2Update, context, data, len);
-+  if (data)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+  if (context)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD2_CTX_sz);
-+  REAL(MD2Update)(context, data, len);
-+}
-+
-+INTERCEPTOR(void, MD2Final, unsigned char digest[16], void *context) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, MD2Final, digest, context);
-+  REAL(MD2Final)(digest, context);
-+  if (digest)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, sizeof(unsigned char) * 16);
-+}
-+
-+INTERCEPTOR(char *, MD2End, void *context, char *buf) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, MD2End, context, buf);
-+  if (context)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, context, MD2_CTX_sz);
-+  char *ret = REAL(MD2End)(context, buf);
-+  if (ret)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD2_return_length);
-+  return ret;
-+}
-+
-+INTERCEPTOR(char *, MD2File, const char *filename, char *buf) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, MD2File, filename, buf);
-+  if (filename)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);
-+  char *ret = REAL(MD2File)(filename, buf);
-+  if (ret)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD2_return_length);
-+  return ret;
-+}
-+
-+INTERCEPTOR(char *, MD2Data, const unsigned char *data, unsigned int len,
-+            char *buf) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, MD2Data, data, len, buf);
-+  if (data)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len);
-+  char *ret = REAL(MD2Data)(data, len, buf);
-+  if (ret)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, MD2_return_length);
-+  return ret;
-+}
-+
-+#define INIT_MD2                                                               \
-+  COMMON_INTERCEPT_FUNCTION(MD2Init);                                          \
-+  COMMON_INTERCEPT_FUNCTION(MD2Update);                                        \
-+  COMMON_INTERCEPT_FUNCTION(MD2Final);                                         \
-+  COMMON_INTERCEPT_FUNCTION(MD2End);                                           \
-+  COMMON_INTERCEPT_FUNCTION(MD2File);                                          \
-+  COMMON_INTERCEPT_FUNCTION(MD2Data)
-+#else
-+#define INIT_MD2
-+#endif
-+
 +#if SANITIZER_INTERCEPT_NETBSD_MOUNT
 +INTERCEPTOR(int, mount, const char *type, const char *dir, int flags,
 +            void *data, SIZE_T data_len) {
@@ -454,73 +382,6 @@ $NetBSD$
 +#define INIT_NETBSD_MOUNT
 +#endif
 +
-+#if SANITIZER_INTERCEPT_FSEEK
-+
-+// FIXME The FILE type should be checked.
-+// Current challenge is that this type is OS-specific and for some
-+// OSs, it is not self-contained, i.e., it contains pointers inside
-+// and needs extra inside checking. So, we need to check them
-+// separately for different OSs.
-+
-+INTERCEPTOR(int, fseek, __sanitizer_FILE *stream, long int offset, int whence) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, fseek, stream, offset, whence);
-+  return REAL(fseek)(stream, offset, whence);
-+}
-+
-+INTERCEPTOR(int, fseeko, __sanitizer_FILE *stream, OFF_T offset, int whence) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, fseeko, stream, offset, whence);
-+  return REAL(fseeko)(stream, offset, whence);
-+}
-+
-+INTERCEPTOR(long int, ftell, __sanitizer_FILE *stream) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, ftell, stream);
-+  return REAL(ftell)(stream);
-+}
-+
-+INTERCEPTOR(long int, ftello, __sanitizer_FILE *stream) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, ftello, stream);
-+  return REAL(ftello)(stream);
-+}
-+
-+INTERCEPTOR(void, rewind, __sanitizer_FILE *stream) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, rewind, stream);
-+  return REAL(rewind)(stream);
-+}
-+
-+INTERCEPTOR(int, fgetpos, __sanitizer_FILE *stream, void *pos) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, fgetpos, stream, pos);
-+  int ret = REAL(fgetpos)(stream, pos);
-+  if (pos && ret == 0)
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, pos, fpos_t_sz);
-+  return ret;
-+}
-+
-+INTERCEPTOR(int, fsetpos, __sanitizer_FILE *stream, const void *pos) {
-+  void *ctx;
-+  COMMON_INTERCEPTOR_ENTER(ctx, fsetpos, stream, pos);
-+  if (pos)
-+    COMMON_INTERCEPTOR_READ_RANGE(ctx, pos, fpos_t_sz);
-+  return REAL(fsetpos)(stream, pos);
-+}
-+
-+#define INIT_FSEEK \
-+  COMMON_INTERCEPT_FUNCTION(fseek); \
-+  COMMON_INTERCEPT_FUNCTION(fseeko); \
-+  COMMON_INTERCEPT_FUNCTION(ftell); \
-+  COMMON_INTERCEPT_FUNCTION(ftello); \
-+  COMMON_INTERCEPT_FUNCTION(rewind); \
-+  COMMON_INTERCEPT_FUNCTION(fgetpos); \
-+  COMMON_INTERCEPT_FUNCTION(fsetpos)
-+#else
-+#define INIT_FSEEK
-+#endif
-+
 +#if SANITIZER_INTERCEPT_CDBR
 +static void cdbr_read_range(void *ctx, struct __sanitizer_cdbr *cdbr) {
 +  if (cdbr) {
@@ -609,143 +470,6 @@ $NetBSD$
 +#define INIT_CDBR
 +#endif
 +
-+#if SANITIZER_INTERCEPT_SHA2
-+
-+#define SHA2_INTERCEPTORS(LEN, SHA2_STATE_T) \
-+  INTERCEPTOR(void, SHA##LEN##_Init, void *context) { \
-+    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Init, context); \
-+    REAL(SHA##LEN##_Init)(context); \
-+    COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, SHA##LEN##_CTX_sz); \
-+  } \
-+  INTERCEPTOR(void, SHA##LEN##_Update, void *context, \
-+              const u8 *data, SIZE_T len) { \
-+    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Update, context, data, len); \
-+    if (data) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); \
-+    if (context) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \
-+    REAL(SHA##LEN##_Update)(context, data, len); \
-+  } \
-+  INTERCEPTOR(void, SHA##LEN##_Pad, void *context) { \
-+    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Pad, context); \
-+    if (context) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \
-+    REAL(SHA##LEN##_Pad)(context); \
-+  } \
-+  INTERCEPTOR(void, SHA##LEN##_Final, u8 digest[SHA##LEN##_digest_length], \
-+  void *context) { \
-+    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Final, digest, context); \
-+    REAL(SHA##LEN##_Final)(digest, context); \
-+    if (digest) \
-+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, digest, \
-+                                     sizeof(digest[0]) * \
-+  SHA##LEN##_digest_length); \
-+  } \
-+  INTERCEPTOR(void, SHA##LEN##_Transform, SHA2_STATE_T state[8], \
-+              const u8 buffer[SHA##LEN##_block_length]) { \
-+    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Transform, state, buffer); \
-+    if (state) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, state, sizeof(state[0]) * 8); \
-+    if (buffer) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, buffer, \
-+                                    sizeof(buffer[0]) * \
-+  SHA##LEN##_block_length); \
-+    REAL(SHA##LEN##_Transform)(state, buffer); \
-+  } \
-+  INTERCEPTOR(char *, SHA##LEN##_End, void *context, char *buf) { \
-+    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_End, context, buf); \
-+    if (context) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, context, SHA##LEN##_CTX_sz); \
-+    char *ret = REAL(SHA##LEN##_End)(context, buf); \
-+    if (ret) \
-+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \
-+    return ret; \
-+  } \
-+  INTERCEPTOR(char *, SHA##LEN##_File, const char *filename, char *buf) { \
-+    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_File, filename, buf); \
-+    if (filename) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);\
-+    char *ret = REAL(SHA##LEN##_File)(filename, buf); \
-+    if (ret) \
-+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \
-+    return ret; \
-+  } \
-+  INTERCEPTOR(char *, SHA##LEN##_FileChunk, const char *filename, char *buf, \
-+              OFF_T offset, OFF_T length) { \
-+    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_FileChunk, filename, buf, offset, \
-+  length); \
-+    if (filename) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, filename, REAL(strlen)(filename) + 1);\
-+    char *ret = REAL(SHA##LEN##_FileChunk)(filename, buf, offset, length); \
-+    if (ret) \
-+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \
-+    return ret; \
-+  } \
-+  INTERCEPTOR(char *, SHA##LEN##_Data, u8 *data, SIZE_T len, char *buf) { \
-+    void *ctx; \
-+    COMMON_INTERCEPTOR_ENTER(ctx, SHA##LEN##_Data, data, len, buf); \
-+    if (data) \
-+      COMMON_INTERCEPTOR_READ_RANGE(ctx, data, len); \
-+    char *ret = REAL(SHA##LEN##_Data)(data, len, buf); \
-+    if (ret) \
-+      COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ret, SHA##LEN##_return_length); \
-+    return ret; \
-+  }
-+
-+SHA2_INTERCEPTORS(224, u32);
-+SHA2_INTERCEPTORS(256, u32);
-+SHA2_INTERCEPTORS(384, u64);
-+SHA2_INTERCEPTORS(512, u64);
-+
-+
-+#define INIT_SHA2 \
-+  COMMON_INTERCEPT_FUNCTION(SHA224_Init); \
-+  COMMON_INTERCEPT_FUNCTION(SHA224_Update); \
-+  COMMON_INTERCEPT_FUNCTION(SHA224_Final); \
-+  COMMON_INTERCEPT_FUNCTION(SHA224_Transform); \
-+  COMMON_INTERCEPT_FUNCTION(SHA224_End); \
-+  COMMON_INTERCEPT_FUNCTION(SHA224_File); \
-+  COMMON_INTERCEPT_FUNCTION(SHA224_FileChunk); \
-+  COMMON_INTERCEPT_FUNCTION(SHA224_Data); \
-+  COMMON_INTERCEPT_FUNCTION(SHA256_Init); \
-+  COMMON_INTERCEPT_FUNCTION(SHA256_Update); \
-+  COMMON_INTERCEPT_FUNCTION(SHA256_Final); \
-+  COMMON_INTERCEPT_FUNCTION(SHA256_Transform); \
-+  COMMON_INTERCEPT_FUNCTION(SHA256_End); \
-+  COMMON_INTERCEPT_FUNCTION(SHA256_File); \
-+  COMMON_INTERCEPT_FUNCTION(SHA256_FileChunk); \
-+  COMMON_INTERCEPT_FUNCTION(SHA256_Data); \
-+  COMMON_INTERCEPT_FUNCTION(SHA384_Init); \
-+  COMMON_INTERCEPT_FUNCTION(SHA384_Update); \
-+  COMMON_INTERCEPT_FUNCTION(SHA384_Final); \
-+  COMMON_INTERCEPT_FUNCTION(SHA384_Transform); \
-+  COMMON_INTERCEPT_FUNCTION(SHA384_End); \
-+  COMMON_INTERCEPT_FUNCTION(SHA384_File); \
-+  COMMON_INTERCEPT_FUNCTION(SHA384_FileChunk); \
-+  COMMON_INTERCEPT_FUNCTION(SHA384_Data); \
-+  COMMON_INTERCEPT_FUNCTION(SHA512_Init); \
-+  COMMON_INTERCEPT_FUNCTION(SHA512_Update); \
-+  COMMON_INTERCEPT_FUNCTION(SHA512_Final); \
-+  COMMON_INTERCEPT_FUNCTION(SHA512_Transform); \
-+  COMMON_INTERCEPT_FUNCTION(SHA512_End); \
-+  COMMON_INTERCEPT_FUNCTION(SHA512_File); \
-+  COMMON_INTERCEPT_FUNCTION(SHA512_FileChunk); \
-+  COMMON_INTERCEPT_FUNCTION(SHA512_Data)
-+
-+#undef SHA2_INTERCEPTORS
-+
-+#else
-+#define INIT_SHA2
-+#endif
-+
 +#if SANITIZER_INTERCEPT_GETCHAR
 +INTERCEPTOR(int, fgetc, __sanitizer_FILE *stream) {
 +  void *ctx;
@@ -789,16 +513,13 @@ $NetBSD$
  static void InitializeCommonInterceptors() {
    static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
    interceptor_metadata_map =
-@@ -8503,5 +9249,13 @@ static void InitializeCommonInterceptors
-   INIT_RMD160;
-   INIT_MD5;
+@@ -8738,5 +9208,10 @@ static void InitializeCommonInterceptors
+   INIT_MD2;
+   INIT_SHA2;
  
 +  INIT_VIS;
-+  INIT_MD2;
 +  INIT_NETBSD_MOUNT;
-+  INIT_FSEEK;
 +  INIT_CDBR;
-+  INIT_SHA2;
 +  INIT_GETCHAR;
 +
    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 44eaf1d7a6..1db3ede7f8 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,14 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-12-08 02:06:46.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_interceptors.h.orig	2018-12-10 09:29:18.793406716 +0000
 +++ lib/sanitizer_common/sanitizer_platform_interceptors.h
-@@ -540,4 +540,12 @@
- #define SANITIZER_INTERCEPT_RMD160 SI_NETBSD
- #define SANITIZER_INTERCEPT_MD5 SI_NETBSD
+@@ -543,4 +543,9 @@
+ #define SANITIZER_INTERCEPT_MD2 SI_NETBSD
+ #define SANITIZER_INTERCEPT_SHA2 SI_NETBSD
  
 +#define SANITIZER_INTERCEPT_VIS SI_NETBSD
-+#define SANITIZER_INTERCEPT_MD2 SI_NETBSD
 +#define SANITIZER_INTERCEPT_NETBSD_MOUNT SI_NETBSD
-+#define SANITIZER_INTERCEPT_FSEEK SI_POSIX
 +#define SANITIZER_INTERCEPT_CDBR SI_NETBSD
-+#define SANITIZER_INTERCEPT_SHA2 SI_NETBSD
 +#define SANITIZER_INTERCEPT_GETCHAR 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 9e4d5ca77e..2e81a45a3f 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,32 +1,14 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-12-08 02:06:46.000000000 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc.orig	2018-12-10 09:29:18.793773992 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.cc
-@@ -2113,6 +2113,27 @@ const unsigned RMD160_return_length = RM
+@@ -2131,6 +2131,9 @@ SHA2_CONST(384);
+ SHA2_CONST(512);
  
- const unsigned MD5_CTX_sz = sizeof(MD5_CTX);
- const unsigned MD5_return_length = MD5_DIGEST_STRING_LENGTH;
-+
-+const unsigned MD2_CTX_sz = sizeof(MD2_CTX);
-+const unsigned MD2_return_length = MD2_DIGEST_STRING_LENGTH; // 33
-+
-+#define SHA2_CONST(LEN) \
-+  const unsigned SHA##LEN##_CTX_sz = sizeof(SHA##LEN##_CTX); \
-+  const unsigned SHA##LEN##_return_length = SHA##LEN##_DIGEST_STRING_LENGTH; \
-+  const unsigned SHA##LEN##_block_length = SHA##LEN##_BLOCK_LENGTH; \
-+  const unsigned SHA##LEN##_digest_length = SHA##LEN##_DIGEST_LENGTH
-+
-+SHA2_CONST(224);
-+SHA2_CONST(256);
-+SHA2_CONST(384);
-+SHA2_CONST(512);
-+
-+#undef SHA2_CONST
+ #undef SHA2_CONST
 +
 +const int unvis_valid = UNVIS_VALID;
 +const int unvis_validpush = UNVIS_VALIDPUSH;
-+
-+const unsigned fpos_t_sz = sizeof(fpos_t);
  }  // namespace __sanitizer
  
  using namespace __sanitizer;
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 d1cf2b69a4..9c1d38add2 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,33 +1,15 @@
 $NetBSD$
 
---- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-12-08 02:54:41.150740836 +0000
+--- lib/sanitizer_common/sanitizer_platform_limits_netbsd.h.orig	2018-12-10 09:29:18.792198294 +0000
 +++ lib/sanitizer_common/sanitizer_platform_limits_netbsd.h
-@@ -2235,6 +2235,59 @@ extern const unsigned RMD160_return_leng
+@@ -2253,6 +2253,41 @@ SHA2_EXTERN(384);
+ SHA2_EXTERN(512);
  
- extern const unsigned MD5_CTX_sz;
- extern const unsigned MD5_return_length;
-+
-+extern const unsigned MD2_CTX_sz;
-+extern const unsigned MD2_return_length;
-+
-+#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; \
-+  extern const unsigned SHA##LEN##_digest_length
-+
-+SHA2_EXTERN(224);
-+SHA2_EXTERN(256);
-+SHA2_EXTERN(384);
-+SHA2_EXTERN(512);
-+
-+#undef SHA2_EXTERN
+ #undef SHA2_EXTERN
 +
 +extern const int unvis_valid;
 +extern const int unvis_validpush;
 +
-+extern const unsigned fpos_t_sz;
-+
 +struct __sanitizer_cdbr {
 +  void (*unmap)(void *, void *, uptr);
 +  void *cookie;
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
deleted file mode 100644
index d04dcd4128..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.cc
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- 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
- 
-   const int si_SEGV_MAPERR = SEGV_MAPERR;
-   const int si_SEGV_ACCERR = SEGV_ACCERR;
-+  const unsigned fpos_t_sz = sizeof(fpos_t);
- } // namespace __sanitizer
- 
- using namespace __sanitizer;
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
deleted file mode 100644
index ba369babf9..0000000000
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__platform__limits__posix.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- 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
- 
-   extern const int si_SEGV_MAPERR;
-   extern const int si_SEGV_ACCERR;
-+  extern const unsigned fpos_t_sz;
- }  // namespace __sanitizer
- 
- #define CHECK_TYPE_SIZE(TYPE) \
Prev by Date: swi-prolog-lite: Fix pthread_setname_np() arguments usage
Next by Date: swi-prolog*: swi-prolog is curses agnostic (include curses.buildlink3.mk)
Previous by Thread: swi-prolog-lite: Fix pthread_setname_np() arguments usage
Next by Thread: swi-prolog*: swi-prolog is curses agnostic (include curses.buildlink3.mk)
Indexes:
Home | Main Index | Thread Index | Old Index