Skip to content

Commit da1b296

Browse files
borsbors
committed
Auto merge of #26959 - dhuseby:i686-unknown-freebsd, r=alexcrichton
this adds support for i686-unknown-freebsd target.
2 parents 0c05219 + c415683 commit da1b296

File tree

5 files changed

+155
-7
lines changed

5 files changed

+155
-7
lines changed

‎mk/cfg/i686-unknown-freebsd.mk

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# i686-unknown-freebsd configuration
2+
CC_i686-unknown-freebsd=$(CC)
3+
CXX_i686-unknown-freebsd=$(CXX)
4+
CPP_i686-unknown-freebsd=$(CPP)
5+
AR_i686-unknown-freebsd=$(AR)
6+
CFG_LIB_NAME_i686-unknown-freebsd=lib$(1).so
7+
CFG_STATIC_LIB_NAME_i686-unknown-freebsd=lib$(1).a
8+
CFG_LIB_GLOB_i686-unknown-freebsd=lib$(1)-*.so
9+
CFG_LIB_DSYM_GLOB_i686-unknown-freebsd=$(1)-*.dylib.dSYM
10+
CFG_JEMALLOC_CFLAGS_i686-unknown-freebsd := -m32 -arch i386 -I/usr/local/include $(CFLAGS)
11+
CFG_GCCISH_CFLAGS_i686-unknown-freebsd := -Wall -Werror -g -fPIC -m32 -arch i386 -I/usr/local/include $(CFLAGS)
12+
CFG_GCCISH_LINK_FLAGS_i686-unknown-freebsd := -m32 -shared -fPIC -g -pthread -lrt
13+
CFG_GCCISH_DEF_FLAG_i686-unknown-freebsd := -Wl,--export-dynamic,--dynamic-list=
14+
CFG_LLC_FLAGS_i686-unknown-freebsd :=
15+
CFG_INSTALL_NAME_i686-unknown-freebsd =
16+
CFG_EXE_SUFFIX_i686-unknown-freebsd :=
17+
CFG_WINDOWSY_i686-unknown-freebsd :=
18+
CFG_UNIXY_i686-unknown-freebsd := 1
19+
CFG_LDPATH_i686-unknown-freebsd :=
20+
CFG_RUN_i686-unknown-freebsd=$(2)
21+
CFG_RUN_TARG_i686-unknown-freebsd=$(call CFG_RUN_i686-unknown-freebsd,,$(2))
22+
CFG_GNU_TRIPLE_i686-unknown-freebsd := i686-unknown-freebsd

‎src/liblibc/lib.rs

+94
Original file line numberDiff line numberDiff line change
@@ -960,6 +960,100 @@ pub mod types {
960960
}
961961
}
962962

963+
#[cfg(target_arch = "x86")]
964+
pub mod arch {
965+
pub mod c95 {
966+
pub type c_char = i8;
967+
pub type c_schar = i8;
968+
pub type c_uchar = u8;
969+
pub type c_short = i16;
970+
pub type c_ushort = u16;
971+
pub type c_int = i32;
972+
pub type c_uint = u32;
973+
pub type c_long = i32;
974+
pub type c_ulong = u32;
975+
pub type c_float = f32;
976+
pub type c_double = f64;
977+
pub type size_t = u32;
978+
pub type ptrdiff_t = i32;
979+
pub type clock_t = i32;
980+
pub type time_t = i32;
981+
pub type suseconds_t = i32;
982+
pub type wchar_t = i32;
983+
}
984+
pub mod c99 {
985+
pub type c_longlong = i64;
986+
pub type c_ulonglong = u64;
987+
pub type intptr_t = i32;
988+
pub type uintptr_t = u32;
989+
pub type intmax_t = i64;
990+
pub type uintmax_t = u64;
991+
}
992+
pub mod posix88 {
993+
pub type off_t = i64;
994+
pub type dev_t = u32;
995+
pub type ino_t = u32;
996+
pub type pid_t = i32;
997+
pub type uid_t = u32;
998+
pub type gid_t = u32;
999+
pub type useconds_t = u32;
1000+
pub type mode_t = u16;
1001+
pub type ssize_t = i32;
1002+
}
1003+
pub mod posix01 {
1004+
use types::common::c95::{c_void};
1005+
use types::common::c99::{uint8_t, uint32_t, int32_t};
1006+
use types::os::arch::c95::{c_long, time_t};
1007+
use types::os::arch::posix88::{dev_t, gid_t, ino_t};
1008+
use types::os::arch::posix88::{mode_t, off_t};
1009+
use types::os::arch::posix88::{uid_t};
1010+
1011+
pub type nlink_t = u16;
1012+
pub type blksize_t = i32;
1013+
pub type blkcnt_t = i64;
1014+
pub type fflags_t = u32;
1015+
#[repr(C)]
1016+
#[derive(Copy, Clone)] pub struct stat {
1017+
pub st_dev: dev_t,
1018+
pub st_ino: ino_t,
1019+
pub st_mode: mode_t,
1020+
pub st_nlink: nlink_t,
1021+
pub st_uid: uid_t,
1022+
pub st_gid: gid_t,
1023+
pub st_rdev: dev_t,
1024+
pub st_atime: time_t,
1025+
pub st_atime_nsec: c_long,
1026+
pub st_mtime: time_t,
1027+
pub st_mtime_nsec: c_long,
1028+
pub st_ctime: time_t,
1029+
pub st_ctime_nsec: c_long,
1030+
pub st_size: off_t,
1031+
pub st_blocks: blkcnt_t,
1032+
pub st_blksize: blksize_t,
1033+
pub st_flags: fflags_t,
1034+
pub st_gen: uint32_t,
1035+
pub st_lspare: int32_t,
1036+
pub st_birthtime: time_t,
1037+
pub st_birthtime_nsec: c_long,
1038+
pub __unused: [uint8_t; 2],
1039+
}
1040+
1041+
#[repr(C)]
1042+
#[derive(Copy, Clone)] pub struct utimbuf {
1043+
pub actime: time_t,
1044+
pub modtime: time_t,
1045+
}
1046+
1047+
pub type pthread_attr_t = *mut c_void;
1048+
}
1049+
pub mod posix08 {
1050+
}
1051+
pub mod bsd44 {
1052+
}
1053+
pub mod extra {
1054+
}
1055+
}
1056+
9631057
#[cfg(target_arch = "x86_64")]
9641058
pub mod arch {
9651059
pub mod c95 {

‎src/librustc_back/target/i686_unknown_freebsd.rs

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
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 target::Target;
12+
13+
pub fn target() -> Target {
14+
let mut base = super::freebsd_base::opts();
15+
base.cpu = "pentium4".to_string();
16+
base.pre_link_args.push("-m32".to_string());
17+
base.morestack = false;
18+
19+
Target {
20+
data_layout: "e-p:32:32-f64:32:64-i64:32:64-f80:32:32-n8:16:32".to_string(),
21+
llvm_target: "i686-unknown-freebsd".to_string(),
22+
target_endian: "little".to_string(),
23+
target_pointer_width: "32".to_string(),
24+
arch: "x86".to_string(),
25+
target_os: "freebsd".to_string(),
26+
target_env: "".to_string(),
27+
options: base,
28+
}
29+
}

‎src/librustc_back/target/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,7 @@ impl Target {
368368
arm_linux_androideabi,
369369
aarch64_linux_android,
370370

371+
i686_unknown_freebsd,
371372
x86_64_unknown_freebsd,
372373

373374
i686_unknown_dragonfly,

‎src/libstd/sys/common/stack.rs

+9-7
Original file line numberDiff line numberDiff line change
@@ -170,8 +170,7 @@ pub unsafe fn record_sp_limit(limit: usize) {
170170
asm!("movl $$0x48+90*4, %eax
171171
movl $0, %gs:(%eax)" :: "r"(limit) : "eax" : "volatile")
172172
}
173-
#[cfg(all(target_arch = "x86",
174-
any(target_os = "linux", target_os = "freebsd")))]
173+
#[cfg(all(target_arch = "x86", target_os = "linux"))]
175174
#[inline(always)]
176175
unsafe fn target_record_sp_limit(limit: usize) {
177176
asm!("movl $0, %gs:48" :: "r"(limit) :: "volatile")
@@ -197,10 +196,12 @@ pub unsafe fn record_sp_limit(limit: usize) {
197196
// aarch64 - FIXME(AARCH64): missing...
198197
// powerpc - FIXME(POWERPC): missing...
199198
// arm-ios - iOS segmented stack is disabled for now, see related notes
200-
// openbsd - segmented stack is disabled
199+
// openbsd/bitrig/netbsd - no segmented stacks.
200+
// x86-freebsd - no segmented stacks.
201201
#[cfg(any(target_arch = "aarch64",
202202
target_arch = "powerpc",
203203
all(target_arch = "arm", target_os = "ios"),
204+
all(target_arch = "x86", target_os = "freebsd"),
204205
target_os = "bitrig",
205206
target_os = "netbsd",
206207
target_os = "openbsd"))]
@@ -262,8 +263,7 @@ pub unsafe fn get_sp_limit() -> usize {
262263
movl %gs:(%eax), $0" : "=r"(limit) :: "eax" : "volatile");
263264
return limit;
264265
}
265-
#[cfg(all(target_arch = "x86",
266-
any(target_os = "linux", target_os = "freebsd")))]
266+
#[cfg(all(target_arch = "x86", target_os = "linux"))]
267267
#[inline(always)]
268268
unsafe fn target_get_sp_limit() -> usize {
269269
let limit;
@@ -291,14 +291,16 @@ pub unsafe fn get_sp_limit() -> usize {
291291

292292
// aarch64 - FIXME(AARCH64): missing...
293293
// powerpc - FIXME(POWERPC): missing...
294-
// arm-ios - iOS doesn't support segmented stacks yet.
295-
// openbsd - OpenBSD doesn't support segmented stacks.
294+
// arm-ios - no segmented stacks.
295+
// openbsd/bitrig/netbsd - no segmented stacks.
296+
// x86-freebsd - no segmented stacks..
296297
//
297298
// This function might be called by runtime though
298299
// so it is unsafe to unreachable, let's return a fixed constant.
299300
#[cfg(any(target_arch = "aarch64",
300301
target_arch = "powerpc",
301302
all(target_arch = "arm", target_os = "ios"),
303+
all(target_arch = "x86", target_os = "freebsd"),
302304
target_os = "bitrig",
303305
target_os = "netbsd",
304306
target_os = "openbsd"))]

0 commit comments

Comments
 (0)