summaryrefslogtreecommitdiffstats
path: root/compiler-rt
diff options
context:
space:
mode:
authorViktor Kutuzov <vkutuzov@accesssoftek.com>2014-12-22 19:14:23 +0000
committerViktor Kutuzov <vkutuzov@accesssoftek.com>2014-12-22 19:14:23 +0000
commit54c75900738a09216e9e399ff70c9ad56d60aef0 (patch)
tree97faa5e803a1c0ccd887e6ffbab635bf7b7ac08d /compiler-rt
parent08de4b0d4e17e42efbb0b7686a2ef53864ec30bc (diff)
downloadbcm5719-llvm-54c75900738a09216e9e399ff70c9ad56d60aef0.tar.gz
bcm5719-llvm-54c75900738a09216e9e399ff70c9ad56d60aef0.zip
[Msan] Fix msan_test.cc inclusions to build the unit tests on FreeBSD
Differential Revision: http://reviews.llvm.org/D6757 llvm-svn: 224724
Diffstat (limited to 'compiler-rt')
-rw-r--r--compiler-rt/lib/msan/tests/msan_test.cc16
1 files changed, 10 insertions, 6 deletions
diff --git a/compiler-rt/lib/msan/tests/msan_test.cc b/compiler-rt/lib/msan/tests/msan_test.cc
index 554265da6aa..834448075ad 100644
--- a/compiler-rt/lib/msan/tests/msan_test.cc
+++ b/compiler-rt/lib/msan/tests/msan_test.cc
@@ -27,7 +27,6 @@
#include <stdio.h>
#include <wchar.h>
#include <math.h>
-#include <malloc.h>
#include <arpa/inet.h>
#include <dlfcn.h>
@@ -43,20 +42,26 @@
#include <sys/resource.h>
#include <sys/ioctl.h>
#include <sys/statvfs.h>
-#include <sys/sysinfo.h>
#include <sys/utsname.h>
#include <sys/mman.h>
-#include <sys/vfs.h>
#include <dirent.h>
#include <pwd.h>
#include <sys/socket.h>
#include <netdb.h>
#include <wordexp.h>
-#include <mntent.h>
-#include <netinet/ether.h>
#include <sys/ipc.h>
#include <sys/shm.h>
+#if !defined(__FreeBSD__)
+# include <malloc.h>
+# include <sys/sysinfo.h>
+# include <sys/vfs.h>
+# include <mntent.h>
+# include <netinet/ether.h>
+#else
+# include <netinet/in.h>
+#endif
+
#if defined(__i386__) || defined(__x86_64__)
# include <emmintrin.h>
# define MSAN_HAS_M128 1
@@ -973,7 +978,6 @@ TEST(MemorySanitizer, recvmsg) {
ASSERT_EQ(0, res);
ASSERT_EQ(sizeof(client_sai), sz);
-
const char *s = "message text";
struct iovec iov;
iov.iov_base = (void *)s;
OpenPOWER on IntegriCloud