Skip to content

Commit dc004d4

Browse files
petrochenkovpetrochenkov
committed
rustc_target: Rename some target options to avoid tautology
`target.target_endian` -> `target.endian` `target.target_c_int_width` -> `target.c_int_width` `target.target_os` -> `target.os` `target.target_env` -> `target.env` `target.target_vendor` -> `target.vendor` `target.target_family` -> `target.os_family` `target.target_mcount` -> `target.mcount`
1 parent bf66988 commit dc004d4

File tree

114 files changed

+218
-243
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+218
-243
lines changed

‎compiler/rustc_codegen_llvm/src/attributes.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ fn set_instrument_function(cx: &CodegenCx<'ll, '_>, llfn: &'ll Value) {
9090

9191
// The function name varies on platforms.
9292
// See test/CodeGen/mcount.c in clang.
93-
let mcount_name = CString::new(cx.sess().target.target_mcount.as_str().as_bytes()).unwrap();
93+
let mcount_name = CString::new(cx.sess().target.mcount.as_str().as_bytes()).unwrap();
9494

9595
llvm::AddFunctionAttrStringValue(
9696
llfn,

‎compiler/rustc_codegen_llvm/src/callee.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ pub fn get_fn(cx: &CodegenCx<'ll, 'tcx>, instance: Instance<'tcx>) -> &'ll Value
176176
// should use dllimport for functions.
177177
if cx.use_dll_storage_attrs
178178
&& tcx.is_dllimport_foreign_item(instance_def_id)
179-
&& tcx.sess.target.target_env != "gnu"
179+
&& tcx.sess.target.env != "gnu"
180180
{
181181
unsafe {
182182
llvm::LLVMSetDLLStorageClass(llfn, llvm::DLLStorageClass::DllImport);

‎compiler/rustc_codegen_llvm/src/llvm_util.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ unsafe fn configure_llvm(sess: &Session) {
9191
}
9292
}
9393

94-
if sess.target.target_os == "emscripten" && sess.panic_strategy() == PanicStrategy::Unwind {
94+
if sess.target.os == "emscripten" && sess.panic_strategy() == PanicStrategy::Unwind {
9595
add("-enable-emscripten-cxx-exceptions", false);
9696
}
9797

‎compiler/rustc_codegen_llvm/src/va_arg.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fn emit_direct_ptr_va_arg(
5252
let next = bx.inbounds_gep(addr, &[full_direct_size]);
5353
bx.store(next, va_list_addr, bx.tcx().data_layout.pointer_align.abi);
5454

55-
if size.bytes() < slot_size.bytes() && &*bx.tcx().sess.target.target_endian == "big" {
55+
if size.bytes() < slot_size.bytes() && &*bx.tcx().sess.target.endian == "big" {
5656
let adjusted_size = bx.cx().const_i32((slot_size.bytes() - size.bytes()) as i32);
5757
let adjusted = bx.inbounds_gep(addr, &[adjusted_size]);
5858
(bx.bitcast(adjusted, bx.cx().type_ptr_to(llty)), addr_align)
@@ -105,7 +105,7 @@ fn emit_aapcs_va_arg(
105105
let mut end = bx.build_sibling_block("va_arg.end");
106106
let zero = bx.const_i32(0);
107107
let offset_align = Align::from_bytes(4).unwrap();
108-
assert!(&*bx.tcx().sess.target.target_endian == "little");
108+
assert!(&*bx.tcx().sess.target.endian == "little");
109109

110110
let gr_type = target_ty.is_any_ptr() || target_ty.is_integral();
111111
let (reg_off, reg_top_index, slot_size) = if gr_type {

‎compiler/rustc_codegen_ssa/src/back/link.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ fn get_linker(
163163
// MSVC needs to link with the Store versions of the runtime libraries (vcruntime, msvcrt, etc).
164164
let t = &sess.target;
165165
if (flavor == LinkerFlavor::Msvc || flavor == LinkerFlavor::Lld(LldFlavor::Link))
166-
&& t.target_vendor == "uwp"
166+
&& t.vendor == "uwp"
167167
{
168168
if let Some(ref tool) = msvc_tool {
169169
let original_path = tool.path();
@@ -1236,7 +1236,7 @@ fn crt_objects_fallback(sess: &Session, crate_type: CrateType) -> bool {
12361236
Some(CrtObjectsFallback::Musl) => sess.crt_static(Some(crate_type)),
12371237
Some(CrtObjectsFallback::Mingw) => {
12381238
sess.host == sess.target
1239-
&& sess.target.target_vendor != "uwp"
1239+
&& sess.target.vendor != "uwp"
12401240
&& detect_self_contained_mingw(&sess)
12411241
}
12421242
// FIXME: Figure out cases in which WASM needs to link with a native toolchain.
@@ -1510,7 +1510,7 @@ fn linker_with_args<'a, B: ArchiveBuilder<'a>>(
15101510
let base_cmd = get_linker(sess, path, flavor, crt_objects_fallback);
15111511
// FIXME: Move `/LIBPATH` addition for uwp targets from the linker construction
15121512
// to the linker args construction.
1513-
assert!(base_cmd.get_args().is_empty() || sess.target.target_vendor == "uwp");
1513+
assert!(base_cmd.get_args().is_empty() || sess.target.vendor == "uwp");
15141514
let cmd = &mut *codegen_results.linker_info.to_linker(base_cmd, &sess, flavor, target_cpu);
15151515
let link_output_kind = link_output_kind(sess, crate_type);
15161516

@@ -2078,9 +2078,9 @@ fn are_upstream_rust_objects_already_included(sess: &Session) -> bool {
20782078

20792079
fn add_apple_sdk(cmd: &mut dyn Linker, sess: &Session, flavor: LinkerFlavor) {
20802080
let arch = &sess.target.arch;
2081-
let os = &sess.target.target_os;
2081+
let os = &sess.target.os;
20822082
let llvm_target = &sess.target.llvm_target;
2083-
if sess.target.target_vendor != "apple"
2083+
if sess.target.vendor != "apple"
20842084
|| !matches!(os.as_str(), "ios" | "tvos")
20852085
|| flavor != LinkerFlavor::Gcc
20862086
{

‎compiler/rustc_codegen_ssa/src/back/linker.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ impl<'a> Linker for GccLinker<'a> {
320320
// any `#[link]` attributes in the `libc` crate, see #72782 for details.
321321
// FIXME: Switch to using `#[link]` attributes in the `libc` crate
322322
// similarly to other targets.
323-
if self.sess.target.target_os == "vxworks"
323+
if self.sess.target.os == "vxworks"
324324
&& matches!(
325325
output_kind,
326326
LinkOutputKind::StaticNoPicExe

‎compiler/rustc_codegen_ssa/src/traits/type_.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@ pub trait DerivedTypeMethods<'tcx>: BaseTypeMethods<'tcx> + MiscMethods<'tcx> {
5151
}
5252

5353
fn type_int(&self) -> Self::Type {
54-
match &self.sess().target.target_c_int_width[..] {
54+
match &self.sess().target.c_int_width[..] {
5555
"16" => self.type_i16(),
5656
"32" => self.type_i32(),
5757
"64" => self.type_i64(),
58-
width => bug!("Unsupported target_c_int_width: {}", width),
58+
width => bug!("Unsupported c_int_width: {}", width),
5959
}
6060
}
6161

‎compiler/rustc_middle/src/ty/layout.rs

+5-6
Original file line numberDiff line numberDiff line change
@@ -2601,15 +2601,14 @@ where
26012601
};
26022602

26032603
let target = &cx.tcx().sess.target;
2604-
let target_env_gnu_like = matches!(&target.target_env[..], "gnu" | "musl");
2605-
let win_x64_gnu =
2606-
target.target_os == "windows" && target.arch == "x86_64" && target.target_env == "gnu";
2604+
let target_env_gnu_like = matches!(&target.env[..], "gnu" | "musl");
2605+
let win_x64_gnu = target.os == "windows" && target.arch == "x86_64" && target.env == "gnu";
26072606
let linux_s390x_gnu_like =
2608-
target.target_os == "linux" && target.arch == "s390x" && target_env_gnu_like;
2607+
target.os == "linux" && target.arch == "s390x" && target_env_gnu_like;
26092608
let linux_sparc64_gnu_like =
2610-
target.target_os == "linux" && target.arch == "sparc64" && target_env_gnu_like;
2609+
target.os == "linux" && target.arch == "sparc64" && target_env_gnu_like;
26112610
let linux_powerpc_gnu_like =
2612-
target.target_os == "linux" && target.arch == "powerpc" && target_env_gnu_like;
2611+
target.os == "linux" && target.arch == "powerpc" && target_env_gnu_like;
26132612
let rust_abi = matches!(sig.abi, RustIntrinsic | PlatformIntrinsic | Rust | RustCall);
26142613

26152614
// Handle safe Rust thin and fat pointers.

‎compiler/rustc_session/src/config.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -735,12 +735,12 @@ pub const fn default_lib_output() -> CrateType {
735735
}
736736

737737
pub fn default_configuration(sess: &Session) -> CrateConfig {
738-
let end = &sess.target.target_endian;
738+
let end = &sess.target.endian;
739739
let arch = &sess.target.arch;
740740
let wordsz = sess.target.pointer_width.to_string();
741-
let os = &sess.target.target_os;
742-
let env = &sess.target.target_env;
743-
let vendor = &sess.target.target_vendor;
741+
let os = &sess.target.os;
742+
let env = &sess.target.env;
743+
let vendor = &sess.target.vendor;
744744
let min_atomic_width = sess.target.min_atomic_width();
745745
let max_atomic_width = sess.target.max_atomic_width();
746746
let atomic_cas = sess.target.atomic_cas;
@@ -752,7 +752,7 @@ pub fn default_configuration(sess: &Session) -> CrateConfig {
752752
ret.reserve(6); // the minimum number of insertions
753753
// Target bindings.
754754
ret.insert((sym::target_os, Some(Symbol::intern(os))));
755-
if let Some(ref fam) = sess.target.target_family {
755+
if let Some(ref fam) = sess.target.os_family {
756756
ret.insert((sym::target_family, Some(Symbol::intern(fam))));
757757
if fam == "windows" {
758758
ret.insert((sym::windows, None));

‎compiler/rustc_target/src/abi/call/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ impl<'a, Ty> FnAbi<'a, Ty> {
584584
"nvptx64" => nvptx64::compute_abi_info(self),
585585
"hexagon" => hexagon::compute_abi_info(self),
586586
"riscv32" | "riscv64" => riscv::compute_abi_info(cx, self),
587-
"wasm32" if cx.target_spec().target_os != "emscripten" => {
587+
"wasm32" if cx.target_spec().os != "emscripten" => {
588588
wasm32_bindgen_compat::compute_abi_info(self)
589589
}
590590
"wasm32" | "asmjs" => wasm32::compute_abi_info(cx, self),

‎compiler/rustc_target/src/abi/call/powerpc64.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ where
119119
Ty: TyAndLayoutMethods<'a, C> + Copy,
120120
C: LayoutOf<Ty = Ty, TyAndLayout = TyAndLayout<'a, Ty>> + HasDataLayout + HasTargetSpec,
121121
{
122-
let abi = if cx.target_spec().target_env == "musl" {
122+
let abi = if cx.target_spec().env == "musl" {
123123
ELFv2
124124
} else {
125125
match cx.data_layout().endian {

‎compiler/rustc_target/src/abi/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,11 @@ impl TargetDataLayout {
156156
Endian::Little => "little",
157157
Endian::Big => "big",
158158
};
159-
if endian_str != target.target_endian {
159+
if endian_str != target.endian {
160160
return Err(format!(
161161
"inconsistent target specification: \"data-layout\" claims \
162162
architecture is {}-endian, while \"target-endian\" is `{}`",
163-
endian_str, target.target_endian
163+
endian_str, target.endian
164164
));
165165
}
166166

‎compiler/rustc_target/src/spec/aarch64_apple_darwin.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@ pub fn target() -> Target {
1919
pointer_width: 64,
2020
data_layout: "e-m:o-i64:64-i128:128-n32:64-S128".to_string(),
2121
arch: arch.to_string(),
22-
options: TargetOptions { target_mcount: "\u{1}mcount".to_string(), ..base },
22+
options: TargetOptions { mcount: "\u{1}mcount".to_string(), ..base },
2323
}
2424
}

‎compiler/rustc_target/src/spec/aarch64_unknown_linux_gnu.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn target() -> Target {
1111
arch: "aarch64".to_string(),
1212
options: TargetOptions {
1313
unsupported_abis: super::arm_base::unsupported_abis(),
14-
target_mcount: "\u{1}_mcount".to_string(),
14+
mcount: "\u{1}_mcount".to_string(),
1515
..base
1616
},
1717
}

‎compiler/rustc_target/src/spec/aarch64_unknown_linux_musl.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ pub fn target() -> Target {
1111
arch: "aarch64".to_string(),
1212
options: TargetOptions {
1313
unsupported_abis: super::arm_base::unsupported_abis(),
14-
target_mcount: "\u{1}_mcount".to_string(),
14+
mcount: "\u{1}_mcount".to_string(),
1515
..base
1616
},
1717
}

‎compiler/rustc_target/src/spec/aarch64_unknown_netbsd.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@ pub fn target() -> Target {
1010
pointer_width: 64,
1111
data_layout: "e-m:e-i8:8:32-i16:16:32-i64:64-i128:128-n32:64-S128".to_string(),
1212
arch: "aarch64".to_string(),
13-
options: TargetOptions { target_mcount: "__mcount".to_string(), ..base },
13+
options: TargetOptions { mcount: "__mcount".to_string(), ..base },
1414
}
1515
}

‎compiler/rustc_target/src/spec/aarch64_unknown_none.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel, Target, TargetOp
1010

1111
pub fn target() -> Target {
1212
let opts = TargetOptions {
13-
target_vendor: String::new(),
13+
vendor: String::new(),
1414
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1515
linker: Some("rust-lld".to_owned()),
1616
features: "+strict-align,+neon,+fp-armv8".to_string(),

‎compiler/rustc_target/src/spec/aarch64_unknown_none_softfloat.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ use super::{LinkerFlavor, LldFlavor, PanicStrategy, RelocModel, Target, TargetOp
1010

1111
pub fn target() -> Target {
1212
let opts = TargetOptions {
13-
target_vendor: String::new(),
13+
vendor: String::new(),
1414
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1515
linker: Some("rust-lld".to_owned()),
1616
features: "+strict-align,-neon,-fp-armv8".to_string(),

‎compiler/rustc_target/src/spec/android_base.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use crate::spec::{LinkerFlavor, TargetOptions};
22

33
pub fn opts() -> TargetOptions {
44
let mut base = super::linux_base::opts();
5-
base.target_os = "android".to_string();
5+
base.os = "android".to_string();
66
// Many of the symbols defined in compiler-rt are also defined in libgcc.
77
// Android's linker doesn't like that by default.
88
base.pre_link_args

‎compiler/rustc_target/src/spec/apple_base.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ pub fn opts(os: &str) -> TargetOptions {
1717
let version = macos_deployment_target();
1818

1919
TargetOptions {
20-
target_os: os.to_string(),
21-
target_vendor: "apple".to_string(),
20+
os: os.to_string(),
21+
vendor: "apple".to_string(),
2222
// macOS has -dead_strip, which doesn't rely on function_sections
2323
function_sections: false,
2424
dynamic_linking: true,
2525
executables: true,
26-
target_family: Some("unix".to_string()),
26+
os_family: Some("unix".to_string()),
2727
is_like_osx: true,
2828
dwarf_version: Some(2),
2929
has_rpath: true,

‎compiler/rustc_target/src/spec/arm_unknown_linux_gnueabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn target() -> Target {
1212
options: TargetOptions {
1313
features: "+strict-align,+v6".to_string(),
1414
unsupported_abis: super::arm_base::unsupported_abis(),
15-
target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
15+
mcount: "\u{1}__gnu_mcount_nc".to_string(),
1616
..base
1717
},
1818
}

‎compiler/rustc_target/src/spec/arm_unknown_linux_gnueabihf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ pub fn target() -> Target {
1212
options: TargetOptions {
1313
features: "+strict-align,+v6,+vfp2,-d32".to_string(),
1414
unsupported_abis: super::arm_base::unsupported_abis(),
15-
target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
15+
mcount: "\u{1}__gnu_mcount_nc".to_string(),
1616
..base
1717
},
1818
}

‎compiler/rustc_target/src/spec/arm_unknown_linux_musleabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717
arch: "arm".to_string(),
1818
options: TargetOptions {
1919
unsupported_abis: super::arm_base::unsupported_abis(),
20-
target_mcount: "\u{1}mcount".to_string(),
20+
mcount: "\u{1}mcount".to_string(),
2121
..base
2222
},
2323
}

‎compiler/rustc_target/src/spec/arm_unknown_linux_musleabihf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub fn target() -> Target {
1717
arch: "arm".to_string(),
1818
options: TargetOptions {
1919
unsupported_abis: super::arm_base::unsupported_abis(),
20-
target_mcount: "\u{1}mcount".to_string(),
20+
mcount: "\u{1}mcount".to_string(),
2121
..base
2222
},
2323
}

‎compiler/rustc_target/src/spec/armebv7r_none_eabi.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ pub fn target() -> Target {
1111
arch: "arm".to_string(),
1212

1313
options: TargetOptions {
14-
target_endian: "big".to_string(),
15-
target_vendor: String::new(),
14+
endian: "big".to_string(),
15+
vendor: String::new(),
1616
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1717
executables: true,
1818
linker: Some("rust-lld".to_owned()),

‎compiler/rustc_target/src/spec/armebv7r_none_eabihf.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ pub fn target() -> Target {
1111
arch: "arm".to_string(),
1212

1313
options: TargetOptions {
14-
target_endian: "big".to_string(),
15-
target_vendor: String::new(),
14+
endian: "big".to_string(),
15+
vendor: String::new(),
1616
linker_flavor: LinkerFlavor::Lld(LldFlavor::Ld),
1717
executables: true,
1818
linker: Some("rust-lld".to_owned()),

‎compiler/rustc_target/src/spec/armv4t_unknown_linux_gnueabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn target() -> Target {
1313
// Atomic operations provided by compiler-builtins
1414
max_atomic_width: Some(32),
1515
unsupported_abis: super::arm_base::unsupported_abis(),
16-
target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
16+
mcount: "\u{1}__gnu_mcount_nc".to_string(),
1717
has_thumb_interworking: true,
1818
..base
1919
},

‎compiler/rustc_target/src/spec/armv5te_unknown_linux_gnueabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ pub fn target() -> Target {
1313
// Atomic operations provided by compiler-builtins
1414
max_atomic_width: Some(32),
1515
unsupported_abis: super::arm_base::unsupported_abis(),
16-
target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
16+
mcount: "\u{1}__gnu_mcount_nc".to_string(),
1717
has_thumb_interworking: true,
1818
..base
1919
},

‎compiler/rustc_target/src/spec/armv5te_unknown_linux_musleabi.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ pub fn target() -> Target {
1616
// Atomic operations provided by compiler-builtins
1717
max_atomic_width: Some(32),
1818
unsupported_abis: super::arm_base::unsupported_abis(),
19-
target_mcount: "\u{1}mcount".to_string(),
19+
mcount: "\u{1}mcount".to_string(),
2020
has_thumb_interworking: true,
2121
..base
2222
},

‎compiler/rustc_target/src/spec/armv6_unknown_freebsd.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ pub fn target() -> Target {
99
arch: "arm".to_string(),
1010

1111
options: TargetOptions {
12-
target_env: "gnueabihf".to_string(),
12+
env: "gnueabihf".to_string(),
1313
features: "+v6,+vfp2,-d32".to_string(),
1414
max_atomic_width: Some(64),
1515
unsupported_abis: super::arm_base::unsupported_abis(),
16-
target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
16+
mcount: "\u{1}__gnu_mcount_nc".to_string(),
1717
..base
1818
},
1919
}

‎compiler/rustc_target/src/spec/armv6_unknown_netbsd_eabihf.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ pub fn target() -> Target {
1010
arch: "arm".to_string(),
1111

1212
options: TargetOptions {
13-
target_env: "eabihf".to_string(),
13+
env: "eabihf".to_string(),
1414
features: "+v6,+vfp2,-d32".to_string(),
1515
unsupported_abis: super::arm_base::unsupported_abis(),
16-
target_mcount: "__mcount".to_string(),
16+
mcount: "__mcount".to_string(),
1717
..base
1818
},
1919
}

‎compiler/rustc_target/src/spec/armv7_unknown_cloudabi_eabihf.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@ pub fn target() -> Target {
1313
pointer_width: 32,
1414
data_layout: "e-m:e-p:32:32-Fi8-i64:64-v128:64:128-a:0:32-n32-S64".to_string(),
1515
arch: "arm".to_string(),
16-
options: TargetOptions { target_mcount: "\u{1}mcount".to_string(), ..base },
16+
options: TargetOptions { mcount: "\u{1}mcount".to_string(), ..base },
1717
}
1818
}

‎compiler/rustc_target/src/spec/armv7_unknown_freebsd.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ pub fn target() -> Target {
99
arch: "arm".to_string(),
1010

1111
options: TargetOptions {
12-
target_env: "gnueabihf".to_string(),
12+
env: "gnueabihf".to_string(),
1313
features: "+v7,+vfp3,-d32,+thumb2,-neon".to_string(),
1414
max_atomic_width: Some(64),
1515
unsupported_abis: super::arm_base::unsupported_abis(),
16-
target_mcount: "\u{1}__gnu_mcount_nc".to_string(),
16+
mcount: "\u{1}__gnu_mcount_nc".to_string(),
1717
..base
1818
},
1919
}

0 commit comments

Comments
 (0)