Skip to content

Commit 4b33968

Browse files
androm3daandrom3da
committed
add support for hexagon-unknown-linux-musl
1 parent 527dce7 commit 4b33968

File tree

10 files changed

+110
-2
lines changed

10 files changed

+110
-2
lines changed

‎src/libcore/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@
120120
#![feature(cmpxchg16b_target_feature)]
121121
#![feature(rtm_target_feature)]
122122
#![feature(f16c_target_feature)]
123+
#![feature(hexagon_target_feature)]
123124
#![feature(const_slice_len)]
124125
#![feature(const_str_as_bytes)]
125126
#![feature(const_str_len)]

‎src/libpanic_unwind/gcc.rs

+3
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,9 @@ const UNWIND_DATA_REG: (i32, i32) = (6, 7); // R6, R7
126126
#[cfg(target_arch = "sparc64")]
127127
const UNWIND_DATA_REG: (i32, i32) = (24, 25); // I0, I1
128128

129+
#[cfg(target_arch = "hexagon")]
130+
const UNWIND_DATA_REG: (i32, i32) = (0, 1); // R0, R1
131+
129132
// The following code is based on GCC's C and C++ personality routines. For reference, see:
130133
// https://github.com/gcc-mirror/gcc/blob/master/libstdc++-v3/libsupc++/eh_personality.cc
131134
// https://github.com/gcc-mirror/gcc/blob/trunk/libgcc/unwind-c.c

‎src/librustc_codegen_llvm/llvm_util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ const X86_WHITELIST: &[(&str, Option<Symbol>)] = &[
174174

175175
const HEXAGON_WHITELIST: &[(&str, Option<Symbol>)] = &[
176176
("hvx", Some(sym::hexagon_target_feature)),
177-
("hvx-double", Some(sym::hexagon_target_feature)),
177+
("hvx-length128b", Some(sym::hexagon_target_feature)),
178178
];
179179

180180
const POWERPC_WHITELIST: &[(&str, Option<Symbol>)] = &[

‎src/librustc_target/spec/hexagon_unknown_linux_musl.rs

+36
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
use crate::spec::{LinkerFlavor, Target, TargetResult, LinkArgs};
2+
3+
pub fn target() -> TargetResult {
4+
let mut base = super::linux_musl_base::opts();
5+
base.cpu = "hexagonv60".to_string();
6+
base.max_atomic_width = Some(32);
7+
// FIXME: HVX length defaults are per-CPU
8+
base.features = "-small-data,+hvx-length128b".to_string();
9+
10+
base.crt_static_default = false;
11+
base.atomic_cas = true;
12+
base.has_rpath = true;
13+
base.linker_is_gnu = false;
14+
base.dynamic_linking = true;
15+
base.executables = true;
16+
17+
base.pre_link_args = LinkArgs::new();
18+
base.post_link_args = LinkArgs::new();
19+
20+
Ok(Target {
21+
llvm_target: "hexagon-unknown-linux-musl".to_string(),
22+
target_endian: "little".to_string(),
23+
target_pointer_width: "32".to_string(),
24+
target_c_int_width: "32".to_string(),
25+
data_layout: concat!("e-m:e-p:32:32:32-a:0-n16:32-i64:64:64-i32:32",
26+
":32-i16:16:16-i1:8:8-f32:32:32-f64:64:64-v32",
27+
":32:32-v64:64:64-v512:512:512-v1024:1024:1024-v2048",
28+
":2048:2048").to_string(),
29+
arch: "hexagon".to_string(),
30+
target_os: "linux".to_string(),
31+
target_env: "musl".to_string(),
32+
target_vendor: "unknown".to_string(),
33+
linker_flavor: LinkerFlavor::Gcc,
34+
options: base,
35+
})
36+
}

‎src/librustc_target/spec/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ supported_targets! {
368368
("i586-unknown-linux-musl", i586_unknown_linux_musl),
369369
("mips-unknown-linux-musl", mips_unknown_linux_musl),
370370
("mipsel-unknown-linux-musl", mipsel_unknown_linux_musl),
371+
("hexagon-unknown-linux-musl", hexagon_unknown_linux_musl),
371372

372373
("mips-unknown-linux-uclibc", mips_unknown_linux_uclibc),
373374
("mipsel-unknown-linux-uclibc", mipsel_unknown_linux_uclibc),

‎src/libstd/env.rs

+5
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,11 @@ mod arch {
975975
pub const ARCH: &str = "wasm32";
976976
}
977977

978+
#[cfg(target_arch = "hexagon")]
979+
mod arch {
980+
pub const ARCH: &'static str = "hexagon";
981+
}
982+
978983
#[cfg(test)]
979984
mod tests {
980985
use super::*;

‎src/libstd/os/linux/raw.rs

+56
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,62 @@ mod arch {
147147
}
148148
}
149149

150+
#[cfg(target_arch = "hexagon")]
151+
mod arch {
152+
use crate::os::raw::{c_long, c_int, c_longlong, culonglong};
153+
154+
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blkcnt_t = c_longlong;
155+
#[stable(feature = "raw_ext", since = "1.1.0")] pub type blksize_t = c_long;
156+
#[stable(feature = "raw_ext", since = "1.1.0")] pub type ino_t = c_ulonglong;
157+
#[stable(feature = "raw_ext", since = "1.1.0")] pub type nlink_t = c_uint;
158+
#[stable(feature = "raw_ext", since = "1.1.0")] pub type off_t = c_longlong;
159+
#[stable(feature = "raw_ext", since = "1.1.0")] pub type time_t = c_long;
160+
161+
#[repr(C)]
162+
#[derive(Clone)]
163+
#[stable(feature = "raw_ext", since = "1.1.0")]
164+
pub struct stat {
165+
#[stable(feature = "raw_ext", since = "1.1.0")]
166+
pub st_dev: ::dev_t,
167+
#[stable(feature = "raw_ext", since = "1.1.0")]
168+
pub st_ino: ::c_ulonglong,
169+
#[stable(feature = "raw_ext", since = "1.1.0")]
170+
pub st_mode: ::c_uint,
171+
#[stable(feature = "raw_ext", since = "1.1.0")]
172+
pub st_nlink: ::c_uint,
173+
#[stable(feature = "raw_ext", since = "1.1.0")]
174+
pub st_uid: ::c_uint,
175+
#[stable(feature = "raw_ext", since = "1.1.0")]
176+
pub st_gid: ::c_uint,
177+
#[stable(feature = "raw_ext", since = "1.1.0")]
178+
pub st_rdev: ::c_ulonglong,
179+
#[stable(feature = "raw_ext", since = "1.1.0")]
180+
pub __pad1: ::c_ulong,
181+
#[stable(feature = "raw_ext", since = "1.1.0")]
182+
pub st_size: ::c_longlong,
183+
#[stable(feature = "raw_ext", since = "1.1.0")]
184+
pub st_blksize: ::blksize_t,
185+
#[stable(feature = "raw_ext", since = "1.1.0")]
186+
pub __pad2: ::c_int,
187+
#[stable(feature = "raw_ext", since = "1.1.0")]
188+
pub st_blocks: ::blkcnt_t,
189+
#[stable(feature = "raw_ext", since = "1.1.0")]
190+
pub st_atime: ::time_t,
191+
#[stable(feature = "raw_ext", since = "1.1.0")]
192+
pub st_atime_nsec: ::c_long,
193+
#[stable(feature = "raw_ext", since = "1.1.0")]
194+
pub st_mtime: ::time_t,
195+
#[stable(feature = "raw_ext", since = "1.1.0")]
196+
pub st_mtime_nsec: ::c_long,
197+
#[stable(feature = "raw_ext", since = "1.1.0")]
198+
pub st_ctime: ::time_t,
199+
#[stable(feature = "raw_ext", since = "1.1.0")]
200+
pub st_ctime_nsec: ::c_long,
201+
#[stable(feature = "raw_ext", since = "1.1.0")]
202+
pub __pad3: [::c_int;2],
203+
}
204+
}
205+
150206
#[cfg(any(target_arch = "mips64",
151207
target_arch = "s390x",
152208
target_arch = "sparc64"))]

‎src/libstd/os/raw/mod.rs

+2
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#[doc(include = "os/raw/char.md")]
1212
#[cfg(any(all(target_os = "linux", any(target_arch = "aarch64",
1313
target_arch = "arm",
14+
target_arch = "hexagon",
1415
target_arch = "powerpc",
1516
target_arch = "powerpc64",
1617
target_arch = "s390x")),
@@ -34,6 +35,7 @@
3435
#[doc(include = "os/raw/char.md")]
3536
#[cfg(not(any(all(target_os = "linux", any(target_arch = "aarch64",
3637
target_arch = "arm",
38+
target_arch = "hexagon",
3739
target_arch = "powerpc",
3840
target_arch = "powerpc64",
3941
target_arch = "s390x")),

‎src/libstd/sys_common/alloc.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ use crate::ptr;
1212
target_arch = "powerpc",
1313
target_arch = "powerpc64",
1414
target_arch = "asmjs",
15-
target_arch = "wasm32")))]
15+
target_arch = "wasm32",
16+
target_arch = "hexagon")))]
1617
pub const MIN_ALIGN: usize = 8;
1718
#[cfg(all(any(target_arch = "x86_64",
1819
target_arch = "aarch64",

‎src/libunwind/libunwind.rs

+3
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ pub const unwinder_private_data_size: usize = 2;
5656
#[cfg(target_os = "emscripten")]
5757
pub const unwinder_private_data_size: usize = 20;
5858

59+
#[cfg(all(target_arch = "hexagon", target_os = "linux"))]
60+
pub const unwinder_private_data_size: usize = 35;
61+
5962
#[repr(C)]
6063
pub struct _Unwind_Exception {
6164
pub exception_class: _Unwind_Exception_Class,

0 commit comments

Comments
 (0)