Skip to content

Commit 99913c5

Browse files
borsbors
committed
Auto merge of #38401 - redox-os:redox_cross, r=brson
Redox Cross Compilation I will admit - there are things here that I wish I did not have to do. This completes the ability to create a cross compiler from the rust repository for `x86_64-unknown-redox`. I will document this PR with inline comments explaining some things. [View this gist to see how a cross compiler is built](https://gist.github.com/jackpot51/6680ad973986e84d69c79854249f2b7e) Prior discussion of a smaller change is here: #38366
2 parents 82611a0 + 4dcb867 commit 99913c5

39 files changed

+1439
-42
lines changed

‎mk/cfg/x86_64-unknown-redox.mk

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
# rustbuild-only target

‎src/liballoc_jemalloc/build.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ fn main() {
3636
// targets, which means we have to build the alloc_jemalloc crate
3737
// for targets like emscripten, even if we don't use it.
3838
if target.contains("rumprun") || target.contains("bitrig") || target.contains("openbsd") ||
39-
target.contains("msvc") || target.contains("emscripten") || target.contains("fuchsia") {
39+
target.contains("msvc") || target.contains("emscripten") || target.contains("fuchsia") ||
40+
target.contains("redox") {
4041
println!("cargo:rustc-cfg=dummy_jemalloc");
4142
return;
4243
}

‎src/liballoc_system/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
issue = "27783")]
2020
#![feature(allocator)]
2121
#![feature(staged_api)]
22-
#![cfg_attr(unix, feature(libc))]
22+
#![cfg_attr(any(unix, target_os = "redox"), feature(libc))]
2323

2424
// The minimum alignment guaranteed by the architecture. This value is used to
2525
// add fast paths for low alignment values. In practice, the alignment is a
@@ -71,7 +71,7 @@ pub extern "C" fn __rust_usable_size(size: usize, align: usize) -> usize {
7171
imp::usable_size(size, align)
7272
}
7373

74-
#[cfg(unix)]
74+
#[cfg(any(unix, target_os = "redox"))]
7575
mod imp {
7676
extern crate libc;
7777

@@ -87,7 +87,7 @@ mod imp {
8787
}
8888
}
8989

90-
#[cfg(target_os = "android")]
90+
#[cfg(any(target_os = "android", target_os = "redox"))]
9191
unsafe fn aligned_malloc(size: usize, align: usize) -> *mut u8 {
9292
// On android we currently target API level 9 which unfortunately
9393
// doesn't have the `posix_memalign` API used below. Instead we use
@@ -109,7 +109,7 @@ mod imp {
109109
libc::memalign(align as libc::size_t, size as libc::size_t) as *mut u8
110110
}
111111

112-
#[cfg(not(target_os = "android"))]
112+
#[cfg(not(any(target_os = "android", target_os = "redox")))]
113113
unsafe fn aligned_malloc(size: usize, align: usize) -> *mut u8 {
114114
let mut out = ptr::null_mut();
115115
let ret = libc::posix_memalign(&mut out, align as libc::size_t, size as libc::size_t);

‎src/libcompiler_builtins/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ fn main() {
242242
"atomic_thread_fence.c"]);
243243
}
244244

245-
if !target.contains("windows") {
245+
if !target.contains("redox") && !target.contains("windows") {
246246
sources.extend(&["emutls.c"]);
247247
}
248248

‎src/liblibc

‎src/librustc/session/config.rs

+6-12
Original file line numberDiff line numberDiff line change
@@ -945,26 +945,20 @@ pub fn default_configuration(sess: &Session) -> ast::CrateConfig {
945945
let vendor = &sess.target.target.target_vendor;
946946
let max_atomic_width = sess.target.target.max_atomic_width();
947947

948-
let fam = if let Some(ref fam) = sess.target.target.options.target_family {
949-
Symbol::intern(fam)
950-
} else if sess.target.target.options.is_like_windows {
951-
Symbol::intern("windows")
952-
} else {
953-
Symbol::intern("unix")
954-
};
955-
956948
let mut ret = HashSet::new();
957949
// Target bindings.
958950
ret.insert((Symbol::intern("target_os"), Some(Symbol::intern(os))));
959-
ret.insert((Symbol::intern("target_family"), Some(fam)));
951+
if let Some(ref fam) = sess.target.target.options.target_family {
952+
ret.insert((Symbol::intern("target_family"), Some(Symbol::intern(fam))));
953+
if fam == "windows" || fam == "unix" {
954+
ret.insert((Symbol::intern(fam), None));
955+
}
956+
}
960957
ret.insert((Symbol::intern("target_arch"), Some(Symbol::intern(arch))));
961958
ret.insert((Symbol::intern("target_endian"), Some(Symbol::intern(end))));
962959
ret.insert((Symbol::intern("target_pointer_width"), Some(Symbol::intern(wordsz))));
963960
ret.insert((Symbol::intern("target_env"), Some(Symbol::intern(env))));
964961
ret.insert((Symbol::intern("target_vendor"), Some(Symbol::intern(vendor))));
965-
if fam == "windows" || fam == "unix" {
966-
ret.insert((fam, None));
967-
}
968962
if sess.target.target.options.has_elf_tls {
969963
ret.insert((Symbol::intern("target_thread_local"), None));
970964
}

‎src/librustc_back/target/apple_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ pub fn opts() -> TargetOptions {
3737
function_sections: false,
3838
dynamic_linking: true,
3939
executables: true,
40+
target_family: Some("unix".to_string()),
4041
is_like_osx: true,
4142
has_rpath: true,
4243
dll_prefix: "lib".to_string(),

‎src/librustc_back/target/bitrig_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub fn opts() -> TargetOptions {
1515
TargetOptions {
1616
dynamic_linking: true,
1717
executables: true,
18+
target_family: Some("unix".to_string()),
1819
linker_is_gnu: true,
1920
has_rpath: true,
2021
position_independent_executables: true,

‎src/librustc_back/target/dragonfly_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub fn opts() -> TargetOptions {
1515
TargetOptions {
1616
dynamic_linking: true,
1717
executables: true,
18+
target_family: Some("unix".to_string()),
1819
linker_is_gnu: true,
1920
has_rpath: true,
2021
pre_link_args: vec![

‎src/librustc_back/target/freebsd_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub fn opts() -> TargetOptions {
1515
TargetOptions {
1616
dynamic_linking: true,
1717
executables: true,
18+
target_family: Some("unix".to_string()),
1819
linker_is_gnu: true,
1920
has_rpath: true,
2021
pre_link_args: vec![

‎src/librustc_back/target/fuchsia_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub fn opts() -> TargetOptions {
1515
TargetOptions {
1616
dynamic_linking: true,
1717
executables: true,
18+
target_family: Some("unix".to_string()),
1819
linker_is_gnu: true,
1920
has_rpath: true,
2021
pre_link_args: vec![

‎src/librustc_back/target/haiku_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pub fn opts() -> TargetOptions {
1717
dynamic_linking: true,
1818
executables: true,
1919
has_rpath: true,
20+
target_family: Some("unix".to_string()),
2021
linker_is_gnu: true,
2122
.. Default::default()
2223
}

‎src/librustc_back/target/linux_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub fn opts() -> TargetOptions {
1515
TargetOptions {
1616
dynamic_linking: true,
1717
executables: true,
18+
target_family: Some("unix".to_string()),
1819
linker_is_gnu: true,
1920
has_rpath: true,
2021
pre_link_args: vec![

‎src/librustc_back/target/mod.rs

+3
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ mod windows_base;
6969
mod windows_msvc_base;
7070
mod thumb_base;
7171
mod fuchsia_base;
72+
mod redox_base;
7273

7374
pub type TargetResult = Result<Target, String>;
7475

@@ -184,6 +185,8 @@ supported_targets! {
184185
("aarch64-unknown-fuchsia", aarch64_unknown_fuchsia),
185186
("x86_64-unknown-fuchsia", x86_64_unknown_fuchsia),
186187

188+
("x86_64-unknown-redox", x86_64_unknown_redox),
189+
187190
("i386-apple-ios", i386_apple_ios),
188191
("x86_64-apple-ios", x86_64_apple_ios),
189192
("aarch64-apple-ios", aarch64_apple_ios),

‎src/librustc_back/target/netbsd_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub fn opts() -> TargetOptions {
1515
TargetOptions {
1616
dynamic_linking: true,
1717
executables: true,
18+
target_family: Some("unix".to_string()),
1819
linker_is_gnu: true,
1920
has_rpath: true,
2021
pre_link_args: vec![

‎src/librustc_back/target/openbsd_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ pub fn opts() -> TargetOptions {
1515
TargetOptions {
1616
dynamic_linking: true,
1717
executables: true,
18+
target_family: Some("unix".to_string()),
1819
linker_is_gnu: true,
1920
has_rpath: true,
2021
is_like_openbsd: true,

‎src/librustc_back/target/redox_base.rs

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use PanicStrategy;
12+
use target::TargetOptions;
13+
use std::default::Default;
14+
15+
pub fn opts() -> TargetOptions {
16+
TargetOptions {
17+
pre_link_args: vec![
18+
// We want to be able to strip as much executable code as possible
19+
// from the linker command line, and this flag indicates to the
20+
// linker that it can avoid linking in dynamic libraries that don't
21+
// actually satisfy any symbols up to that point (as with many other
22+
// resolutions the linker does). This option only applies to all
23+
// following libraries so we're sure to pass it as one of the first
24+
// arguments.
25+
"-Wl,--as-needed".to_string(),
26+
27+
// Always enable NX protection when it is available
28+
"-Wl,-z,noexecstack".to_string(),
29+
30+
// Static link
31+
"-static".to_string()
32+
],
33+
late_link_args: vec![
34+
"-lc".to_string(),
35+
"-lm".to_string()
36+
],
37+
executables: true,
38+
relocation_model: "static".to_string(),
39+
disable_redzone: true,
40+
eliminate_frame_pointer: false,
41+
target_family: None,
42+
linker_is_gnu: true,
43+
no_default_libraries: true,
44+
lib_allocation_crate: "alloc_system".to_string(),
45+
exe_allocation_crate: "alloc_system".to_string(),
46+
has_elf_tls: true,
47+
panic_strategy: PanicStrategy::Abort,
48+
.. Default::default()
49+
}
50+
}

‎src/librustc_back/target/solaris_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ pub fn opts() -> TargetOptions {
1616
dynamic_linking: true,
1717
executables: true,
1818
has_rpath: true,
19+
target_family: Some("unix".to_string()),
1920
is_like_solaris: true,
2021
exe_allocation_crate: super::maybe_jemalloc(),
2122

‎src/librustc_back/target/windows_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ pub fn opts() -> TargetOptions {
2424
staticlib_prefix: "".to_string(),
2525
staticlib_suffix: ".lib".to_string(),
2626
no_default_libraries: true,
27+
target_family: Some("windows".to_string()),
2728
is_like_windows: true,
2829
allows_weak_linkage: false,
2930
pre_link_args: vec![

‎src/librustc_back/target/windows_msvc_base.rs

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ pub fn opts() -> TargetOptions {
5353
exe_suffix: ".exe".to_string(),
5454
staticlib_prefix: "".to_string(),
5555
staticlib_suffix: ".lib".to_string(),
56+
target_family: Some("windows".to_string()),
5657
is_like_windows: true,
5758
is_like_msvc: true,
5859
pre_link_args: vec![

‎src/librustc_back/target/x86_64_unknown_redox.rs

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
use target::{Target, TargetResult};
12+
13+
pub fn target() -> TargetResult {
14+
let mut base = super::redox_base::opts();
15+
base.cpu = "x86-64".to_string();
16+
base.max_atomic_width = Some(64);
17+
base.pre_link_args.push("-m64".to_string());
18+
19+
Ok(Target {
20+
llvm_target: "x86_64-unknown-redox".to_string(),
21+
target_endian: "little".to_string(),
22+
target_pointer_width: "64".to_string(),
23+
data_layout: "e-m:e-i64:64-f80:128-n8:16:32:64-S128".to_string(),
24+
arch: "x86_64".to_string(),
25+
target_os: "redox".to_string(),
26+
target_env: "".to_string(),
27+
target_vendor: "unknown".to_string(),
28+
options: base,
29+
})
30+
}

‎src/libstd/build.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ fn main() {
2626
let target = env::var("TARGET").expect("TARGET was not set");
2727
let host = env::var("HOST").expect("HOST was not set");
2828
if cfg!(feature = "backtrace") && !target.contains("apple") && !target.contains("msvc") &&
29-
!target.contains("emscripten") && !target.contains("fuchsia") {
29+
!target.contains("emscripten") && !target.contains("fuchsia") && !target.contains("redox") {
3030
build_libbacktrace(&host, &target);
3131
}
3232

‎src/libstd/sys/redox/ext/io.rs

+20-15
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@
1313
#![stable(feature = "rust1", since = "1.0.0")]
1414

1515
use fs;
16+
use net;
1617
use sys;
17-
use sys_common::{AsInner, FromInner, IntoInner};
18+
use sys_common::{self, AsInner, FromInner, IntoInner};
1819

1920
/// Raw file descriptors.
2021
#[stable(feature = "rust1", since = "1.0.0")]
@@ -89,58 +90,62 @@ impl IntoRawFd for fs::File {
8990
}
9091
}
9192

92-
/*
9393
#[stable(feature = "rust1", since = "1.0.0")]
9494
impl AsRawFd for net::TcpStream {
95-
fn as_raw_fd(&self) -> RawFd { *self.as_inner().socket().as_inner() }
95+
fn as_raw_fd(&self) -> RawFd {
96+
self.as_inner().as_inner().fd().raw()
97+
}
9698
}
9799
#[stable(feature = "rust1", since = "1.0.0")]
98100
impl AsRawFd for net::TcpListener {
99-
fn as_raw_fd(&self) -> RawFd { *self.as_inner().socket().as_inner() }
101+
fn as_raw_fd(&self) -> RawFd {
102+
self.as_inner().as_inner().fd().raw()
103+
}
100104
}
101105
#[stable(feature = "rust1", since = "1.0.0")]
102106
impl AsRawFd for net::UdpSocket {
103-
fn as_raw_fd(&self) -> RawFd { *self.as_inner().socket().as_inner() }
107+
fn as_raw_fd(&self) -> RawFd {
108+
self.as_inner().as_inner().fd().raw()
109+
}
104110
}
105111

106112
#[stable(feature = "from_raw_os", since = "1.1.0")]
107113
impl FromRawFd for net::TcpStream {
108114
unsafe fn from_raw_fd(fd: RawFd) -> net::TcpStream {
109-
let socket = sys::net::Socket::from_inner(fd);
110-
net::TcpStream::from_inner(sys_common::net::TcpStream::from_inner(socket))
115+
let file = sys::fs::File::from_inner(fd);
116+
net::TcpStream::from_inner(sys_common::net::TcpStream::from_inner(file))
111117
}
112118
}
113119
#[stable(feature = "from_raw_os", since = "1.1.0")]
114120
impl FromRawFd for net::TcpListener {
115121
unsafe fn from_raw_fd(fd: RawFd) -> net::TcpListener {
116-
let socket = sys::net::Socket::from_inner(fd);
117-
net::TcpListener::from_inner(sys_common::net::TcpListener::from_inner(socket))
122+
let file = sys::fs::File::from_inner(fd);
123+
net::TcpListener::from_inner(sys_common::net::TcpListener::from_inner(file))
118124
}
119125
}
120126
#[stable(feature = "from_raw_os", since = "1.1.0")]
121127
impl FromRawFd for net::UdpSocket {
122128
unsafe fn from_raw_fd(fd: RawFd) -> net::UdpSocket {
123-
let socket = sys::net::Socket::from_inner(fd);
124-
net::UdpSocket::from_inner(sys_common::net::UdpSocket::from_inner(socket))
129+
let file = sys::fs::File::from_inner(fd);
130+
net::UdpSocket::from_inner(sys_common::net::UdpSocket::from_inner(file))
125131
}
126132
}
127133

128134
#[stable(feature = "into_raw_os", since = "1.4.0")]
129135
impl IntoRawFd for net::TcpStream {
130136
fn into_raw_fd(self) -> RawFd {
131-
self.into_inner().into_socket().into_inner()
137+
self.into_inner().into_inner().into_fd().into_raw()
132138
}
133139
}
134140
#[stable(feature = "into_raw_os", since = "1.4.0")]
135141
impl IntoRawFd for net::TcpListener {
136142
fn into_raw_fd(self) -> RawFd {
137-
self.into_inner().into_socket().into_inner()
143+
self.into_inner().into_inner().into_fd().into_raw()
138144
}
139145
}
140146
#[stable(feature = "into_raw_os", since = "1.4.0")]
141147
impl IntoRawFd for net::UdpSocket {
142148
fn into_raw_fd(self) -> RawFd {
143-
self.into_inner().into_socket().into_inner()
149+
self.into_inner().into_inner().into_fd().into_raw()
144150
}
145151
}
146-
*/

0 commit comments

Comments
 (0)