Merge pull request #19122 from ziglang/lazy-aro

make aro-based translate-c lazily built from source
ziglang · Feb 29, 2024 · f5aad47 · f5aad47
2 parents 69df00f + 49437d3
commit f5aad47
Show file tree

Hide file tree

Showing 68 changed files with 16,578 additions and 22,667 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -643,11 +643,8 @@ set(ZIG_STAGE2_SOURCES
     "${CMAKE_SOURCE_DIR}/src/target.zig"
     "${CMAKE_SOURCE_DIR}/src/tracy.zig"
     "${CMAKE_SOURCE_DIR}/src/translate_c.zig"
-    "${CMAKE_SOURCE_DIR}/src/translate_c/ast.zig"
     "${CMAKE_SOURCE_DIR}/src/type.zig"
     "${CMAKE_SOURCE_DIR}/src/wasi_libc.zig"
-    "${CMAKE_SOURCE_DIR}/src/stubs/aro_builtins.zig"
-    "${CMAKE_SOURCE_DIR}/src/stubs/aro_names.zig"
 )
 
 if(MSVC)
@@ -822,18 +819,7 @@ set(BUILD_ZIG2_ARGS
   --dep "aro"
   --mod "root" "src/main.zig"
   --mod "build_options" "${ZIG_CONFIG_ZIG_OUT}"
-  --mod "aro_options" "src/stubs/aro_options.zig"
-  --mod "Builtins/Builtin.def" "src/stubs/aro_builtins.zig"
-  --mod "Attribute/names.def" "src/stubs/aro_names.zig"
-  --mod "Diagnostics/messages.def" "src/stubs/aro_messages.zig"
-  --dep "build_options=aro_options"
-  --mod "aro_backend" "deps/aro/backend.zig"
-  --dep "Builtins/Builtin.def"
-  --dep "Attribute/names.def"
-  --dep "Diagnostics/messages.def"
-  --dep "build_options=aro_options"
-  --dep "backend=aro_backend"
-  --mod "aro" "deps/aro/aro.zig"
+  --mod "aro" "lib/compiler/aro/aro.zig"
 )
 
 add_custom_command(

diff --git a/bootstrap.c b/bootstrap.c
@@ -156,22 +156,8 @@ int main(int argc, char **argv) {
             "--dep", "build_options",
             "--dep", "aro",
             "--mod", "root", "src/main.zig",
-
             "--mod", "build_options", "config.zig",
-            "--mod", "aro_options", "src/stubs/aro_options.zig",
-            "--mod", "Builtins/Builtin.def", "src/stubs/aro_builtins.zig",
-            "--mod", "Attribute/names.def", "src/stubs/aro_names.zig",
-            "--mod", "Diagnostics/messages.def", "src/stubs/aro_messages.zig",
-
-            "--dep", "build_options=aro_options",
-            "--mod", "aro_backend", "deps/aro/backend.zig",
-
-            "--dep", "Builtins/Builtin.def",
-            "--dep", "Attribute/names.def",
-            "--dep", "Diagnostics/messages.def",
-            "--dep", "build_options=aro_options",
-            "--dep", "backend=aro_backend",
-            "--mod", "aro", "deps/aro/aro.zig",
+            "--mod", "aro", "lib/compiler/aro/aro.zig",
             NULL,
         };
         print_and_run(child_argv);

diff --git a/build.zig b/build.zig
@@ -8,7 +8,6 @@ const io = std.io;
 const fs = std.fs;
 const InstallDirectoryOptions = std.Build.InstallDirectoryOptions;
 const assert = std.debug.assert;
-const GenerateDef = @import("deps/aro/build/GenerateDef.zig");
 
 const zig_version = std.SemanticVersion{ .major = 0, .minor = 12, .patch = 0 };
 const stack_size = 32 * 1024 * 1024;
@@ -636,34 +635,22 @@ fn addCompilerStep(b: *std.Build, options: AddCompilerStepOptions) *std.Build.St
     });
     exe.stack_size = stack_size;
 
-    const aro_options = b.addOptions();
-    aro_options.addOption([]const u8, "version_str", "aro-zig");
-    const aro_options_module = aro_options.createModule();
-    const aro_backend = b.createModule(.{
-        .root_source_file = .{ .path = "deps/aro/backend.zig" },
-        .imports = &.{.{
-            .name = "build_options",
-            .module = aro_options_module,
-        }},
-    });
     const aro_module = b.createModule(.{
-        .root_source_file = .{ .path = "deps/aro/aro.zig" },
+        .root_source_file = .{ .path = "lib/compiler/aro/aro.zig" },
+    });
+
+    const aro_translate_c_module = b.createModule(.{
+        .root_source_file = .{ .path = "lib/compiler/aro_translate_c.zig" },
         .imports = &.{
             .{
-                .name = "build_options",
-                .module = aro_options_module,
-            },
-            .{
-                .name = "backend",
-                .module = aro_backend,
+                .name = "aro",
+                .module = aro_module,
             },
-            GenerateDef.create(b, .{ .name = "Builtins/Builtin.def", .src_prefix = "deps/aro/aro" }),
-            GenerateDef.create(b, .{ .name = "Attribute/names.def", .src_prefix = "deps/aro/aro" }),
-            GenerateDef.create(b, .{ .name = "Diagnostics/messages.def", .src_prefix = "deps/aro/aro", .kind = .named }),
         },
     });
 
     exe.root_module.addImport("aro", aro_module);
+    exe.root_module.addImport("aro_translate_c", aro_translate_c_module);
     return exe;
 }