Sync Aro dependency & translate-c progress

CMakeLists.txt

@@ -817,9 +817,12 @@ set(BUILD_ZIG2_ARGS
   -OReleaseSmall
   --name zig2 -femit-bin="${ZIG2_C_SOURCE}"
   --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 "aro:Builtins/Builtin.def,Attribute/names.def:deps/aro/lib.zig"
+  --mod "Diagnostics/messages.def::src/stubs/aro_messages.zig"
+  --mod "aro_backend:build_options=aro_options:deps/aro/backend.zig"
+  --mod "aro:Builtins/Builtin.def,Attribute/names.def,Diagnostics/messages.def,build_options=aro_options,backend=aro_backend:deps/aro/aro.zig"
   --deps build_options,aro
   -target "${ZIG_HOST_TARGET_TRIPLE}"
 )

bootstrap.c

@@ -140,9 +140,12 @@ int main(int argc, char **argv) {
             "-ofmt=c", "-lc", "-OReleaseSmall",
             "--name", "zig2", "-femit-bin=zig2.c",
             "--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", "aro:Builtins/Builtin.def,Attribute/names.def:deps/aro/lib.zig",
+            "--mod", "Diagnostics/messages.def::src/stubs/aro_messages.zig",
+            "--mod", "aro_backend:build_options=aro_options:deps/aro/backend.zig",
+            "--mod", "aro:Builtins/Builtin.def,Attribute/names.def,Diagnostics/messages.def,build_options=aro_options,backend=aro_backend:deps/aro/aro.zig",
             "--deps", "build_options,aro",
             "-target", host_triple,
             NULL,

build.zig

@@ -590,11 +590,33 @@ fn addCompilerStep(
         .max_rss = 7_000_000_000,
     });
     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(.{
+        .source_file = .{ .path = "deps/aro/backend.zig" },
+        .dependencies = &.{.{
+            .name = "build_options",
+            .module = aro_options_module,
+        }},
+    });
     const aro_module = b.createModule(.{
-        .source_file = .{ .path = "deps/aro/lib.zig" },
+        .source_file = .{ .path = "deps/aro/aro.zig" },
+        .dependencies = &.{
+            .{
+                .name = "build_options",
+                .module = aro_options_module,
+            },
+            .{
+                .name = "backend",
+                .module = aro_backend,
+            },
+            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 }),
+        },
     });
-    GenerateDef.add(b, "deps/aro/Builtins/Builtin.def", "Builtins/Builtin.def", exe, aro_module);
-    GenerateDef.add(b, "deps/aro/Attribute/names.def", "Attribute/names.def", exe, aro_module);
 
     exe.addModule("aro", aro_module);
     return exe;