From: Kamil Rytarowski <n54@gmx.com>
Date: Mon, 4 Nov 2019 00:08:53 +0000 (+0100)
Subject: [compiler-rt] [msan] Support POSIX iconv(3) on NetBSD 9.99.17+
X-Git-Tag: llvmorg-11-init~5114
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e345bc6e65a3a7b8797a0e8322771cf1a3ef1213;p=platform%2Fupstream%2Fllvm.git

[compiler-rt] [msan] Support POSIX iconv(3) on NetBSD 9.99.17+

Fixes build of test.
---

diff --git a/compiler-rt/test/msan/iconv.cpp b/compiler-rt/test/msan/iconv.cpp
index e2d08e9..eeeff9a 100644
--- a/compiler-rt/test/msan/iconv.cpp
+++ b/compiler-rt/test/msan/iconv.cpp
@@ -8,6 +8,15 @@
 #include <stdio.h>
 #include <errno.h>
 
+#if defined(__NetBSD__)
+#include <sys/param.h>
+#if __NetBSD_Prereq__(9,99,17)
+#define NETBSD_POSIX_ICONV 1
+#else
+#define NETBSD_POSIX_ICONV 0
+#endif
+#endif
+
 int main(void) {
   iconv_t cd = iconv_open("ASCII", "ASCII");
   assert(cd != (iconv_t)-1);
@@ -15,7 +24,7 @@ int main(void) {
   char inbuf_[100];
   strcpy(inbuf_, "sample text");
   char outbuf_[100];
-#if defined(__NetBSD__)
+#if defined(__NetBSD__) && !NETBSD_POSIX_ICONV
   // Some OSes expect the 2nd argument of iconv(3) to be of type const char **
   const char *inbuf = inbuf_;
 #else