diff options
author | Ron Olson <tachoknight@gmail.com> | 2019-02-11 15:31:41 -0600 |
---|---|---|
committer | Ron Olson <tachoknight@gmail.com> | 2019-02-11 15:31:41 -0600 |
commit | 7478cc89e61125e8b67d703a5c35a5cbbb2a5702 (patch) | |
tree | a8dd9b123cbd9e80336db4350e90d8f42e371ea4 | |
parent | 09f5d757f9638a9995bf2b06e45f2c35f90a4fce (diff) | |
parent | 50cf076826f839d0e725f2ff72a41e5b08badfe5 (diff) | |
download | swift-lang-7478cc89e61125e8b67d703a5c35a5cbbb2a5702.tar.gz swift-lang-7478cc89e61125e8b67d703a5c35a5cbbb2a5702.tar.xz swift-lang-7478cc89e61125e8b67d703a5c35a5cbbb2a5702.zip |
Removed old patches, cleaned the place up a bit
-rw-r--r-- | clangloc.patch | 11 | ||||
-rw-r--r-- | compiler-rt-no-ustat.patch | 49 |
2 files changed, 11 insertions, 49 deletions
diff --git a/clangloc.patch b/clangloc.patch new file mode 100644 index 0000000..5892519 --- /dev/null +++ b/clangloc.patch @@ -0,0 +1,11 @@ +--- lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp.orig 2019-02-08 20:24:10.121192411 -0600 ++++ lldb/source/Plugins/ExpressionParser/Clang/ClangHost.cpp 2019-02-08 22:20:36.347687737 -0600 +@@ -34,7 +34,7 @@ + #else + static bool DefaultComputeClangDirectory(FileSpec &file_spec) { + return HostInfoPosix::ComputePathRelativeToLibrary( +- file_spec, "/lib/lldb/clang/"); ++ file_spec, "/swift/clang/"); + return HostInfoPosix::ComputePathRelativeToLibrary( + file_spec, (llvm::Twine("/lib") + CLANG_LIBDIR_SUFFIX + "/clang/" + + CLANG_VERSION_STRING) diff --git a/compiler-rt-no-ustat.patch b/compiler-rt-no-ustat.patch deleted file mode 100644 index 2499d66..0000000 --- a/compiler-rt-no-ustat.patch +++ /dev/null @@ -1,49 +0,0 @@ ---- compiler-rt-orig/lib/sanitizer_common/sanitizer_common_syscalls.inc 2018-05-21 10:41:12.089534263 -0500 -+++ compiler-rt/lib/sanitizer_common/sanitizer_common_syscalls.inc 2018-05-21 10:47:21.172510188 -0500 -@@ -923,16 +923,6 @@ - } - } - --#if !SANITIZER_ANDROID --PRE_SYSCALL(ustat)(long dev, void *ubuf) {} -- --POST_SYSCALL(ustat)(long res, long dev, void *ubuf) { -- if (res >= 0) { -- if (ubuf) POST_WRITE(ubuf, struct_ustat_sz); -- } --} --#endif // !SANITIZER_ANDROID -- - PRE_SYSCALL(stat64)(const void *filename, void *statbuf) { - if (filename) - PRE_READ(filename, -diff -Naur compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc ---- compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-05-21 10:41:12.080534263 -0500 -+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc 2018-05-21 10:45:29.503517472 -0500 -@@ -159,7 +159,6 @@ - # include <sys/procfs.h> - #endif - #include <sys/user.h> --#include <sys/ustat.h> - #include <linux/cyclades.h> - #include <linux/if_eql.h> - #include <linux/if_plip.h> -@@ -253,7 +252,6 @@ - #endif // SANITIZER_LINUX || SANITIZER_FREEBSD - - #if SANITIZER_LINUX && !SANITIZER_ANDROID -- unsigned struct_ustat_sz = sizeof(struct ustat); - unsigned struct_rlimit64_sz = sizeof(struct rlimit64); - unsigned struct_statvfs64_sz = sizeof(struct statvfs64); - #endif // SANITIZER_LINUX && !SANITIZER_ANDROID -diff -Naur compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.h compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h ---- compiler-rt-orig/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2018-05-21 10:41:12.081534263 -0500 -+++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h 2018-05-21 10:44:28.392521458 -0500 -@@ -197,7 +197,6 @@ - int v[10]; - }; - -- extern unsigned struct_ustat_sz; - extern unsigned struct_rlimit64_sz; - extern unsigned struct_statvfs64_sz; - |