Apparently the upstream ones are not necessary

diff --git a/debian/changelog b/debian/changelog
index 3d4b8cee83155b8426b98c723342ac4affa6e082..5c5cfa9a8f96f58d61aec996d5bbddec524254d0 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,6 @@
 rustc (1.25.0+dfsg1-2) UNRELEASED; urgency=medium
 
-  * Add patches from LLVM's compiler-rt to fix bugs on sparc64 and mips64.
+  * Add patches for LLVM's compiler-rt to fix bugs on sparc64 and mips64.
     (Closes: #898982)
 
  -- Ximin Luo <infinity0@debian.org>  Fri, 18 May 2018 01:51:32 -0700

diff --git a/debian/patches/D42902.diff b/debian/patches/D42902.diff
deleted file mode 100644 (file)
index 5444041..0000000
--- a/debian/patches/D42902.diff
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/src/libcompiler_builtins/compiler-rt/lib/builtins/clzdi2.c
-+++ b/src/libcompiler_builtins/compiler-rt/lib/builtins/clzdi2.c
-@@ -16,6 +16,12 @@
- 
- /* Returns: the number of leading 0-bits */
- 
-+#if !defined(__clang__) && (defined(__sparc64__) || defined(__mips64) || defined(__riscv__))
-+/* gcc resolves __builtin_clz -> __clzdi2 leading to infinite recursion */
-+#define __builtin_clz(a) __clzsi2(a)
-+extern si_int __clzsi2(si_int);
-+#endif
-+
- /* Precondition: a != 0 */
- 
- COMPILER_RT_ABI si_int
---- a/src/libcompiler_builtins/compiler-rt/lib/builtins/ctzdi2.c
-+++ b/src/libcompiler_builtins/compiler-rt/lib/builtins/ctzdi2.c
-@@ -16,6 +16,12 @@
- 
- /* Returns: the number of trailing 0-bits  */
- 
-+#if !defined(__clang__) && (defined(__sparc64__) || defined(__mips64) || defined(__riscv__))
-+/* gcc resolves __builtin_ctz -> __ctzdi2 leading to infinite recursion */
-+#define __builtin_ctz(a) __ctzsi2(a)
-+extern si_int __ctzsi2(si_int);
-+#endif
-+
- /* Precondition: a != 0 */
- 
- COMPILER_RT_ABI si_int

diff --git a/debian/patches/D43146.diff b/debian/patches/D43146.diff
deleted file mode 100644 (file)
index 89c6f2e..0000000
--- a/debian/patches/D43146.diff
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/src/libcompiler_builtins/compiler-rt/lib/builtins/clzdi2.c
-+++ b/src/libcompiler_builtins/compiler-rt/lib/builtins/clzdi2.c
-@@ -16,8 +16,13 @@
- 
- /* Returns: the number of leading 0-bits */
- 
--#if !defined(__clang__) && (defined(__sparc64__) || defined(__mips64) || defined(__riscv__))
--/* gcc resolves __builtin_clz -> __clzdi2 leading to infinite recursion */
-+#if !defined(__clang__) \
-+    && ((defined(__sparc__) && defined(__arch64__)) \
-+        || defined(__mips64) \
-+        || (defined(__riscv) && __SIZEOF_POINTER__ >= 8))
-+/* On 64-bit architectures with neither a native clz instruction nor a native
-+ * ctz instruction, gcc resolves __builtin_clz to __clzdi2 rather than
-+ * __clzsi2, leading to infinite recursion. */
- #define __builtin_clz(a) __clzsi2(a)
- extern si_int __clzsi2(si_int);
- #endif
---- a/src/libcompiler_builtins/compiler-rt/lib/builtins/ctzdi2.c
-+++ b/src/libcompiler_builtins/compiler-rt/lib/builtins/ctzdi2.c
-@@ -16,8 +16,13 @@
- 
- /* Returns: the number of trailing 0-bits  */
- 
--#if !defined(__clang__) && (defined(__sparc64__) || defined(__mips64) || defined(__riscv__))
--/* gcc resolves __builtin_ctz -> __ctzdi2 leading to infinite recursion */
-+#if !defined(__clang__) \
-+    && ((defined(__sparc__) && defined(__arch64__)) \
-+        || defined(__mips64) \
-+        || (defined(__riscv) && __SIZEOF_POINTER__ >= 8))
-+/* On 64-bit architectures with neither a native clz instruction nor a native
-+ * ctz instruction, gcc resolves __builtin_ctz to __ctzdi2 rather than
-+ * __ctzsi2, leading to infinite recursion. */
- #define __builtin_ctz(a) __ctzsi2(a)
- extern si_int __ctzsi2(si_int);
- #endif

diff --git a/debian/patches/series b/debian/patches/series
index 3ac6c3ec441622eef66a1aaf7178d9396ade0448..968c243403fb3117691517365e84a9a553e9d3af 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,8 +17,6 @@ u-make-tests-work-without-rpath.patch
 
 # https://github.com/rust-lang/compiler-rt/pull/35/
 u-compiler-rt.patch
-D42902.diff
-D43146.diff
 
 # not forwarded, or forwarded but unlikely to be merged
 u-reproducible-dl-stage0.patch