Backport upstream patch for arm64

diff --git a/debian/patches/series b/debian/patches/series
index e70ee933a4e61722964068f3ab88621cf2b42fbb..82a82b0d70ab6be293f2f30a45fc3143033cf2eb 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,6 +15,7 @@ u-ignoretest-ppc64el_02.patch
 u-prefer-local-css.patch
 u-make-tests-work-without-rpath.patch
 u-fix-rustdoc-theme-test-without-rpath.patch
+u-fix-fp-target-warning.patch
 
 # https://github.com/rust-lang/compiler-rt/pull/35/
 u-compiler-rt.patch

diff --git a/debian/patches/u-fix-fp-target-warning.patch b/debian/patches/u-fix-fp-target-warning.patch
new file mode 100644 (file)
index 0000000..9865ef6
--- /dev/null
+++ b/debian/patches/u-fix-fp-target-warning.patch
@@ -0,0 +1,21 @@
+From 5e5374677a642994da2f5c12148abc5f104320e0 Mon Sep 17 00:00:00 2001
+From: Amanieu d'Antras <amanieu@gmail.com>
+Date: Tue, 10 Apr 2018 22:34:15 +0100
+Subject: [PATCH] Fix "fp" feature for AArch64
+
+---
+ src/librustc_trans/llvm_util.rs | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/librustc_trans/llvm_util.rs b/src/librustc_trans/llvm_util.rs
+index 1c8f09ce7b3f..ad128516a3af 100644
+--- a/src/librustc_trans/llvm_util.rs
++++ b/src/librustc_trans/llvm_util.rs
+@@ -134,6 +134,7 @@ pub fn to_llvm_feature<'a>(sess: &Session, s: &'a str) -> &'a str {
+         ("x86", "pclmulqdq") => "pclmul",
+         ("x86", "rdrand") => "rdrnd",
+         ("x86", "bmi1") => "bmi",
++        ("aarch64", "fp") => "fp-armv8",
+         ("aarch64", "fp16") => "fullfp16",
+         (_, s) => s,
+     }