From 610d3cf9deabb06a9729b54df4e9123d98a3c386 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= <alex@alexrp.com>
Date: Mon, 21 Apr 2025 07:05:02 +0200
Subject: [PATCH] compiler: Move vendored library support to `libs`
 subdirectory.

---
 CMakeLists.txt               | 14 +++++++-------
 src/Compilation.zig          | 14 +++++++-------
 src/{ => libs}/glibc.zig     |  8 ++++----
 src/{ => libs}/libcxx.zig    |  8 ++++----
 src/{ => libs}/libtsan.zig   |  6 +++---
 src/{ => libs}/libunwind.zig |  8 ++++----
 src/{ => libs}/mingw.zig     |  6 +++---
 src/{ => libs}/musl.zig      |  4 ++--
 src/{ => libs}/wasi_libc.zig |  2 +-
 src/link.zig                 |  2 +-
 src/link/Elf.zig             |  4 ++--
 src/link/Wasm.zig            |  2 +-
 src/main.zig                 |  4 ++--
 src/print_targets.zig        |  2 +-
 14 files changed, 42 insertions(+), 42 deletions(-)
 rename src/{ => libs}/glibc.zig (99%)
 rename src/{ => libs}/libcxx.zig (99%)
 rename src/{ => libs}/libtsan.zig (99%)
 rename src/{ => libs}/libunwind.zig (97%)
 rename src/{ => libs}/mingw.zig (99%)
 rename src/{ => libs}/musl.zig (99%)
 rename src/{ => libs}/wasi_libc.zig (99%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12bcec0b3a..dc0c2b3914 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -586,11 +586,11 @@ set(ZIG_STAGE2_SOURCES
     src/codegen/spirv/spec.zig
     src/crash_report.zig
     src/dev.zig
-    src/glibc.zig
+    src/libs/glibc.zig
     src/introspect.zig
-    src/libcxx.zig
-    src/libtsan.zig
-    src/libunwind.zig
+    src/libs/libcxx.zig
+    src/libs/libtsan.zig
+    src/libs/libunwind.zig
     src/link.zig
     src/link/C.zig
     src/link/Coff.zig
@@ -664,8 +664,8 @@ set(ZIG_STAGE2_SOURCES
     src/link/tapi/yaml.zig
     src/link/tapi/yaml/test.zig
     src/main.zig
-    src/mingw.zig
-    src/musl.zig
+    src/libs/mingw.zig
+    src/libs/musl.zig
     src/mutable_value.zig
     src/print_air.zig
     src/print_env.zig
@@ -676,7 +676,7 @@ set(ZIG_STAGE2_SOURCES
     src/target.zig
     src/tracy.zig
     src/translate_c.zig
-    src/wasi_libc.zig
+    src/libs/wasi_libc.zig
 )
 
 if(MSVC)
diff --git a/src/Compilation.zig b/src/Compilation.zig
index 76fe5ab916..0a63d29e13 100644
--- a/src/Compilation.zig
+++ b/src/Compilation.zig
@@ -21,12 +21,12 @@ const tracy = @import("tracy.zig");
 const trace = tracy.trace;
 const build_options = @import("build_options");
 const LibCInstallation = std.zig.LibCInstallation;
-const glibc = @import("glibc.zig");
-const musl = @import("musl.zig");
-const mingw = @import("mingw.zig");
-const libunwind = @import("libunwind.zig");
-const libcxx = @import("libcxx.zig");
-const wasi_libc = @import("wasi_libc.zig");
+const glibc = @import("libs/glibc.zig");
+const musl = @import("libs/musl.zig");
+const mingw = @import("libs/mingw.zig");
+const libunwind = @import("libs/libunwind.zig");
+const libcxx = @import("libs/libcxx.zig");
+const wasi_libc = @import("libs/wasi_libc.zig");
 const fatal = @import("main.zig").fatal;
 const clangMain = @import("main.zig").clangMain;
 const Zcu = @import("Zcu.zig");
@@ -34,7 +34,7 @@ const Sema = @import("Sema.zig");
 const InternPool = @import("InternPool.zig");
 const Cache = std.Build.Cache;
 const c_codegen = @import("codegen/c.zig");
-const libtsan = @import("libtsan.zig");
+const libtsan = @import("libs/libtsan.zig");
 const Zir = std.zig.Zir;
 const Air = @import("Air.zig");
 const Builtin = @import("Builtin.zig");
diff --git a/src/glibc.zig b/src/libs/glibc.zig
similarity index 99%
rename from src/glibc.zig
rename to src/libs/glibc.zig
index 2782902e8f..5d1c6f420b 100644
--- a/src/glibc.zig
+++ b/src/libs/glibc.zig
@@ -8,12 +8,12 @@ const assert = std.debug.assert;
 const Version = std.SemanticVersion;
 const Path = std.Build.Cache.Path;
 
-const Compilation = @import("Compilation.zig");
+const Compilation = @import("../Compilation.zig");
 const build_options = @import("build_options");
-const trace = @import("tracy.zig").trace;
+const trace = @import("../tracy.zig").trace;
 const Cache = std.Build.Cache;
-const Module = @import("Package/Module.zig");
-const link = @import("link.zig");
+const Module = @import("../Package/Module.zig");
+const link = @import("../link.zig");
 
 pub const Lib = struct {
     name: []const u8,
diff --git a/src/libcxx.zig b/src/libs/libcxx.zig
similarity index 99%
rename from src/libcxx.zig
rename to src/libs/libcxx.zig
index 615fee514f..d832868edc 100644
--- a/src/libcxx.zig
+++ b/src/libs/libcxx.zig
@@ -2,11 +2,11 @@ const std = @import("std");
 const path = std.fs.path;
 const assert = std.debug.assert;
 
-const target_util = @import("target.zig");
-const Compilation = @import("Compilation.zig");
+const target_util = @import("../target.zig");
+const Compilation = @import("../Compilation.zig");
 const build_options = @import("build_options");
-const trace = @import("tracy.zig").trace;
-const Module = @import("Package/Module.zig");
+const trace = @import("../tracy.zig").trace;
+const Module = @import("../Package/Module.zig");
 
 const libcxxabi_files = [_][]const u8{
     "src/abort_message.cpp",
diff --git a/src/libtsan.zig b/src/libs/libtsan.zig
similarity index 99%
rename from src/libtsan.zig
rename to src/libs/libtsan.zig
index 5d172f740a..c2cc82465d 100644
--- a/src/libtsan.zig
+++ b/src/libs/libtsan.zig
@@ -1,10 +1,10 @@
 const std = @import("std");
 const assert = std.debug.assert;
 
-const Compilation = @import("Compilation.zig");
+const Compilation = @import("../Compilation.zig");
 const build_options = @import("build_options");
-const trace = @import("tracy.zig").trace;
-const Module = @import("Package/Module.zig");
+const trace = @import("../tracy.zig").trace;
+const Module = @import("../Package/Module.zig");
 
 pub const BuildError = error{
     OutOfMemory,
diff --git a/src/libunwind.zig b/src/libs/libunwind.zig
similarity index 97%
rename from src/libunwind.zig
rename to src/libs/libunwind.zig
index 13180a1d59..c453aca42c 100644
--- a/src/libunwind.zig
+++ b/src/libs/libunwind.zig
@@ -2,11 +2,11 @@ const std = @import("std");
 const path = std.fs.path;
 const assert = std.debug.assert;
 
-const target_util = @import("target.zig");
-const Compilation = @import("Compilation.zig");
-const Module = @import("Package/Module.zig");
+const target_util = @import("../target.zig");
+const Compilation = @import("../Compilation.zig");
+const Module = @import("../Package/Module.zig");
 const build_options = @import("build_options");
-const trace = @import("tracy.zig").trace;
+const trace = @import("../tracy.zig").trace;
 
 pub const BuildError = error{
     OutOfMemory,
diff --git a/src/mingw.zig b/src/libs/mingw.zig
similarity index 99%
rename from src/mingw.zig
rename to src/libs/mingw.zig
index fbedf638bf..2049b0f6b7 100644
--- a/src/mingw.zig
+++ b/src/libs/mingw.zig
@@ -6,10 +6,10 @@ const assert = std.debug.assert;
 const log = std.log.scoped(.mingw);
 
 const builtin = @import("builtin");
-const Compilation = @import("Compilation.zig");
+const Compilation = @import("../Compilation.zig");
 const build_options = @import("build_options");
 const Cache = std.Build.Cache;
-const dev = @import("dev.zig");
+const dev = @import("../dev.zig");
 
 pub const CrtFile = enum {
     crt2_o,
@@ -348,7 +348,7 @@ pub fn buildImportLib(comp: *Compilation, lib_name: []const u8) !void {
     errdefer gpa.free(lib_final_path);
 
     if (!build_options.have_llvm) return error.ZigCompilerNotBuiltWithLLVMExtensions;
-    const llvm_bindings = @import("codegen/llvm/bindings.zig");
+    const llvm_bindings = @import("../codegen/llvm/bindings.zig");
     const def_final_path_z = try arena.dupeZ(u8, def_final_path);
     const lib_final_path_z = try comp.global_cache_directory.joinZ(arena, &.{lib_final_path});
     if (llvm_bindings.WriteImportLibrary(
diff --git a/src/musl.zig b/src/libs/musl.zig
similarity index 99%
rename from src/musl.zig
rename to src/libs/musl.zig
index 6903544fb3..bc89e20c21 100644
--- a/src/musl.zig
+++ b/src/libs/musl.zig
@@ -3,9 +3,9 @@ const Allocator = std.mem.Allocator;
 const mem = std.mem;
 const path = std.fs.path;
 const assert = std.debug.assert;
-const Module = @import("Package/Module.zig");
+const Module = @import("../Package/Module.zig");
 
-const Compilation = @import("Compilation.zig");
+const Compilation = @import("../Compilation.zig");
 const build_options = @import("build_options");
 
 pub const CrtFile = enum {
diff --git a/src/wasi_libc.zig b/src/libs/wasi_libc.zig
similarity index 99%
rename from src/wasi_libc.zig
rename to src/libs/wasi_libc.zig
index abd9972aeb..2657c2e1f8 100644
--- a/src/wasi_libc.zig
+++ b/src/libs/wasi_libc.zig
@@ -3,7 +3,7 @@ const mem = std.mem;
 const path = std.fs.path;
 
 const Allocator = std.mem.Allocator;
-const Compilation = @import("Compilation.zig");
+const Compilation = @import("../Compilation.zig");
 const build_options = @import("build_options");
 
 pub const CrtFile = enum {
diff --git a/src/link.zig b/src/link.zig
index 2f04751aac..8f5c860bbe 100644
--- a/src/link.zig
+++ b/src/link.zig
@@ -6,7 +6,7 @@ const fs = std.fs;
 const mem = std.mem;
 const log = std.log.scoped(.link);
 const trace = @import("tracy.zig").trace;
-const wasi_libc = @import("wasi_libc.zig");
+const wasi_libc = @import("libs/wasi_libc.zig");
 
 const Air = @import("Air.zig");
 const Allocator = std.mem.Allocator;
diff --git a/src/link/Elf.zig b/src/link/Elf.zig
index f4f8209415..987e1a9758 100644
--- a/src/link/Elf.zig
+++ b/src/link/Elf.zig
@@ -5279,9 +5279,9 @@ const codegen = @import("../codegen.zig");
 const dev = @import("../dev.zig");
 const eh_frame = @import("Elf/eh_frame.zig");
 const gc = @import("Elf/gc.zig");
-const glibc = @import("../glibc.zig");
+const glibc = @import("../libs/glibc.zig");
 const link = @import("../link.zig");
-const musl = @import("../musl.zig");
+const musl = @import("../libs/musl.zig");
 const relocatable = @import("Elf/relocatable.zig");
 const relocation = @import("Elf/relocation.zig");
 const target_util = @import("../target.zig");
diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig
index 5f107823a4..ff3682ffe4 100644
--- a/src/link/Wasm.zig
+++ b/src/link/Wasm.zig
@@ -44,7 +44,7 @@ const dev = @import("../dev.zig");
 const link = @import("../link.zig");
 const lldMain = @import("../main.zig").lldMain;
 const trace = @import("../tracy.zig").trace;
-const wasi_libc = @import("../wasi_libc.zig");
+const wasi_libc = @import("../libs/wasi_libc.zig");
 const Value = @import("../Value.zig");
 
 base: link.File,
diff --git a/src/main.zig b/src/main.zig
index 7a0e9c87a0..c196f1a4fd 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -28,11 +28,11 @@ const link = @import("link.zig");
 const Package = @import("Package.zig");
 const build_options = @import("build_options");
 const introspect = @import("introspect.zig");
-const wasi_libc = @import("wasi_libc.zig");
+const wasi_libc = @import("libs/wasi_libc.zig");
 const target_util = @import("target.zig");
 const crash_report = @import("crash_report.zig");
 const Zcu = @import("Zcu.zig");
-const mingw = @import("mingw.zig");
+const mingw = @import("libs/mingw.zig");
 const dev = @import("dev.zig");
 
 test {
diff --git a/src/print_targets.zig b/src/print_targets.zig
index a00683255d..51bd0f2ed5 100644
--- a/src/print_targets.zig
+++ b/src/print_targets.zig
@@ -7,7 +7,7 @@ const Allocator = std.mem.Allocator;
 const Target = std.Target;
 const target = @import("target.zig");
 const assert = std.debug.assert;
-const glibc = @import("glibc.zig");
+const glibc = @import("libs/glibc.zig");
 const introspect = @import("introspect.zig");
 const fatal = @import("main.zig").fatal;