rebase of the patch for 8

This commit is contained in:
Sylvestre Ledru 2019-02-04 10:37:19 +01:00
parent 9565ba904f
commit b762c47711
2 changed files with 43 additions and 7 deletions

View File

@ -137,9 +137,9 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platfo
#include <obstack.h>
-#include <mqueue.h>
+#if SANITIZER_KFREEBSD
+# include <mqueue.h>
+#else
+# include <sys/mqueue.h>
+#else
+# include <mqueue.h>
+#endif
#include <net/if_ppp.h>
#include <netax25/ax25.h>
@ -149,9 +149,9 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platfo
#endif
+#if SANITIZER_KFREEBSD
+# include <link.h>
+#else
+# include <sys/link_elf.h>
+#else
+# include <link.h>
+#endif
+
#if SANITIZER_LINUX
@ -391,7 +391,15 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerDefs.h
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerDefs.h
@@ -54,6 +54,15 @@
@@ -28,6 +28,7 @@
#define LIBFUZZER_LINUX 1
#define LIBFUZZER_NETBSD 0
#define LIBFUZZER_FREEBSD 0
+#define LIBFUZZER_KFREEBSD 1
#define LIBFUZZER_OPENBSD 0
#define LIBFUZZER_WINDOWS 0
#elif __APPLE__
@@ -54,6 +55,15 @@
#define LIBFUZZER_FREEBSD 1
#define LIBFUZZER_OPENBSD 0
#define LIBFUZZER_WINDOWS 0
@ -407,7 +415,7 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerDefs.h
#elif __OpenBSD__
#define LIBFUZZER_APPLE 0
#define LIBFUZZER_FUCHSIA 0
@@ -95,7 +104,7 @@
@@ -95,7 +105,7 @@
#define LIBFUZZER_POSIX \
(LIBFUZZER_APPLE || LIBFUZZER_LINUX || LIBFUZZER_NETBSD || \
@ -521,3 +529,31 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_syscal
# define internal_syscall __syscall
# else
# define internal_syscall syscall
Index: llvm-toolchain-8-8~+rc1/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ llvm-toolchain-8-8~+rc1/projects/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -110,9 +110,9 @@ typedef struct user_fpregs elf_fpregset_
#include <glob.h>
#include <obstack.h>
#if SANITIZER_KFREEBSD
-# include <mqueue.h>
-#else
# include <sys/mqueue.h>
+#else
+# include <mqueue.h>
#endif
#include <net/if_ppp.h>
#include <netax25/ax25.h>
@@ -151,9 +151,9 @@ typedef struct user_fpregs elf_fpregset_
#endif
#if SANITIZER_KFREEBSD
-# include <link.h>
-#else
# include <sys/link_elf.h>
+#else
+# include <link.h>
#endif
#if SANITIZER_LINUX

View File

@ -103,7 +103,6 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/KFreeBSD.cpp
+
+#include "KFreeBSD.h"
+#include "CommonArgs.h"
+#include "clang/Basic/VirtualFileSystem.h"
+#include "clang/Config/config.h"
+#include "clang/Driver/Driver.h"
+#include "clang/Driver/Options.h"
@ -111,6 +110,7 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/KFreeBSD.cpp
+#include "llvm/Option/ArgList.h"
+#include "llvm/ProfileData/InstrProf.h"
+#include "llvm/Support/Path.h"
+#include "llvm/Support/VirtualFileSystem.h"
+
+using namespace clang::driver;
+using namespace clang::driver::toolchains;