From 55fe86c57e5a069c0de56ff1ef2adfc80aa0ece7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Tue, 8 Oct 2024 07:55:44 +0200 Subject: [PATCH] std.Target: Remove isBpfFreestanding(). The only use of this has nothing to do with the OS tag. --- lib/std/Target.zig | 4 ---- src/link/Elf.zig | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 9cd7efed92..728521c678 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -1754,10 +1754,6 @@ pub inline fn isBSD(target: Target) bool { return target.os.tag.isBSD(); } -pub inline fn isBpfFreestanding(target: Target) bool { - return target.cpu.arch.isBpf() and target.os.tag == .freestanding; -} - pub inline fn isGnuLibC(target: Target) bool { return target.os.tag.isGnuLibC(target.abi); } diff --git a/src/link/Elf.zig b/src/link/Elf.zig index 0b1439ec80..dfb4a614fa 100644 --- a/src/link/Elf.zig +++ b/src/link/Elf.zig @@ -2045,9 +2045,7 @@ fn linkWithLLD(self: *Elf, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: s // copy when generating relocatables. Normally, we would expect `lld -r` to work. // However, because LLD wants to resolve BPF relocations which it shouldn't, it fails // before even generating the relocatable. - if (output_mode == .Obj and - (comp.config.lto or target.isBpfFreestanding())) - { + if (output_mode == .Obj and (comp.config.lto or target.cpu.arch.isBpf())) { // In this case we must do a simple file copy // here. TODO: think carefully about how we can avoid this redundant operation when doing // build-obj. See also the corresponding TODO in linkAsArchive.