From 2ab4a7efa8336c6130064fa139a0ca28e80185b8 Mon Sep 17 00:00:00 2001 From: Rust Maintainers Date: Mon, 18 Dec 2017 18:46:25 +0000 Subject: [PATCH] u-sparc64-detection Gbp-Pq: Name u-sparc64-detection.patch --- src/bootstrap/native.rs | 1 + src/libcompiler_builtins/compiler-rt/lib/builtins/int_lib.h | 2 +- src/vendor/cc/src/lib.rs | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index c4e8063031..3f1d1a06bc 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -419,6 +419,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", "sparc64-unknown-netbsd" => "BSD-sparc64", "x86_64-apple-darwin" => "darwin64-x86_64-cc", "x86_64-linux-android" => "linux-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 c773c390ec..5081f80986 100644 --- 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/cc/src/lib.rs b/src/vendor/cc/src/lib.rs index ac966b4e54..f6769949c2 100644 --- a/src/vendor/cc/src/lib.rs +++ b/src/vendor/cc/src/lib.rs @@ -1343,6 +1343,7 @@ impl Build { "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"), -- 2.30.2