Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.

Commit 6580ceb

Browse files
committed
rustc_target: windows(_uwp)_base -> windows(_uwp)_gnu_base
The old naming is from ancient times when there was no MSVC support. Also `uefi_base` -> `uefi_msvc_base`. It will inherit from `msvc_base` in a future commit, plus a GNU UEFI target is also potentially possible.
1 parent cfe90eb commit 6580ceb

10 files changed

+9
-9
lines changed

src/librustc_target/spec/i686_pc_windows_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::spec::{LinkerFlavor, Target, TargetResult};
22

33
pub fn target() -> TargetResult {
4-
let mut base = super::windows_base::opts();
4+
let mut base = super::windows_gnu_base::opts();
55
base.cpu = "pentium4".to_string();
66
base.max_atomic_width = Some(64);
77
base.eliminate_frame_pointer = false; // Required for backtraces

src/librustc_target/spec/i686_unknown_uefi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use crate::spec::{LinkerFlavor, LldFlavor, Target, TargetResult};
99

1010
pub fn target() -> TargetResult {
11-
let mut base = super::uefi_base::opts();
11+
let mut base = super::uefi_msvc_base::opts();
1212
base.cpu = "pentium4".to_string();
1313
base.max_atomic_width = Some(64);
1414

src/librustc_target/spec/i686_uwp_windows_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::spec::{LinkerFlavor, Target, TargetResult};
22

33
pub fn target() -> TargetResult {
4-
let mut base = super::windows_uwp_base::opts();
4+
let mut base = super::windows_uwp_gnu_base::opts();
55
base.cpu = "pentium4".to_string();
66
base.max_atomic_width = Some(64);
77
base.eliminate_frame_pointer = false; // Required for backtraces

src/librustc_target/spec/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,12 +66,12 @@ mod redox_base;
6666
mod riscv_base;
6767
mod solaris_base;
6868
mod thumb_base;
69-
mod uefi_base;
69+
mod uefi_msvc_base;
7070
mod vxworks_base;
7171
mod wasm32_base;
72-
mod windows_base;
72+
mod windows_gnu_base;
7373
mod windows_msvc_base;
74-
mod windows_uwp_base;
74+
mod windows_uwp_gnu_base;
7575
mod windows_uwp_msvc_base;
7676

7777
#[derive(Clone, Copy, Debug, Eq, Ord, PartialEq, PartialOrd)]

src/librustc_target/spec/x86_64_pc_windows_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::spec::{LinkerFlavor, Target, TargetResult};
22

33
pub fn target() -> TargetResult {
4-
let mut base = super::windows_base::opts();
4+
let mut base = super::windows_gnu_base::opts();
55
base.cpu = "x86-64".to_string();
66
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
77
base.max_atomic_width = Some(64);

src/librustc_target/spec/x86_64_unknown_uefi.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
use crate::spec::{LinkerFlavor, LldFlavor, Target, TargetResult};
99

1010
pub fn target() -> TargetResult {
11-
let mut base = super::uefi_base::opts();
11+
let mut base = super::uefi_msvc_base::opts();
1212
base.cpu = "x86-64".to_string();
1313
base.max_atomic_width = Some(64);
1414

src/librustc_target/spec/x86_64_uwp_windows_gnu.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use crate::spec::{LinkerFlavor, Target, TargetResult};
22

33
pub fn target() -> TargetResult {
4-
let mut base = super::windows_uwp_base::opts();
4+
let mut base = super::windows_uwp_gnu_base::opts();
55
base.cpu = "x86-64".to_string();
66
base.pre_link_args.get_mut(&LinkerFlavor::Gcc).unwrap().push("-m64".to_string());
77
base.max_atomic_width = Some(64);

0 commit comments

Comments
 (0)