From 955a4eaecaff0499d5d14ee5757992324f937212 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 12 Dec 2016 19:53:51 -0700 Subject: [PATCH 1/6] Add redox target --- src/librustc_back/target/mod.rs | 3 ++ src/librustc_back/target/redox_base.rs | 45 +++++++++++++++++++ .../target/x86_64_unknown_redox.rs | 30 +++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 src/librustc_back/target/redox_base.rs create mode 100644 src/librustc_back/target/x86_64_unknown_redox.rs diff --git a/src/librustc_back/target/mod.rs b/src/librustc_back/target/mod.rs index 351d469ea2809..4dec2ab7d5460 100644 --- a/src/librustc_back/target/mod.rs +++ b/src/librustc_back/target/mod.rs @@ -69,6 +69,7 @@ mod windows_base; mod windows_msvc_base; mod thumb_base; mod fuchsia_base; +mod redox_base; pub type TargetResult = Result; @@ -184,6 +185,8 @@ supported_targets! { ("aarch64-unknown-fuchsia", aarch64_unknown_fuchsia), ("x86_64-unknown-fuchsia", x86_64_unknown_fuchsia), + ("x86_64-unknown-redox", x86_64_unknown_redox), + ("i386-apple-ios", i386_apple_ios), ("x86_64-apple-ios", x86_64_apple_ios), ("aarch64-apple-ios", aarch64_apple_ios), diff --git a/src/librustc_back/target/redox_base.rs b/src/librustc_back/target/redox_base.rs new file mode 100644 index 0000000000000..cd962e4c2163f --- /dev/null +++ b/src/librustc_back/target/redox_base.rs @@ -0,0 +1,45 @@ +// Copyright 2014 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 target::TargetOptions; +use std::default::Default; + +pub fn opts() -> TargetOptions { + TargetOptions { + pre_link_args: vec![ + // We want to be able to strip as much executable code as possible + // from the linker command line, and this flag indicates to the + // linker that it can avoid linking in dynamic libraries that don't + // actually satisfy any symbols up to that point (as with many other + // resolutions the linker does). This option only applies to all + // following libraries so we're sure to pass it as one of the first + // arguments. + "-Wl,--as-needed".to_string(), + + // Always enable NX protection when it is available + "-Wl,-z,noexecstack".to_string(), + + // Do not link libc + "-nostdlib".to_string(), + + // Static link + "-static".to_string() + ], + executables: true, + relocation_modal: "static".to_string(), + disable_redzone: true, + eliminate_frame_pointer: false, + linker_is_gnu: true, + no_compiler_rt: true, + no_default_libraries: true, + has_elf_tls: true, + .. Default::default() + } +} diff --git a/src/librustc_back/target/x86_64_unknown_redox.rs b/src/librustc_back/target/x86_64_unknown_redox.rs new file mode 100644 index 0000000000000..cecac06b23527 --- /dev/null +++ b/src/librustc_back/target/x86_64_unknown_redox.rs @@ -0,0 +1,30 @@ +// Copyright 2016 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 target::{Target, TargetResult}; + +pub fn target() -> TargetResult { + let mut base = super::redox_base::opts(); + base.cpu = "x86-64".to_string(); + base.max_atomic_width = Some(64); + base.pre_link_args.push("-m64".to_string()); + + Ok(Target { + llvm_target: "x86_64-unknown-redox".to_string(), + target_endian: "little".to_string(), + target_pointer_width: "64".to_string(), + data_layout: "e-m:e-i64:64-f80:128-n8:16:32:64-S128".to_string(), + arch: "x86_64".to_string(), + target_os: "redox".to_string(), + target_env: "".to_string(), + target_vendor: "unknown".to_string(), + options: base, + }) +} From c6db2d54f2319b331673715b3a751c7fc936c09d Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 12 Dec 2016 20:07:35 -0700 Subject: [PATCH 2/6] Fix typo --- src/librustc_back/target/redox_base.rs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/librustc_back/target/redox_base.rs b/src/librustc_back/target/redox_base.rs index cd962e4c2163f..d06d3ae0657e3 100644 --- a/src/librustc_back/target/redox_base.rs +++ b/src/librustc_back/target/redox_base.rs @@ -33,11 +33,10 @@ pub fn opts() -> TargetOptions { "-static".to_string() ], executables: true, - relocation_modal: "static".to_string(), + relocation_model: "static".to_string(), disable_redzone: true, eliminate_frame_pointer: false, linker_is_gnu: true, - no_compiler_rt: true, no_default_libraries: true, has_elf_tls: true, .. Default::default() From 5c1602a9982a2543845448f9d2b511c8263f8e06 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 12 Dec 2016 21:16:42 -0700 Subject: [PATCH 3/6] Fix issue with setting cfg(unix) --- src/librustc_back/target/redox_base.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/librustc_back/target/redox_base.rs b/src/librustc_back/target/redox_base.rs index d06d3ae0657e3..e7445dcc7ea7b 100644 --- a/src/librustc_back/target/redox_base.rs +++ b/src/librustc_back/target/redox_base.rs @@ -36,6 +36,7 @@ pub fn opts() -> TargetOptions { relocation_model: "static".to_string(), disable_redzone: true, eliminate_frame_pointer: false, + target_family: Some("redox".to_string()), linker_is_gnu: true, no_default_libraries: true, has_elf_tls: true, From 9e2463c2e127411f9863106fa88f5e2c2cced9aa Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 12 Dec 2016 21:20:45 -0700 Subject: [PATCH 4/6] Use panic abort by default --- src/librustc_back/target/redox_base.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/librustc_back/target/redox_base.rs b/src/librustc_back/target/redox_base.rs index e7445dcc7ea7b..656eacb3b7065 100644 --- a/src/librustc_back/target/redox_base.rs +++ b/src/librustc_back/target/redox_base.rs @@ -8,6 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +use PanicStrategy; use target::TargetOptions; use std::default::Default; @@ -40,6 +41,7 @@ pub fn opts() -> TargetOptions { linker_is_gnu: true, no_default_libraries: true, has_elf_tls: true, + panic_strategy: PanicStrategy::Abort, .. Default::default() } } From 717f10e16c79d32345eead0f8da255ac0b9c1d72 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Mon, 12 Dec 2016 21:24:41 -0700 Subject: [PATCH 5/6] Add Redox make config --- mk/cfg/x86_64-unknown-redox.mk | 1 + 1 file changed, 1 insertion(+) create mode 100644 mk/cfg/x86_64-unknown-redox.mk diff --git a/mk/cfg/x86_64-unknown-redox.mk b/mk/cfg/x86_64-unknown-redox.mk new file mode 100644 index 0000000000000..34aee77ae2107 --- /dev/null +++ b/mk/cfg/x86_64-unknown-redox.mk @@ -0,0 +1 @@ +# rustbuild-only target From 383890b24364d67c5e5f57dce035f58d7df7ab27 Mon Sep 17 00:00:00 2001 From: Jeremy Soller Date: Tue, 13 Dec 2016 18:02:46 -0700 Subject: [PATCH 6/6] Use alloc_system as default allocation crate --- src/librustc_back/target/redox_base.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/librustc_back/target/redox_base.rs b/src/librustc_back/target/redox_base.rs index 656eacb3b7065..a04ec81e973ba 100644 --- a/src/librustc_back/target/redox_base.rs +++ b/src/librustc_back/target/redox_base.rs @@ -40,6 +40,8 @@ pub fn opts() -> TargetOptions { target_family: Some("redox".to_string()), linker_is_gnu: true, no_default_libraries: true, + lib_allocation_crate: "alloc_system".to_string(), + exe_allocation_crate: "alloc_system".to_string(), has_elf_tls: true, panic_strategy: PanicStrategy::Abort, .. Default::default()