rebase of the patches

This commit is contained in:
Sylvestre Ledru 2019-02-04 11:58:08 +01:00
parent e5df6691ff
commit 0a3bee89f1
12 changed files with 175 additions and 385 deletions

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
@@ -84,9 +84,14 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
@@ -83,9 +83,14 @@
extern "C" {
// <sys/umtx.h> must be included after <errno.h> and <sys/types.h> on
// FreeBSD 9.2 and 10.0.
@ -17,7 +17,7 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_linux.
#endif // SANITIZER_FREEBSD
#if SANITIZER_NETBSD
@@ -468,10 +473,12 @@ bool FileExists(const char *filename) {
@@ -467,10 +472,12 @@ bool FileExists(const char *filename) {
#if !SANITIZER_NETBSD
tid_t GetTid() {
@ -31,7 +31,7 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_linux.
#elif SANITIZER_OPENBSD
return internal_syscall(SYSCALL(getthrid));
#elif SANITIZER_SOLARIS
@@ -1167,10 +1174,10 @@ bool LibraryNameIs(const char *full_name
@@ -1166,10 +1173,10 @@ bool LibraryNameIs(const char *full_name
// Call cb for each region mapped by map.
void ForEachMappedRegion(link_map *map, void (*cb)(const void *, uptr)) {
CHECK_NE(map, nullptr);
@ -44,11 +44,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_linux.
char *base = (char *)map->l_addr;
Elf_Ehdr *ehdr = (Elf_Ehdr *)base;
char *phdrs = base + ehdr->e_phoff;
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
@@ -36,10 +36,12 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cc
@@ -35,10 +35,12 @@
#include <syslog.h>
#if SANITIZER_FREEBSD
@ -63,7 +63,7 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_linux_
#endif
#if SANITIZER_OPENBSD
@@ -528,9 +530,9 @@ void GetThreadStackAndTls(bool main, upt
@@ -527,9 +529,9 @@ void GetThreadStackAndTls(bool main, upt
#endif
}
@ -75,11 +75,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_linux_
#define Elf_Phdr XElf32_Phdr
#define dl_phdr_info xdl_phdr_info
#define dl_iterate_phdr(c, b) xdl_iterate_phdr((c), (b))
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -16,7 +16,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -15,7 +15,7 @@
#if !defined(__linux__) && !defined(__FreeBSD__) && !defined(__NetBSD__) && \
!defined(__OpenBSD__) && !defined(__APPLE__) && !defined(_WIN32) && \
!defined(__Fuchsia__) && !defined(__rtems__) && \
@ -88,7 +88,7 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platfo
# error "This operating system is not supported"
#endif
@@ -26,12 +26,18 @@
@@ -25,12 +25,18 @@
# define SANITIZER_LINUX 0
#endif
@ -108,7 +108,7 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platfo
#if defined(__NetBSD__)
# define SANITIZER_NETBSD 1
#else
@@ -113,7 +119,8 @@
@@ -112,7 +118,8 @@
#define SANITIZER_POSIX \
(SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_MAC || \
@ -118,193 +118,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platfo
#if __LP64__ || defined(_WIN64)
# define SANITIZER_WORDSIZE 64
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/asan/asan_linux.cc
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
@@ -50,7 +50,7 @@
#include <utmp.h>
#endif
-#if !SANITIZER_IOS
+#if !SANITIZER_IOS && !SANITIZER_KFREEBSD
#include <net/route.h>
#endif
@@ -109,7 +109,11 @@ typedef struct user_fpregs elf_fpregset_
#if SANITIZER_LINUX && !SANITIZER_ANDROID
#include <glob.h>
#include <obstack.h>
-#include <mqueue.h>
+#if SANITIZER_KFREEBSD
+# include <sys/mqueue.h>
+#else
+# include <mqueue.h>
+#endif
#include <net/if_ppp.h>
#include <netax25/ax25.h>
#include <netipx/ipx.h>
@@ -146,6 +150,12 @@ typedef struct user_fpregs elf_fpregset_
#include <linux/if_ppp.h>
#endif
+#if SANITIZER_KFREEBSD
+# include <sys/link_elf.h>
+#else
+# include <link.h>
+#endif
+
#if SANITIZER_LINUX
#include <link.h>
#include <sys/vfs.h>
@@ -256,7 +266,7 @@ namespace __sanitizer {
#endif
-#if SANITIZER_LINUX && !SANITIZER_ANDROID
+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_KFREEBSD
unsigned struct_shminfo_sz = sizeof(struct shminfo);
unsigned struct_shm_info_sz = sizeof(struct shm_info);
int shmctl_ipc_stat = (int)IPC_STAT;
@@ -286,7 +296,7 @@ namespace __sanitizer {
return 0;
}
-#if SANITIZER_LINUX
+#if SANITIZER_LINUX || SANITIZER_KFREEBSD
unsigned struct_ElfW_Phdr_sz = sizeof(ElfW(Phdr));
#elif SANITIZER_FREEBSD
unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
@@ -466,7 +476,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
unsigned struct_ppp_stats_sz = sizeof(struct ppp_stats);
#endif // (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
-#if !SANITIZER_ANDROID && !SANITIZER_MAC
+#if !SANITIZER_ANDROID && !SANITIZER_MAC && !SANITIZER_KFREEBSD
unsigned struct_sioc_sg_req_sz = sizeof(struct sioc_sg_req);
unsigned struct_sioc_vif_req_sz = sizeof(struct sioc_vif_req);
#endif
@@ -519,7 +529,7 @@ unsigned struct_ElfW_Phdr_sz = sizeof(El
unsigned IOCTL_TIOCSPGRP = TIOCSPGRP;
unsigned IOCTL_TIOCSTI = TIOCSTI;
unsigned IOCTL_TIOCSWINSZ = TIOCSWINSZ;
-#if SANITIZER_LINUX && !SANITIZER_ANDROID
+#if SANITIZER_LINUX && !SANITIZER_ANDROID && !SANITIZER_KFREEBSD
unsigned IOCTL_SIOCGETSGCNT = SIOCGETSGCNT;
unsigned IOCTL_SIOCGETVIFCNT = SIOCGETVIFCNT;
#endif
@@ -958,7 +968,7 @@ CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi
CHECK_SIZE_AND_OFFSET(dl_phdr_info, dlpi_phnum);
#endif // SANITIZER_LINUX || SANITIZER_FREEBSD
-#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
+#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID && !SANITIZER_KFREEBSD
CHECK_TYPE_SIZE(glob_t);
CHECK_SIZE_AND_OFFSET(glob_t, gl_pathc);
CHECK_SIZE_AND_OFFSET(glob_t, gl_pathv);
@@ -978,8 +988,10 @@ CHECK_SIZE_AND_OFFSET(addrinfo, ai_sockt
CHECK_SIZE_AND_OFFSET(addrinfo, ai_protocol);
CHECK_SIZE_AND_OFFSET(addrinfo, ai_protocol);
CHECK_SIZE_AND_OFFSET(addrinfo, ai_addrlen);
+#if !SANITIZER_KFREEBSD
CHECK_SIZE_AND_OFFSET(addrinfo, ai_canonname);
CHECK_SIZE_AND_OFFSET(addrinfo, ai_addr);
+#endif
CHECK_TYPE_SIZE(hostent);
CHECK_SIZE_AND_OFFSET(hostent, h_name);
@@ -1001,7 +1013,9 @@ CHECK_SIZE_AND_OFFSET(msghdr, msg_contro
CHECK_SIZE_AND_OFFSET(msghdr, msg_controllen);
CHECK_SIZE_AND_OFFSET(msghdr, msg_flags);
+#if !SANITIZER_KFREEBSD
CHECK_TYPE_SIZE(cmsghdr);
+#endif
CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_len);
CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_level);
CHECK_SIZE_AND_OFFSET(cmsghdr, cmsg_type);
@@ -1043,7 +1057,9 @@ CHECK_SIZE_AND_OFFSET(pollfd, fd);
CHECK_SIZE_AND_OFFSET(pollfd, events);
CHECK_SIZE_AND_OFFSET(pollfd, revents);
+#if !SANITIZER_KFREEBSD
CHECK_TYPE_SIZE(nfds_t);
+#endif
CHECK_TYPE_SIZE(sigset_t);
@@ -1083,7 +1099,9 @@ CHECK_TYPE_SIZE(__kernel_fd_set);
#endif
#if !SANITIZER_ANDROID
+# if !SANITIZER_KFREEBSD
CHECK_TYPE_SIZE(wordexp_t);
+# endif
CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordc);
CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordv);
CHECK_SIZE_AND_OFFSET(wordexp_t, we_offs);
@@ -1116,13 +1134,14 @@ CHECK_TYPE_SIZE(ether_addr);
#if (SANITIZER_LINUX || SANITIZER_FREEBSD) && !SANITIZER_ANDROID
CHECK_TYPE_SIZE(ipc_perm);
-# if SANITIZER_FREEBSD
+#if SANITIZER_FREEBSD && !SANITIZER_KFREEBSD
CHECK_SIZE_AND_OFFSET(ipc_perm, key);
CHECK_SIZE_AND_OFFSET(ipc_perm, seq);
-# else
+#endif
+#if !SANITIZER_FREEBSD && !SANITIZER_KFREEBSD
CHECK_SIZE_AND_OFFSET(ipc_perm, __key);
CHECK_SIZE_AND_OFFSET(ipc_perm, __seq);
-# endif
+#endif
CHECK_SIZE_AND_OFFSET(ipc_perm, uid);
CHECK_SIZE_AND_OFFSET(ipc_perm, gid);
CHECK_SIZE_AND_OFFSET(ipc_perm, cuid);
@@ -1161,7 +1180,7 @@ CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_netma
#ifdef ifa_dstaddr
#undef ifa_dstaddr
#endif
-# if SANITIZER_FREEBSD
+# if SANITIZER_FREEBSD && !SANITIZER_KFREEBSD
CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_dstaddr);
# else
COMPILER_CHECK(sizeof(((__sanitizer_ifaddrs *)nullptr)->ifa_dstaddr) ==
@@ -1187,15 +1206,19 @@ CHECK_SIZE_AND_OFFSET(timeb, timezone);
CHECK_SIZE_AND_OFFSET(timeb, dstflag);
#endif
+#if !SANITIZER_KFREEBSD
CHECK_TYPE_SIZE(passwd);
+#endif
CHECK_SIZE_AND_OFFSET(passwd, pw_name);
CHECK_SIZE_AND_OFFSET(passwd, pw_passwd);
CHECK_SIZE_AND_OFFSET(passwd, pw_uid);
CHECK_SIZE_AND_OFFSET(passwd, pw_gid);
+#if !SANITIZER_KFREEBSD
CHECK_SIZE_AND_OFFSET(passwd, pw_dir);
CHECK_SIZE_AND_OFFSET(passwd, pw_shell);
+#endif
-#if !SANITIZER_ANDROID
+#if !SANITIZER_ANDROID && !SANITIZER_KFREEBSD
CHECK_SIZE_AND_OFFSET(passwd, pw_gecos);
#endif
@@ -1261,7 +1284,7 @@ CHECK_SIZE_AND_OFFSET(cookie_io_function
CHECK_SIZE_AND_OFFSET(cookie_io_functions_t, close);
#endif
-#if SANITIZER_LINUX || SANITIZER_FREEBSD
+#if SANITIZER_LINUX || (SANITIZER_FREEBSD && !SANITIZER_KFREEBSD)
CHECK_TYPE_SIZE(sem_t);
#endif
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/asan/asan_linux.cc
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/asan/asan_linux.cc
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/asan/asan_linux.cc
@@ -38,7 +38,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/asan/asan_linux.cc
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/asan/asan_linux.cc
@@ -37,7 +37,7 @@
#include <unistd.h>
#include <unwind.h>
@ -313,7 +131,7 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/asan/asan_linux.cc
#include <sys/link_elf.h>
#endif
@@ -48,7 +48,11 @@
@@ -47,7 +47,11 @@
#if SANITIZER_ANDROID || SANITIZER_FREEBSD || SANITIZER_SOLARIS
#include <ucontext.h>
@ -325,7 +143,7 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/asan/asan_linux.cc
#elif SANITIZER_NETBSD
#include <link_elf.h>
#include <ucontext.h>
@@ -61,7 +65,7 @@ extern Elf_Dyn _DYNAMIC;
@@ -60,7 +64,7 @@ extern Elf_Dyn _DYNAMIC;
// x86-64 FreeBSD 9.2 and older define 'ucontext_t' incorrectly in
// 32-bit mode.
#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32) && \
@ -334,11 +152,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/asan/asan_linux.cc
#define ucontext_t xucontext_t
#endif
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/ubsan/ubsan_platform.h
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/ubsan/ubsan_platform.h
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/ubsan/ubsan_platform.h
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/ubsan/ubsan_platform.h
@@ -15,7 +15,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/ubsan/ubsan_platform.h
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/ubsan/ubsan_platform.h
@@ -14,7 +14,7 @@
// Other platforms should be easy to add, and probably work as-is.
#if defined(__linux__) || defined(__FreeBSD__) || defined(__APPLE__) || \
@ -347,10 +165,10 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/ubsan/ubsan_platform.h
(defined(__sun__) && defined(__svr4__)) || \
defined(_WIN32) || defined(__Fuchsia__) || defined(__rtems__)
# define CAN_SANITIZE_UB 1
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
@@ -197,7 +197,7 @@ ASM_SYMBOL_INTERCEPTOR(setjmp):
lea 16(%rsp), %rdi
mov %rdi, %rsi
@ -387,11 +205,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/tsan/rtl/tsan_rtl_amd64.S
/* We do not need executable stack. */
/* This note is not needed on NetBSD. */
.section .note.GNU-stack,"",@progbits
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerDefs.h
Index: llvm-toolchain-snapshot_9~svn353038/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
@@ -28,6 +28,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerDefs.h
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerDefs.h
@@ -27,6 +27,7 @@
#define LIBFUZZER_LINUX 1
#define LIBFUZZER_NETBSD 0
#define LIBFUZZER_FREEBSD 0
@ -399,7 +217,7 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerDefs.h
#define LIBFUZZER_OPENBSD 0
#define LIBFUZZER_WINDOWS 0
#elif __APPLE__
@@ -54,6 +55,15 @@
@@ -53,6 +54,15 @@
#define LIBFUZZER_FREEBSD 1
#define LIBFUZZER_OPENBSD 0
#define LIBFUZZER_WINDOWS 0
@ -415,7 +233,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 +105,7 @@
@@ -94,7 +104,7 @@
#define LIBFUZZER_POSIX \
(LIBFUZZER_APPLE || LIBFUZZER_LINUX || LIBFUZZER_NETBSD || \
@ -424,11 +242,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerDefs.h
#ifdef __x86_64
# if __has_attribute(target)
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
@@ -119,7 +119,7 @@ size_t GetPeakRSSMb() {
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
@@ -139,7 +139,7 @@ size_t GetPeakRSSMb() {
if (getrusage(RUSAGE_SELF, &usage))
return 0;
if (LIBFUZZER_LINUX || LIBFUZZER_FREEBSD || LIBFUZZER_NETBSD ||
@ -437,11 +255,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerUtilPosix.cpp
// ru_maxrss is in KiB
return usage.ru_maxrss >> 10;
} else if (LIBFUZZER_APPLE) {
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
@@ -12,7 +12,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
@@ -11,7 +11,7 @@
#include "FuzzerDefs.h"
#if LIBFUZZER_LINUX || LIBFUZZER_NETBSD || LIBFUZZER_FREEBSD || \
@ -450,11 +268,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerExtraCounters.cpp
__attribute__((weak)) extern uint8_t __start___libfuzzer_extra_counters;
__attribute__((weak)) extern uint8_t __stop___libfuzzer_extra_counters;
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
@@ -14,7 +14,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
@@ -13,7 +13,7 @@
//===----------------------------------------------------------------------===//
#include "FuzzerDefs.h"
#if LIBFUZZER_LINUX || LIBFUZZER_NETBSD || LIBFUZZER_FUCHSIA || \
@ -463,11 +281,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerExtFunctionsWeak.cpp
#include "FuzzerExtFunctions.h"
#include "FuzzerIO.h"
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
@@ -10,7 +10,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
@@ -9,7 +9,7 @@
//===----------------------------------------------------------------------===//
#include "FuzzerDefs.h"
#if LIBFUZZER_LINUX || LIBFUZZER_NETBSD || LIBFUZZER_FREEBSD || \
@ -476,11 +294,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/fuzzer/FuzzerUtilLinux.cpp
#include "FuzzerCommand.h"
#include <stdlib.h>
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
@@ -21,7 +21,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_freebsd.h
@@ -20,7 +20,7 @@
// 32-bit mode.
#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
# include <osreldate.h>
@ -489,11 +307,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_freebs
# include <link.h>
# include <sys/param.h>
# include <ucontext.h>
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
@@ -38,7 +38,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_bsd.cc
@@ -37,7 +37,7 @@
// Fix 'kinfo_vmentry' definition on FreeBSD prior v9.2 in 32-bit mode.
#if SANITIZER_FREEBSD && (SANITIZER_WORDSIZE == 32)
#include <osreldate.h>
@ -502,11 +320,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_procma
#define kinfo_vmentry xkinfo_vmentry
#endif
#endif
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -20,7 +20,9 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -19,7 +19,9 @@
#include "sanitizer_internal_defs.h"
#include "sanitizer_platform.h"
@ -516,11 +334,11 @@ Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_platfo
#ifndef __GLIBC_PREREQ
#define __GLIBC_PREREQ(x, y) 0
Index: llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
Index: llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+++ llvm-toolchain-8-8~+rc1/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
@@ -20,7 +20,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
+++ llvm-toolchain-snapshot_9~svn353038/compiler-rt/lib/sanitizer_common/sanitizer_syscall_generic.inc
@@ -19,7 +19,7 @@
# define SYSCALL(name) __NR_ ## name
#endif
@ -529,31 +347,3 @@ 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/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc
+++ llvm-toolchain-8-8~+rc1/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

@ -1,8 +1,8 @@
Index: llvm-toolchain-7-7.0.1/include/llvm/ADT/Triple.h
Index: llvm-toolchain-snapshot_9~svn353038/include/llvm/ADT/Triple.h
===================================================================
--- llvm-toolchain-7-7.0.1.orig/include/llvm/ADT/Triple.h
+++ llvm-toolchain-7-7.0.1/include/llvm/ADT/Triple.h
@@ -158,7 +158,7 @@ public:
--- llvm-toolchain-snapshot_9~svn353038.orig/include/llvm/ADT/Triple.h
+++ llvm-toolchain-snapshot_9~svn353038/include/llvm/ADT/Triple.h
@@ -159,7 +159,7 @@ public:
FreeBSD,
Fuchsia,
IOS,
@ -11,7 +11,7 @@ Index: llvm-toolchain-7-7.0.1/include/llvm/ADT/Triple.h
Linux,
Lv2, // PS3
MacOSX,
@@ -575,8 +575,8 @@ public:
@@ -578,8 +578,8 @@ public:
}
/// Tests whether the OS is kFreeBSD.
@ -22,7 +22,7 @@ Index: llvm-toolchain-7-7.0.1/include/llvm/ADT/Triple.h
}
/// Tests whether the OS is Hurd.
@@ -586,7 +586,7 @@ public:
@@ -594,7 +594,7 @@ public:
/// Tests whether the OS uses glibc.
bool isOSGlibc() const {

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-7-7.0.1/libcxx/include/__config
Index: llvm-toolchain-snapshot_9~svn353038/libcxx/include/__config
===================================================================
--- llvm-toolchain-7-7.0.1.orig/libcxx/include/__config
+++ llvm-toolchain-7-7.0.1/libcxx/include/__config
@@ -1107,6 +1107,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit
--- llvm-toolchain-snapshot_9~svn353038.orig/libcxx/include/__config
+++ llvm-toolchain-snapshot_9~svn353038/libcxx/include/__config
@@ -1157,6 +1157,7 @@ _LIBCPP_FUNC_VIS extern "C" void __sanit
!defined(_LIBCPP_HAS_THREAD_API_WIN32) && \
!defined(_LIBCPP_HAS_THREAD_API_EXTERNAL)
# if defined(__FreeBSD__) || \

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp.h
Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp.h
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/kmp.h
+++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp.h
@@ -1077,6 +1077,10 @@ extern kmp_uint64 __kmp_now_nsec();
--- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/kmp.h
+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp.h
@@ -1076,6 +1076,10 @@ extern kmp_uint64 __kmp_now_nsec();
/* TODO: tune for KMP_OS_OPENBSD */
#define KMP_INIT_WAIT 1024U /* initial number of spin-tests */
#define KMP_NEXT_WAIT 512U /* susequent number of spin-tests */
@ -13,11 +13,11 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp.h
#endif
#if KMP_ARCH_X86 || KMP_ARCH_X86_64
Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_ftn_entry.h
Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_ftn_entry.h
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/kmp_ftn_entry.h
+++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_ftn_entry.h
@@ -535,7 +535,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_
--- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/kmp_ftn_entry.h
+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_ftn_entry.h
@@ -534,7 +534,7 @@ int FTN_STDCALL KMP_EXPAND_NAME(FTN_GET_
int gtid;
#if KMP_OS_DARWIN || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \
@ -26,11 +26,11 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_ftn_entry.h
gtid = __kmp_entry_gtid();
#elif KMP_OS_WINDOWS
if (!__kmp_init_parallel ||
Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_platform.h
Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_platform.h
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/kmp_platform.h
+++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_platform.h
@@ -19,6 +19,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/kmp_platform.h
+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_platform.h
@@ -18,6 +18,7 @@
#define KMP_OS_LINUX 0
#define KMP_OS_DRAGONFLY 0
#define KMP_OS_FREEBSD 0
@ -38,7 +38,7 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_platform.h
#define KMP_OS_NETBSD 0
#define KMP_OS_OPENBSD 0
#define KMP_OS_DARWIN 0
@@ -57,6 +58,11 @@
@@ -56,6 +57,11 @@
#define KMP_OS_FREEBSD 1
#endif
@ -50,7 +50,7 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_platform.h
#if (defined __NetBSD__)
#undef KMP_OS_NETBSD
#define KMP_OS_NETBSD 1
@@ -79,12 +85,12 @@
@@ -78,12 +84,12 @@
#if (1 != \
KMP_OS_LINUX + KMP_OS_DRAGONFLY + KMP_OS_FREEBSD + KMP_OS_NETBSD + \
@ -65,11 +65,11 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_platform.h
#undef KMP_OS_UNIX
#define KMP_OS_UNIX 1
#endif
Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_runtime.cpp
Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_runtime.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/kmp_runtime.cpp
+++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_runtime.cpp
@@ -8076,7 +8076,7 @@ __kmp_determine_reduction_method(
--- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/kmp_runtime.cpp
+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/kmp_runtime.cpp
@@ -8092,7 +8092,7 @@ __kmp_determine_reduction_method(
#if KMP_ARCH_X86_64 || KMP_ARCH_PPC64 || KMP_ARCH_AARCH64 || KMP_ARCH_MIPS64
#if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \
@ -78,7 +78,7 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_runtime.cpp
int teamsize_cutoff = 4;
@@ -8104,7 +8104,7 @@ __kmp_determine_reduction_method(
@@ -8120,7 +8120,7 @@ __kmp_determine_reduction_method(
#elif KMP_ARCH_X86 || KMP_ARCH_ARM || KMP_ARCH_AARCH || KMP_ARCH_MIPS
@ -87,11 +87,11 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/kmp_runtime.cpp
// basic tuning
Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/z_Linux_util.cpp
Index: llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/z_Linux_util.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/openmp/runtime/src/z_Linux_util.cpp
+++ llvm-toolchain-8-8~+rc1/openmp/runtime/src/z_Linux_util.cpp
@@ -448,7 +448,7 @@ void __kmp_terminate_thread(int gtid) {
--- llvm-toolchain-snapshot_9~svn353038.orig/openmp/runtime/src/z_Linux_util.cpp
+++ llvm-toolchain-snapshot_9~svn353038/openmp/runtime/src/z_Linux_util.cpp
@@ -447,7 +447,7 @@ void __kmp_terminate_thread(int gtid) {
static kmp_int32 __kmp_set_stack_info(int gtid, kmp_info_t *th) {
int stack_data;
#if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \
@ -100,7 +100,7 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/z_Linux_util.cpp
pthread_attr_t attr;
int status;
size_t size = 0;
@@ -502,7 +502,7 @@ static void *__kmp_launch_worker(void *t
@@ -501,7 +501,7 @@ static void *__kmp_launch_worker(void *t
#endif /* KMP_BLOCK_SIGNALS */
void *exit_val;
#if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \
@ -109,7 +109,7 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/z_Linux_util.cpp
void *volatile padding = 0;
#endif
int gtid;
@@ -1772,7 +1772,7 @@ static int __kmp_get_xproc(void) {
@@ -1794,7 +1794,7 @@ static int __kmp_get_xproc(void) {
int r = 0;
#if KMP_OS_LINUX || KMP_OS_DRAGONFLY || KMP_OS_FREEBSD || KMP_OS_NETBSD || \
@ -118,7 +118,7 @@ Index: llvm-toolchain-8-8~+rc1/openmp/runtime/src/z_Linux_util.cpp
r = sysconf(_SC_NPROCESSORS_ONLN);
@@ -1967,7 +1967,7 @@ int __kmp_is_address_mapped(void *addr)
@@ -1989,7 +1989,7 @@ int __kmp_is_address_mapped(void *addr)
int found = 0;
int rc;

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-7-7.0.1/libcxx/src/thread.cpp
Index: llvm-toolchain-snapshot_9~svn353038/libcxx/src/thread.cpp
===================================================================
--- llvm-toolchain-7-7.0.1.orig/libcxx/src/thread.cpp
+++ llvm-toolchain-7-7.0.1/libcxx/src/thread.cpp
@@ -19,7 +19,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/libcxx/src/thread.cpp
+++ llvm-toolchain-snapshot_9~svn353038/libcxx/src/thread.cpp
@@ -18,7 +18,7 @@
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
# include <sys/param.h>

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/CMakeLists.txt
Index: llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/CMakeLists.txt
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/clang/lib/Driver/CMakeLists.txt
+++ llvm-toolchain-8-8~+rc1/clang/lib/Driver/CMakeLists.txt
--- llvm-toolchain-snapshot_9~svn353038.orig/clang/lib/Driver/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/CMakeLists.txt
@@ -49,6 +49,7 @@ add_clang_library(clangDriver
ToolChains/HIP.cpp
ToolChains/Hexagon.cpp
@ -10,11 +10,11 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/CMakeLists.txt
ToolChains/Linux.cpp
ToolChains/MipsLinux.cpp
ToolChains/MinGW.cpp
Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/Driver.cpp
Index: llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/Driver.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/clang/lib/Driver/Driver.cpp
+++ llvm-toolchain-8-8~+rc1/clang/lib/Driver/Driver.cpp
@@ -27,6 +27,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/clang/lib/Driver/Driver.cpp
+++ llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/Driver.cpp
@@ -26,6 +26,7 @@
#include "ToolChains/Haiku.h"
#include "ToolChains/Hexagon.h"
#include "ToolChains/Hurd.h"
@ -22,7 +22,7 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/Driver.cpp
#include "ToolChains/Lanai.h"
#include "ToolChains/Linux.h"
#include "ToolChains/MSP430.h"
@@ -4546,6 +4547,9 @@ const ToolChain &Driver::getToolChain(co
@@ -4562,6 +4563,9 @@ const ToolChain &Driver::getToolChain(co
case llvm::Triple::FreeBSD:
TC = llvm::make_unique<toolchains::FreeBSD>(*this, Target, Args);
break;
@ -32,11 +32,11 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/Driver.cpp
case llvm::Triple::Minix:
TC = llvm::make_unique<toolchains::Minix>(*this, Target, Args);
break;
Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/Clang.cpp
Index: llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/ToolChains/Clang.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/clang/lib/Driver/ToolChains/Clang.cpp
+++ llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/Clang.cpp
@@ -535,7 +535,7 @@ static bool useFramePointerForTargetByDe
--- llvm-toolchain-snapshot_9~svn353038.orig/clang/lib/Driver/ToolChains/Clang.cpp
+++ llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/ToolChains/Clang.cpp
@@ -534,7 +534,7 @@ static bool useFramePointerForTargetByDe
}
if (Triple.isOSLinux() || Triple.getOS() == llvm::Triple::CloudABI ||
@ -45,11 +45,11 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/Clang.cpp
switch (Triple.getArch()) {
// Don't use a frame pointer on linux if optimizing for certain targets.
case llvm::Triple::mips64:
Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/Gnu.cpp
Index: llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/ToolChains/Gnu.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/clang/lib/Driver/ToolChains/Gnu.cpp
+++ llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -522,6 +522,18 @@ void tools::gnutools::Linker::ConstructJ
--- llvm-toolchain-snapshot_9~svn353038.orig/clang/lib/Driver/ToolChains/Gnu.cpp
+++ llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/ToolChains/Gnu.cpp
@@ -521,6 +521,18 @@ void tools::gnutools::Linker::ConstructJ
CmdArgs.push_back("--wrap=pthread_create");
CmdArgs.push_back("-lc");
@ -68,7 +68,7 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/Gnu.cpp
// Add IAMCU specific libs, if needed.
if (IsIAMCU)
@@ -1898,7 +1910,8 @@ void Generic_GCC::GCCInstallationDetecto
@@ -1897,7 +1909,8 @@ void Generic_GCC::GCCInstallationDetecto
"x86_64-redhat-linux", "x86_64-suse-linux",
"x86_64-manbo-linux-gnu", "x86_64-linux-gnu",
"x86_64-slackware-linux", "x86_64-unknown-linux",
@ -78,7 +78,7 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/Gnu.cpp
static const char *const X32LibDirs[] = {"/libx32"};
static const char *const X86LibDirs[] = {"/lib32", "/lib"};
static const char *const X86Triples[] = {
@@ -1907,6 +1920,8 @@ void Generic_GCC::GCCInstallationDetecto
@@ -1906,6 +1919,8 @@ void Generic_GCC::GCCInstallationDetecto
"i586-redhat-linux", "i386-redhat-linux", "i586-suse-linux",
"i486-slackware-linux", "i686-montavista-linux", "i586-linux-gnu",
"i686-linux-android", "i386-gnu", "i486-gnu",
@ -87,10 +87,10 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/Gnu.cpp
"i586-gnu", "i686-gnu"};
static const char *const MIPSLibDirs[] = {"/lib"};
Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/KFreeBSD.cpp
Index: llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/ToolChains/KFreeBSD.cpp
===================================================================
--- /dev/null
+++ llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/KFreeBSD.cpp
+++ llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/ToolChains/KFreeBSD.cpp
@@ -0,0 +1,459 @@
+//===--- KFreeBSD.cpp - kFreeBSD ToolChain Implementations --------*- C++ -*-===//
+//
@ -551,10 +551,10 @@ Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/KFreeBSD.cpp
+ return Res;
+}
+
Index: llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/KFreeBSD.h
Index: llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/ToolChains/KFreeBSD.h
===================================================================
--- /dev/null
+++ llvm-toolchain-8-8~+rc1/clang/lib/Driver/ToolChains/KFreeBSD.h
+++ llvm-toolchain-snapshot_9~svn353038/clang/lib/Driver/ToolChains/KFreeBSD.h
@@ -0,0 +1,54 @@
+//===--- KFreeBSD.h - kFreeBSD ToolChain Implementations ----------*- C++ -*-===//
+//

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-7-7.0.1/unittests/ADT/TripleTest.cpp
Index: llvm-toolchain-snapshot_9~svn353038/unittests/ADT/TripleTest.cpp
===================================================================
--- llvm-toolchain-7-7.0.1.orig/unittests/ADT/TripleTest.cpp
+++ llvm-toolchain-7-7.0.1/unittests/ADT/TripleTest.cpp
@@ -99,6 +99,18 @@ TEST(TripleTest, ParsedIDs) {
--- llvm-toolchain-snapshot_9~svn353038.orig/unittests/ADT/TripleTest.cpp
+++ llvm-toolchain-snapshot_9~svn353038/unittests/ADT/TripleTest.cpp
@@ -98,6 +98,18 @@ TEST(TripleTest, ParsedIDs) {
EXPECT_EQ(Triple::Hurd, T.getOS());
EXPECT_EQ(Triple::GNU, T.getEnvironment());

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-8-8~+rc1/lib/Support/Triple.cpp
Index: llvm-toolchain-snapshot_9~svn353038/lib/Support/Triple.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/lib/Support/Triple.cpp
+++ llvm-toolchain-8-8~+rc1/lib/Support/Triple.cpp
@@ -182,7 +182,7 @@ StringRef Triple::getOSTypeName(OSType K
--- llvm-toolchain-snapshot_9~svn353038.orig/lib/Support/Triple.cpp
+++ llvm-toolchain-snapshot_9~svn353038/lib/Support/Triple.cpp
@@ -181,7 +181,7 @@ StringRef Triple::getOSTypeName(OSType K
case FreeBSD: return "freebsd";
case Fuchsia: return "fuchsia";
case IOS: return "ios";
@ -11,7 +11,7 @@ Index: llvm-toolchain-8-8~+rc1/lib/Support/Triple.cpp
case Linux: return "linux";
case Lv2: return "lv2";
case MacOSX: return "macosx";
@@ -479,7 +479,7 @@ static Triple::OSType parseOS(StringRef
@@ -478,7 +478,7 @@ static Triple::OSType parseOS(StringRef
.StartsWith("freebsd", Triple::FreeBSD)
.StartsWith("fuchsia", Triple::Fuchsia)
.StartsWith("ios", Triple::IOS)
@ -20,11 +20,11 @@ Index: llvm-toolchain-8-8~+rc1/lib/Support/Triple.cpp
.StartsWith("linux", Triple::Linux)
.StartsWith("lv2", Triple::Lv2)
.StartsWith("macos", Triple::MacOSX)
Index: llvm-toolchain-8-8~+rc1/lib/Support/Unix/Path.inc
Index: llvm-toolchain-snapshot_9~svn353038/lib/Support/Unix/Path.inc
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-8-8~+rc1/lib/Support/Unix/Path.inc
@@ -62,7 +62,7 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/lib/Support/Unix/Path.inc
+++ llvm-toolchain-snapshot_9~svn353038/lib/Support/Unix/Path.inc
@@ -61,7 +61,7 @@
#define FSTATVFS fstatvfs
#define STATVFS_F_FRSIZE(vfs) vfs.f_frsize
#else

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-8-8~+rc1/lib/Target/X86/X86Subtarget.cpp
Index: llvm-toolchain-snapshot_9~svn353038/lib/Target/X86/X86Subtarget.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/lib/Target/X86/X86Subtarget.cpp
+++ llvm-toolchain-8-8~+rc1/lib/Target/X86/X86Subtarget.cpp
@@ -284,7 +284,7 @@ void X86Subtarget::initSubtargetFeatures
--- llvm-toolchain-snapshot_9~svn353038.orig/lib/Target/X86/X86Subtarget.cpp
+++ llvm-toolchain-snapshot_9~svn353038/lib/Target/X86/X86Subtarget.cpp
@@ -283,7 +283,7 @@ void X86Subtarget::initSubtargetFeatures
if (StackAlignOverride)
stackAlignment = StackAlignOverride;
else if (isTargetDarwin() || isTargetLinux() || isTargetSolaris() ||
@ -11,11 +11,11 @@ Index: llvm-toolchain-8-8~+rc1/lib/Target/X86/X86Subtarget.cpp
stackAlignment = 16;
// Some CPUs have more overhead for gather. The specified overhead is relative
Index: llvm-toolchain-8-8~+rc1/lib/Target/X86/X86Subtarget.h
Index: llvm-toolchain-snapshot_9~svn353038/lib/Target/X86/X86Subtarget.h
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/lib/Target/X86/X86Subtarget.h
+++ llvm-toolchain-8-8~+rc1/lib/Target/X86/X86Subtarget.h
@@ -731,7 +731,7 @@ public:
--- llvm-toolchain-snapshot_9~svn353038.orig/lib/Target/X86/X86Subtarget.h
+++ llvm-toolchain-snapshot_9~svn353038/lib/Target/X86/X86Subtarget.h
@@ -730,7 +730,7 @@ public:
bool isTargetMachO() const { return TargetTriple.isOSBinFormatMachO(); }
bool isTargetLinux() const { return TargetTriple.isOSLinux(); }

View File

@ -1,8 +1,8 @@
Index: llvm-toolchain-8-8~+rc1/lldb/source/Host/freebsd/Host.cpp
Index: llvm-toolchain-snapshot_9~svn353038/lldb/source/Host/freebsd/Host.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/lldb/source/Host/freebsd/Host.cpp
+++ llvm-toolchain-8-8~+rc1/lldb/source/Host/freebsd/Host.cpp
@@ -11,6 +11,13 @@
--- llvm-toolchain-snapshot_9~svn353038.orig/lldb/source/Host/freebsd/Host.cpp
+++ llvm-toolchain-snapshot_9~svn353038/lldb/source/Host/freebsd/Host.cpp
@@ -10,6 +10,13 @@
#include <sys/types.h>
#include <sys/exec.h>

View File

@ -1,7 +1,21 @@
Index: llvm-toolchain-8-8~+rc1/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
Index: llvm-toolchain-snapshot_9~svn353038/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
+++ llvm-toolchain-8-8~+rc1/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
--- llvm-toolchain-snapshot_9~svn353038.orig/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
+++ llvm-toolchain-snapshot_9~svn353038/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread.cpp
@@ -8,7 +8,9 @@
#include <errno.h>
#include <pthread.h>
+#ifndef __FreeBSD_kernel__
#include <pthread_np.h>
+#endif
#include <stdlib.h>
#include <sys/sysctl.h>
#include <sys/types.h>
Index: llvm-toolchain-snapshot_9~svn353038/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
===================================================================
--- llvm-toolchain-snapshot_9~svn353038.orig/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+++ llvm-toolchain-snapshot_9~svn353038/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
@@ -9,7 +9,9 @@
#include <errno.h>
@ -12,17 +26,3 @@ Index: llvm-toolchain-8-8~+rc1/lldb/source/Plugins/Process/FreeBSD/FreeBSDThread
#include <stdlib.h>
#include <sys/sysctl.h>
#include <sys/types.h>
Index: llvm-toolchain-8-8~+rc1/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
+++ llvm-toolchain-8-8~+rc1/lldb/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
@@ -10,7 +10,9 @@
#include <errno.h>
#include <pthread.h>
+#ifndef __FreeBSD_kernel__
#include <pthread_np.h>
+#endif
#include <stdlib.h>
#include <sys/sysctl.h>
#include <sys/types.h>

View File

@ -1,7 +1,7 @@
Index: llvm-toolchain-8-8~+rc1/tools/llvm-shlib/CMakeLists.txt
Index: llvm-toolchain-snapshot_9~svn353038/tools/llvm-shlib/CMakeLists.txt
===================================================================
--- llvm-toolchain-8-8~+rc1.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-8-8~+rc1/tools/llvm-shlib/CMakeLists.txt
--- llvm-toolchain-snapshot_9~svn353038.orig/tools/llvm-shlib/CMakeLists.txt
+++ llvm-toolchain-snapshot_9~svn353038/tools/llvm-shlib/CMakeLists.txt
@@ -46,6 +46,7 @@ if(LLVM_BUILD_LLVM_DYLIB)
list(REMOVE_DUPLICATES LIB_NAMES)
if(("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") OR (MINGW) OR (HAIKU)