Update patches

diff --git a/debian/patches/d-raise-min-llvm-version.patch b/debian/patches/d-raise-min-llvm-version.patch
deleted file mode 100644 (file)
index 14eaa86..0000000
--- a/debian/patches/d-raise-min-llvm-version.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Description: Raise LLVM min version for some tests
- According to the comments at the top of the files being patched, they require
- either LLVM 4.0 or Rust's patched LLVM. So just avoid them in Debian.
-Author: Ximin Luo <infinity0@debian.org>
-Forwarded: not-needed
----
---- a/src/test/codegen/mainsubprogram.rs
-+++ b/src/test/codegen/mainsubprogram.rs
-@@ -15,7 +15,7 @@
- // ignore-tidy-linelength
- // ignore-windows
- // ignore-macos
--// min-llvm-version 3.8
-+// min-llvm-version 4.0
- 
- // compile-flags: -g -C no-prepopulate-passes
- 
---- a/src/test/codegen/mainsubprogramstart.rs
-+++ b/src/test/codegen/mainsubprogramstart.rs
-@@ -15,7 +15,7 @@
- // ignore-tidy-linelength
- // ignore-windows
- // ignore-macos
--// min-llvm-version 3.8
-+// min-llvm-version 4.0
- 
- // compile-flags: -g -C no-prepopulate-passes
- 

diff --git a/debian/patches/series b/debian/patches/series
index ff0a03e00674f0a2cd0984232c789a98ffc18eff..30e784e1bf726238b2464e22e89b3b7b135484fa 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,7 +2,6 @@
 
 # pending, forwarded
 u-sparc64-detection.patch
-u-sparc64-detection-2.patch
 u-gperf-3.1.patch
 u-reproducible-build.patch
 u-ignoretest-armhf_01.patch
@@ -13,7 +12,6 @@ u-ignoretest-armhf_06.patch
 u-ignoretest-arm64.patch
 u-ignoretest-ppc64el.patch
 u-ignoretest-ppc64el_02.patch
-u-cross-compile-install.patch
 u-prefer-local-css.patch
 u-make-tests-work-without-rpath.patch
 
@@ -23,7 +21,6 @@ u-reproducible-dl-stage0.patch
 gcc-4.8-aarch64-ice.diff
 
 # Debian-specific patches, not suitable for upstream
-d-raise-min-llvm-version.patch
 d-disable-cargo-vendor.patch
 d-rust-gdb-paths
 d-rust-lldb-paths

diff --git a/debian/patches/u-cross-compile-install.patch b/debian/patches/u-cross-compile-install.patch
deleted file mode 100644 (file)
index baefa8f..0000000
--- a/debian/patches/u-cross-compile-install.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Fix cross-compile install
-Author: Ximin Luo <infinity0@debian.org>
-Bug: https://github.com/rust-lang/rust/pull/45322
-----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/bootstrap/install.rs
-+++ b/src/bootstrap/install.rs
-@@ -175,10 +175,12 @@
-         install_docs(builder, self.stage, self.target);
-     };
-     Std, "src/libstd", true, only_hosts: true, {
--        builder.ensure(dist::Std {
--            compiler: builder.compiler(self.stage, self.host),
--            target: self.target
--        });
-+        for target in &builder.build.targets {
-+            builder.ensure(dist::Std {
-+                compiler: builder.compiler(self.stage, self.host),
-+                target: *target
-+            });
-+        }
-         install_std(builder, self.stage);
-     };
-     Cargo, "cargo", _config.extended, only_hosts: true, {

diff --git a/debian/patches/u-sparc64-detection-2.patch b/debian/patches/u-sparc64-detection-2.patch
deleted file mode 100644 (file)
index 3250a81..0000000
--- a/debian/patches/u-sparc64-detection-2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-commit d7dec7c8d71b30fea6e4c5aca40adce1724ba87d
-Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-Date:   Sun Oct 29 23:51:14 2017 +0100
-
-    bootstrap: Add missing cputype matching for sparc64
-
---- a/src/bootstrap/bootstrap.py
-+++ b/src/bootstrap/bootstrap.py
-@@ -294,7 +294,7 @@
-             raise ValueError('unknown byteorder: {}'.format(sys.byteorder))
-         # only the n64 ABI is supported, indicate it
-         ostype += 'abi64'
--    elif cputype == 'sparcv9':
-+    elif cputype == 'sparcv9' or cputype == 'sparc64':
-         pass
-     else:
-         err = "unknown cpu type: {}".format(cputype)

diff --git a/debian/patches/u-sparc64-detection.patch b/debian/patches/u-sparc64-detection.patch
index 862d84f8d6660a03cf7bbbb07fa8ae5c5798a266..99808a87b2cf2c3f2f9c41fc2471203532f0b9f3 100644 (file)
--- a/debian/patches/u-sparc64-detection.patch
+++ b/debian/patches/u-sparc64-detection.patch
@@ -2,16 +2,6 @@ Description: Add/fix detection for sparc64
  Already applied upstream in various places
 Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
 
---- a/src/bootstrap/native.rs
-+++ b/src/bootstrap/native.rs
-@@ -419,6 +419,7 @@
-             "powerpc64-unknown-linux-gnu" => "linux-ppc64",
-             "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
-             "s390x-unknown-linux-gnu" => "linux64-s390x",
-+            "sparc64-unknown-linux-gnu" => "linux64-sparcv9",
-             "sparc64-unknown-netbsd" => "BSD-sparc64",
-             "x86_64-apple-darwin" => "darwin64-x86_64-cc",
-             "x86_64-linux-android" => "linux-x86_64",
 --- a/src/libcompiler_builtins/compiler-rt/lib/builtins/int_lib.h
 +++ b/src/libcompiler_builtins/compiler-rt/lib/builtins/int_lib.h
 @@ -86,7 +86,7 @@
@@ -23,13 +13,3 @@ Author: John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
                || (defined(_MIPS_SIM) && ((_MIPS_SIM == _ABI64) || (_MIPS_SIM == _ABIO64))))
  si_int __clzsi2(si_int);
  si_int __ctzsi2(si_int);
---- a/src/vendor/cc/src/lib.rs
-+++ b/src/vendor/cc/src/lib.rs
-@@ -1343,6 +1343,7 @@
-                         "powerpc64-unknown-linux-gnu" => Some("powerpc-linux-gnu"),
-                         "powerpc64le-unknown-linux-gnu" => Some("powerpc64le-linux-gnu"),
-                         "s390x-unknown-linux-gnu" => Some("s390x-linux-gnu"),
-+                        "sparc64-unknown-linux-gnu" => Some("sparc64-linux-gnu"),
-                         "sparc64-unknown-netbsd" => Some("sparc64--netbsd"),
-                         "sparcv9-sun-solaris" => Some("sparcv9-sun-solaris"),
-                         "thumbv6m-none-eabi" => Some("arm-none-eabi"),