u-sparc64-detection

Gbp-Pq: Name u-sparc64-detection.patch

diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs
index 8429b64513dcf354f1df0de2d91d245a4a32c26d..5967b654c6a925269c9c38e621e0d351f52c1694 100644 (file)
--- a/src/bootstrap/native.rs
+++ b/src/bootstrap/native.rs
@@ -415,6 +415,7 @@ impl Step for Openssl {
             "powerpc64-unknown-linux-gnu" => "linux-ppc64",
             "powerpc64le-unknown-linux-gnu" => "linux-ppc64le",
             "s390x-unknown-linux-gnu" => "linux64-s390x",
+            "sparc64-unknown-linux-gnu" => "linux64-sparcv9",
             "x86_64-apple-darwin" => "darwin64-x86_64-cc",
             "x86_64-linux-android" => "linux-x86_64",
             "x86_64-unknown-freebsd" => "BSD-x86_64",

diff --git a/src/libcompiler_builtins/compiler-rt/lib/builtins/int_lib.h b/src/libcompiler_builtins/compiler-rt/lib/builtins/int_lib.h
index c773c390ec4d5e52a222be548f3c64c6f45eeb95..5081f80986e64c4d68e039fb04e296e695cf0d38 100644 (file)
--- 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 @@
  * Presumably it's any version of GCC, and targeting an arch that
  * does not have dedicated bit counting instructions.
  */
-#if (defined(__sparc64__) || defined(__sparcv9) || defined(__mips_n64) || defined(__mips_o64) || defined(__riscv__) \
+#if ((defined(__sparc__) && defined(__arch64__)) || defined(__mips_n64) || defined(__mips_o64) || defined(__riscv__) \
                || (defined(_MIPS_SIM) && ((_MIPS_SIM == _ABI64) || (_MIPS_SIM == _ABIO64))))
 si_int __clzsi2(si_int);
 si_int __ctzsi2(si_int);

diff --git a/src/vendor/gcc/src/lib.rs b/src/vendor/gcc/src/lib.rs
index 16ab426c0e9543785a5e0cde916ea581c2e0c840..392e9eba0ac10bd4066aad1e42445cb88c9251d5 100644 (file)
--- a/src/vendor/gcc/src/lib.rs
+++ b/src/vendor/gcc/src/lib.rs
@@ -976,6 +976,7 @@ impl Config {
                         "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"),