Skip to content

Commit 2d1f178

Browse files
committed
compiler: update aro and translate-c to latest; delete clang translate-c
1 parent 3ae0ba0 commit 2d1f178

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+41120
-40711
lines changed

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ set(ZIG_CPP_SOURCES
197197
# These are planned to stay even when we are self-hosted.
198198
src/zig_llvm.cpp
199199
src/zig_llvm-ar.cpp
200-
src/zig_clang.cpp
201200
src/zig_clang_driver.cpp
202201
src/zig_clang_cc1_main.cpp
203202
src/zig_clang_cc1as_main.cpp
@@ -652,7 +651,6 @@ set(ZIG_STAGE2_SOURCES
652651
src/register_manager.zig
653652
src/target.zig
654653
src/tracy.zig
655-
src/translate_c.zig
656654
src/libs/wasi_libc.zig
657655
)
658656

build.zig

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -733,13 +733,7 @@ fn addCompilerMod(b: *std.Build, options: AddCompilerModOptions) *std.Build.Modu
733733
.root_source_file = b.path("lib/compiler/aro/aro.zig"),
734734
});
735735

736-
const aro_translate_c_mod = b.createModule(.{
737-
.root_source_file = b.path("lib/compiler/aro_translate_c.zig"),
738-
});
739-
740-
aro_translate_c_mod.addImport("aro", aro_mod);
741736
compiler_mod.addImport("aro", aro_mod);
742-
compiler_mod.addImport("aro_translate_c", aro_translate_c_mod);
743737

744738
if (options.target.result.os.tag == .windows) {
745739
compiler_mod.linkSystemLibrary("advapi32", .{});

lib/compiler/aro/README.md

Lines changed: 0 additions & 26 deletions
This file was deleted.

lib/compiler/aro/aro.zig

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,22 @@ pub const Driver = @import("aro/Driver.zig");
55
pub const Parser = @import("aro/Parser.zig");
66
pub const Preprocessor = @import("aro/Preprocessor.zig");
77
pub const Source = @import("aro/Source.zig");
8+
pub const StringInterner = @import("aro/StringInterner.zig");
9+
pub const target_util = @import("aro/target.zig");
810
pub const Tokenizer = @import("aro/Tokenizer.zig");
911
pub const Toolchain = @import("aro/Toolchain.zig");
1012
pub const Tree = @import("aro/Tree.zig");
11-
pub const Type = @import("aro/Type.zig");
12-
pub const TypeMapper = @import("aro/StringInterner.zig").TypeMapper;
13-
pub const target_util = @import("aro/target.zig");
13+
pub const TypeStore = @import("aro/TypeStore.zig");
14+
pub const QualType = TypeStore.QualType;
15+
pub const Type = TypeStore.Type;
1416
pub const Value = @import("aro/Value.zig");
1517

1618
const backend = @import("backend.zig");
1719
pub const Interner = backend.Interner;
1820
pub const Ir = backend.Ir;
1921
pub const Object = backend.Object;
2022
pub const CallingConvention = backend.CallingConvention;
23+
pub const Assembly = backend.Assembly;
2124

2225
pub const version_str = backend.version_str;
2326
pub const version = backend.version;

0 commit comments

Comments
 (0)