zig

commit 55fe86c57e5a069c0de56ff1ef2adfc80aa0ece7 (tree)
parent 140fb615a6a351fb397d6a538a4954a2229e90a8
Author: Alex Rønne Petersen <alex@alexrp.com>
Date:   Tue,  8 Oct 2024 07:55:44 +0200

std.Target: Remove isBpfFreestanding().

The only use of this has nothing to do with the OS tag.

Diffstat:
M
lib/std/Target.zig
 | 
4
----
M
src/link/Elf.zig
 | 
4
+---

2 files changed, 1 insertion(+), 7 deletions(-)
diff --git 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
@@ -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.