Added patch for clang 9; removed old, unnecessary patch filesswift-5.1

4 files changed, 18 insertions, 100 deletions

diff --git a/compiler-rt-sanitizer.patch b/compiler-rt-sanitizer.patch
new file mode 100644
index 0000000..bf8df64
--- /dev/null
+++ b/compiler-rt-sanitizer.patch
@@ -0,0 +1,11 @@
+--- compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc.orig	2019-10-30 12:10:54.591060832 -0500
++++ compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cc	2019-10-30 12:11:56.483063580 -0500
+@@ -1131,7 +1131,7 @@
+ CHECK_SIZE_AND_OFFSET(ipc_perm, cgid);
+ #if !defined(__aarch64__) || !SANITIZER_LINUX || __GLIBC_PREREQ (2, 21)
+ /* On aarch64 glibc 2.20 and earlier provided incorrect mode field.  */
+-CHECK_SIZE_AND_OFFSET(ipc_perm, mode);
++/* CHECK_SIZE_AND_OFFSET(ipc_perm, mode); */ /* Error with clang 9.0.0 */
+ #endif
+ 
+ CHECK_TYPE_SIZE(shmid_ds);
diff --git a/no-inplace-copy.patch b/no-inplace-copy.patch
deleted file mode 100644
index 585293b..0000000
--- a/no-inplace-copy.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- swift-corelibs-xctest/cmake/modules/SwiftSupport.cmake.orig	2019-03-22 13:10:16.930540857 -0500
-+++ swift-corelibs-xctest/cmake/modules/SwiftSupport.cmake	2019-03-22 15:48:46.960621151 -0500
-@@ -139,12 +139,6 @@
-                          ${CMAKE_COMMAND} -E make_directory ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources
-                        COMMAND
-                          ${CMAKE_COMMAND} -E copy ${AST_RESOURCES} ${CMAKE_CURRENT_BINARY_DIR}/${target}/Resources)
--  else()
--    add_custom_command(TARGET
--                         ${target}
--                       POST_BUILD
--                       COMMAND
--                         ${CMAKE_COMMAND} -E copy ${AST_OUTPUT} ${CMAKE_CURRENT_BINARY_DIR})
-   endif()
- endfunction()
- 
diff --git a/nosysstat.patch b/nosysstat.patch
deleted file mode 100644
index 583a00f..0000000
--- a/nosysstat.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -Naur swift-corelibs-libdispatch-orig/src/internal.h swift-corelibs-libdispatch/src/internal.h
---- swift-corelibs-libdispatch-orig/src/internal.h	2019-06-27 12:49:01.388123795 -0500
-+++ swift-corelibs-libdispatch/src/internal.h	2019-06-27 12:50:35.349814203 -0500
-@@ -272,8 +272,6 @@
- #include <sys/mount.h>
- #ifdef __ANDROID__
- #include <linux/sysctl.h>
--#else
--#include <sys/sysctl.h>
- #endif /* __ANDROID__ */
- #if !defined(__linux__)
- #include <sys/queue.h>
-diff -Naur swift-corelibs-libdispatch-orig/tests/dispatch_apply.c swift-corelibs-libdispatch/tests/dispatch_apply.c
---- swift-corelibs-libdispatch-orig/tests/dispatch_apply.c	2019-06-27 12:49:01.445126034 -0500
-+++ swift-corelibs-libdispatch/tests/dispatch_apply.c	2019-06-27 12:51:52.294836266 -0500
-@@ -24,8 +24,6 @@
- #include <unistd.h>
- #ifdef __ANDROID__
- #include <linux/sysctl.h>
--#else
--#include <sys/sysctl.h>
- #endif /* __ANDROID__ */
- #endif
- #include <stdlib.h>
-diff -Naur swift-corelibs-libdispatch-orig/tests/dispatch_concur.c swift-corelibs-libdispatch/tests/dispatch_concur.c
---- swift-corelibs-libdispatch-orig/tests/dispatch_concur.c	2019-06-27 12:49:01.447126112 -0500
-+++ swift-corelibs-libdispatch/tests/dispatch_concur.c	2019-06-27 12:52:17.319819139 -0500
-@@ -27,8 +27,6 @@
- #include <unistd.h>
- #ifdef __ANDROID__
- #include <linux/sysctl.h>
--#else
--#include <sys/sysctl.h>
- #endif /* __ANDROID__ */
- #endif
- 
-diff -Naur swift-corelibs-libdispatch-orig/tests/dispatch_priority.c swift-corelibs-libdispatch/tests/dispatch_priority.c
---- swift-corelibs-libdispatch-orig/tests/dispatch_priority.c	2019-06-27 12:49:01.440125837 -0500
-+++ swift-corelibs-libdispatch/tests/dispatch_priority.c	2019-06-27 12:52:46.401961354 -0500
-@@ -25,8 +25,6 @@
- #include <unistd.h>
- #ifdef __ANDROID__
- #include <linux/sysctl.h>
--#else
--#include <sys/sysctl.h>
- #endif /* __ANDROID__ */
- #endif
- #include <stdlib.h>
-diff -Naur swift-corelibs-libdispatch-orig/tests/dispatch_readsync.c swift-corelibs-libdispatch/tests/dispatch_readsync.c
---- swift-corelibs-libdispatch-orig/tests/dispatch_readsync.c	2019-06-27 12:49:01.427125327 -0500
-+++ swift-corelibs-libdispatch/tests/dispatch_readsync.c	2019-06-27 12:53:14.563067393 -0500
-@@ -25,8 +25,6 @@
- #include <unistd.h>
- #ifdef __ANDROID__
- #include <linux/sysctl.h>
--#else
--#include <sys/sysctl.h>
- #endif /* __ANDROID__ */
- #endif
- #include <assert.h>
-diff -Naur swift-corelibs-libdispatch-orig/tests/dispatch_vm.c swift-corelibs-libdispatch/tests/dispatch_vm.c
---- swift-corelibs-libdispatch-orig/tests/dispatch_vm.c	2019-06-27 12:49:01.433125562 -0500
-+++ swift-corelibs-libdispatch/tests/dispatch_vm.c	2019-06-27 12:53:36.289920732 -0500
-@@ -30,8 +30,6 @@
- #include <assert.h>
- #ifdef __ANDROID__
- #include <linux/sysctl.h>
--#else
--#include <sys/sysctl.h>
- #endif /* __ANDROID__ */
- #include <stdarg.h>
- #include <time.h>
-diff -Naur swift-corelibs-libdispatch-orig/tests/Foundation/bench.mm swift-corelibs-libdispatch/tests/Foundation/bench.mm
---- swift-corelibs-libdispatch-orig/tests/Foundation/bench.mm	2019-06-27 12:49:01.448126151 -0500
-+++ swift-corelibs-libdispatch/tests/Foundation/bench.mm	2019-06-27 12:51:14.199340039 -0500
-@@ -22,8 +22,6 @@
- #include <libkern/OSAtomic.h>
- #ifdef __ANDROID__
- #include <linux/sysctl.h>
--#else
--#include <sys/sysctl.h>
- #endif /* __ANDROID__ */
- #include <mach/mach.h>
- #include <mach/mach_time.h>
diff --git a/swift-lang.spec b/swift-lang.spec
index 150fdbb..f6ee58b 100644
--- a/swift-lang.spec
+++ b/swift-lang.spec
@@ -8,7 +8,7 @@
 
 Name:		swift-lang
 Version:        5.1.1
-Release:        0.2.%{swiftgitdate}git%{swiftgithash}%{?dist}
+Release:        0.3.%{swiftgitdate}git%{swiftgithash}%{?dist}
 Summary:        Apple's Swift programming language
 License:        ASL 2.0
 URL:            https://swift.org
@@ -36,6 +36,7 @@ Patch4:		swift-unwrapped.patch
 Patch5:		python3.patch
 Patch6:		linux-tests-python-3.patch
 Patch7:		lldb_python38_platform.patch
+Patch8:		compiler-rt-sanitizer.patch
 
 BuildRequires:  clang
 BuildRequires:  cmake
@@ -133,6 +134,9 @@ mv swift-xcode-playground-support-swift-%{swifttag} swift-xcode-playground-suppo
 %patch6 -p0
 %patch7 -p0
 
+# New in Clang 9 is an assertion error of an array declared with a negative size
+%patch8 -p0
+
 
 %build
 export VERBOSE=1
@@ -250,6 +254,8 @@ install -m 0644 %{_builddir}/usr/share/man/man1/swift.1 %{buildroot}%{_mandir}/m
 
 
 %changelog
+* Wed Oct 30 2019 Ron Olson <tachoknight@gmail.com> 5.1.1-0.3.20191004git4242edd
+- Clang 9 was causing compiler-rt to not build properly due to a macro. 
 * Thu Oct 17 2019 Ron Olson <tachoknight@gmail.com> 5.1.1-0.2.20191004git4242edd
 - Fixed issue with installing swift-lang only gave the option for
   swift-lang-runtime