diff options
| author | Matthias Krüger <476013+matthiaskrgr@users.noreply.github.com> | 2025-04-04 08:02:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-04-04 08:02:05 +0200 |
| commit | d7a6a71597baf53418b8483c5dbd9feb64ee41f2 (patch) | |
| tree | 0ccc023caec1d976e36f2638026fb07d9dbcafd6 | |
| parent | 625b8000f7897ab51312f1800fcae280cc3ac81b (diff) | |
| parent | c56c2b7a0db7e0c4a3d1c659af67386f0d1ad648 (diff) | |
| download | rust-d7a6a71597baf53418b8483c5dbd9feb64ee41f2.tar.gz rust-d7a6a71597baf53418b8483c5dbd9feb64ee41f2.zip | |
Rollup merge of #138949 - madsmtm:rename-to-darwin, r=WaffleLapkin
Rename `is_like_osx` to `is_like_darwin` Replace `is_like_osx` with `is_like_darwin`, which more closely describes reality (OS X is the pre-2016 name for macOS, and is by now quite outdated; Darwin is the overall name for the OS underlying Apple's macOS, iOS, etc.). ``@rustbot`` label O-apple r? compiler
| -rw-r--r-- | src/abi/mod.rs | 2 | ||||
| -rw-r--r-- | src/constant.rs | 2 | ||||
| -rw-r--r-- | src/debuginfo/mod.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/abi/mod.rs b/src/abi/mod.rs index e8076ce77ab..ddd119e0c61 100644 --- a/src/abi/mod.rs +++ b/src/abi/mod.rs @@ -641,7 +641,7 @@ pub(crate) fn codegen_terminator_call<'tcx>( .flat_map(|arg_abi| arg_abi.get_abi_param(fx.tcx).into_iter()), ); - if fx.tcx.sess.target.is_like_osx && fx.tcx.sess.target.arch == "aarch64" { + if fx.tcx.sess.target.is_like_darwin && fx.tcx.sess.target.arch == "aarch64" { // Add any padding arguments needed for Apple AArch64. // There's no need to pad the argument list unless variadic arguments are actually being // passed. diff --git a/src/constant.rs b/src/constant.rs index bcc70f4567f..c8527c3a57d 100644 --- a/src/constant.rs +++ b/src/constant.rs @@ -391,7 +391,7 @@ fn define_all_allocs(tcx: TyCtxt<'_>, module: &mut dyn Module, cx: &mut Constant data.set_align(alloc.align.bytes()); if let Some(section_name) = section_name { - let (segment_name, section_name) = if tcx.sess.target.is_like_osx { + let (segment_name, section_name) = if tcx.sess.target.is_like_darwin { // See https://github.com/llvm/llvm-project/blob/main/llvm/lib/MC/MCSectionMachO.cpp let mut parts = section_name.as_str().split(','); let Some(segment_name) = parts.next() else { diff --git a/src/debuginfo/mod.rs b/src/debuginfo/mod.rs index bba6567774d..286e02b986b 100644 --- a/src/debuginfo/mod.rs +++ b/src/debuginfo/mod.rs @@ -58,7 +58,7 @@ impl DebugContext { // FIXME this should be configurable // macOS doesn't seem to support DWARF > 3 // 5 version is required for md5 file hash - version: if tcx.sess.target.is_like_osx { + version: if tcx.sess.target.is_like_darwin { 3 } else { // FIXME change to version 5 once the gdb and lldb shipping with the latest debian |