From a895d438c251886666c979b1c68ed63fd357d03a Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 17 Feb 2018 15:29:11 +0100 Subject: [PATCH 1/4] bootstrap: Add missing cputype matching for sparc --- src/bootstrap/bootstrap.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bootstrap/bootstrap.py b/src/bootstrap/bootstrap.py index 603a97ddfd412..5966bb65df9c8 100644 --- a/src/bootstrap/bootstrap.py +++ b/src/bootstrap/bootstrap.py @@ -294,7 +294,7 @@ def default_build_triple(): raise ValueError('unknown byteorder: {}'.format(sys.byteorder)) # only the n64 ABI is supported, indicate it ostype += 'abi64' - elif cputype == 'sparcv9' or cputype == 'sparc64': + elif cputype == 'sparc' or cputype == 'sparcv9' or cputype == 'sparc64': pass else: err = "unknown cpu type: {}".format(cputype) From 871e82e7a48f7ea0c08a30276c9be6f1cfcec087 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 17 Feb 2018 15:31:43 +0100 Subject: [PATCH 2/4] bootstrap: Add openssl configuration for sparc-unknown-linux-gnu --- src/bootstrap/native.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 29cd23bdbb197..b1528059e72cc 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -483,6 +483,7 @@ impl Step for Openssl { "powerpc64-unknown-linux-gnu" => "linux-ppc64", "powerpc64le-unknown-linux-gnu" => "linux-ppc64le", "s390x-unknown-linux-gnu" => "linux64-s390x", + "sparc-unknown-linux-gnu" => "linux-sparcv9", "sparc64-unknown-linux-gnu" => "linux64-sparcv9", "sparc64-unknown-netbsd" => "BSD-sparc64", "x86_64-apple-darwin" => "darwin64-x86_64-cc", From 100469f4e941037178c64c365b62efa856c0188a Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Sat, 17 Feb 2018 15:48:05 +0100 Subject: [PATCH 3/4] librustc_back: Add support for sparc-linux-gnu --- src/librustc_back/target/mod.rs | 1 + .../target/sparc_unknown_linux_gnu.rs | 34 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 src/librustc_back/target/sparc_unknown_linux_gnu.rs diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index 2872c59157d6b..1ea23c1ea9ca6 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -146,6 +146,7 @@ supported_targets! { ("powerpc64-unknown-linux-gnu", powerpc64_unknown_linux_gnu), ("powerpc64le-unknown-linux-gnu", powerpc64le_unknown_linux_gnu), ("s390x-unknown-linux-gnu", s390x_unknown_linux_gnu), + ("sparc-unknown-linux-gnu", sparc_unknown_linux_gnu), ("sparc64-unknown-linux-gnu", sparc64_unknown_linux_gnu), ("arm-unknown-linux-gnueabi", arm_unknown_linux_gnueabi), ("arm-unknown-linux-gnueabihf", arm_unknown_linux_gnueabihf), diff --git a/src/librustc_back/target/sparc_unknown_linux_gnu.rs b/src/librustc_back/target/sparc_unknown_linux_gnu.rs new file mode 100644 index 0000000000000..a03e6937b2ca7 --- /dev/null +++ b/src/librustc_back/target/sparc_unknown_linux_gnu.rs @@ -0,0 +1,34 @@ +// Copyright 2018 The Rust Project Developers. See the COPYRIGHT +// file at the top-level directory of this distribution and at +// http://rust-lang.org/COPYRIGHT. +// +// Licensed under the Apache License, Version 2.0 or the MIT license +// , at your +// option. This file may not be copied, modified, or distributed +// except according to those terms. + +use LinkerFlavor; +use target::{Target, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::linux_base::opts(); + base.cpu = "v9".to_string(); + base.max_atomic_width = Some(64); + base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-mv8plus".to_string()); + base.exe_allocation_crate = None; + + Ok(Target { + llvm_target: "sparc-unknown-linux-gnu".to_string(), + target_endian: "big".to_string(), + target_pointer_width: "32".to_string(), + target_c_int_width: "32".to_string(), + data_layout: "E-m:e-p:32:32-i64:64-f128:64-n32-S64".to_string(), + arch: "sparc".to_string(), + target_os: "linux".to_string(), + target_env: "gnu".to_string(), + target_vendor: "unknown".to_string(), + linker_flavor: LinkerFlavor::Gcc, + options: base, + }) +} From 84aae4ed12fcafb48216cd7b3f6ea448902f8c58 Mon Sep 17 00:00:00 2001 From: John Paul Adrian Glaubitz Date: Fri, 23 Feb 2018 11:22:19 +0100 Subject: [PATCH 4/4] Add sparc-unknown-linux-gnu target --- src/tools/build-manifest/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index 4113f8fd124c7..0845179532224 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -86,6 +86,7 @@ static TARGETS: &'static [&'static str] = &[ "powerpc64-unknown-linux-gnu", "powerpc64le-unknown-linux-gnu", "s390x-unknown-linux-gnu", + "sparc-unknown-linux-gnu", "sparc64-unknown-linux-gnu", "sparcv9-sun-solaris", "wasm32-unknown-emscripten",