patches applied upstream or rebased

debian/patches/27-fix_clang_stdint.diff

@@ -1,29 +0,0 @@
-Index: llvm-toolchain-snapshot_5.0~svn301630/clang/lib/Headers/stdint.h
-===================================================================
---- llvm-toolchain-snapshot_5.0~svn301630.orig/clang/lib/Headers/stdint.h
-+++ llvm-toolchain-snapshot_5.0~svn301630/clang/lib/Headers/stdint.h
-@@ -22,8 +22,6 @@
-  *
- \*===----------------------------------------------------------------------===*/
- 
--#ifndef __CLANG_STDINT_H
--#define __CLANG_STDINT_H
- 
- /* If we're hosted, fall back to the system's stdint.h, which might have
-  * additional definitions.
-@@ -72,6 +70,8 @@
- # endif
- 
- #else
-+#ifndef __CLANG_STDINT_H
-+#define __CLANG_STDINT_H
- 
- /* C99 7.18.1.1 Exact-width integer types.
-  * C99 7.18.1.2 Minimum-width integer types.
-@@ -700,5 +700,5 @@ typedef __UINTMAX_TYPE__ uintmax_t;
- #define  INTMAX_C(v) __int_c(v,  __INTMAX_C_SUFFIX__)
- #define UINTMAX_C(v) __int_c(v, __UINTMAX_C_SUFFIX__)
- 
--#endif /* __STDC_HOSTED__ */
- #endif /* __CLANG_STDINT_H */
-+#endif /* __STDC_HOSTED__ */

debian/patches/bootstrap-fix-include-next.diff

@@ -1,41 +0,0 @@
-When doing a bootstrap, we use a newly built clang.
-When this one is used, if already installed on the system,
-we have clang header in two places:
-llvm-toolchain-7-7/build-llvm/lib/clang/7.0.0/include/inttypes.h
-and
-/usr/include/clang/7.0.0/include/inttypes.h
-
-Because clang expects only one of his headers to be available, it uses
-include_next to get the glibc (libc6-dev package) header.
-
-However, in the previous example, because we have inttypes.h twice in the
-include search path, clang's header will call itself without any effect.
-Therefore, it will do include_next until the define from the libc is existing (ex: _INTTYPES_H)
-
-
-Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Headers/inttypes.h
-===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Headers/inttypes.h
-+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Headers/inttypes.h
-@@ -20,7 +20,7 @@
-  *
- \*===----------------------------------------------------------------------===*/
- 
--#ifndef __CLANG_INTTYPES_H
-+#if !defined(__CLANG_INTTYPES_H) || !defined(_INTTYPES_H)
- #define __CLANG_INTTYPES_H
- 
- #if defined(_MSC_VER) && _MSC_VER < 1800
-Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Headers/limits.h
-===================================================================
---- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Headers/limits.h
-+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Headers/limits.h
-@@ -22,7 +22,7 @@
-  *
- \*===----------------------------------------------------------------------===*/
- 
--#ifndef __CLANG_LIMITS_H
-+#if !defined(__CLANG_LIMITS_H) || !defined(_LIBC_LIMITS_H_)
- #define __CLANG_LIMITS_H
- 
- /* The system's limits.h may, in turn, try to #include_next GCC's limits.h.

debian/patches/remove-apple-clang-manpage.diff

@@ -1,7 +1,7 @@
-Index: llvm-toolchain-snapshot_9~svn362241/clang/docs/CommandGuide/clang.rst
+Index: llvm-toolchain-snapshot_9~svn364042/clang/docs/CommandGuide/clang.rst
 ===================================================================
---- llvm-toolchain-snapshot_9~svn362241.orig/clang/docs/CommandGuide/clang.rst
+--- llvm-toolchain-snapshot_9~svn364042.orig/clang/docs/CommandGuide/clang.rst
-+++ llvm-toolchain-snapshot_9~svn362241/clang/docs/CommandGuide/clang.rst
++++ llvm-toolchain-snapshot_9~svn364042/clang/docs/CommandGuide/clang.rst
 @@ -310,20 +310,10 @@ Clang fully supports cross compilation a
  Depending on how your version of Clang is configured, it may have support for a
  number of cross compilers, or may only support a native target.
@@ -21,10 +21,10 @@ Index: llvm-toolchain-snapshot_9~svn362241/clang/docs/CommandGuide/clang.rst
 -  When building for iPhone OS, specify the minimum version supported by your
 -  application.
 -
- .. option:: -march=<cpu>
+ .. option:: --print-supported-cpus
  
-   Specify that Clang should generate code for a specific processor family
+   Print out a list of supported processors for the given target (specified
-@@ -616,11 +606,6 @@ ENVIRONMENT
+@@ -622,11 +612,6 @@ ENVIRONMENT
    These environment variables specify additional paths, as for :envvar:`CPATH`, which are
    only used when processing the appropriate language.
  

debian/patches/series

@@ -7,7 +7,6 @@ clang-analyzer-force-version.diff
 # Disabling features
 23-strlcpy_strlcat_warning_removed.diff
 
-27-fix_clang_stdint.diff
 declare_clear_cache.diff
 unwind-chain-inclusion.diff
 atomic_library_1.diff
@@ -90,7 +89,6 @@ disable-sse2-old-x86.diff
 clang-arm-default-vfp3-on-armv7a.patch
 
 # For the bootstrap
-bootstrap-fix-include-next.diff
 clangd-atomic-cmake.patch
 
 # Fix docs