Skip to content

Commit eb0bb8b

Browse files
committed
Remove MultiArch and MultiAbi
1 parent dd60b4c commit eb0bb8b

File tree

1 file changed

+9
-47
lines changed

1 file changed

+9
-47
lines changed

tools/process_headers_ohos.zig

+9-47
Original file line numberDiff line numberDiff line change
@@ -41,42 +41,8 @@ const Blake3 = std.crypto.hash.Blake3;
4141

4242
const LibCTarget = struct {
4343
name: []const u8,
44-
arch: MultiArch,
45-
abi: MultiAbi,
46-
};
47-
48-
const MultiArch = union(enum) {
49-
aarch64,
50-
arm,
51-
x86_64,
52-
specific: Arch,
53-
54-
fn eql(a: MultiArch, b: MultiArch) bool {
55-
if (@intFromEnum(a) != @intFromEnum(b))
56-
return false;
57-
if (a != .specific)
58-
return true;
59-
return a.specific == b.specific;
60-
}
61-
};
62-
63-
const MultiAbi = union(enum) {
64-
musl,
65-
specific: Abi,
66-
67-
fn eql(a: MultiAbi, b: MultiAbi) bool {
68-
if (@intFromEnum(a) != @intFromEnum(b))
69-
return false;
70-
if (std.meta.Tag(MultiAbi)(a) != .specific)
71-
return true;
72-
return a.specific == b.specific;
73-
}
74-
};
75-
76-
const targets_dirs = &[_][]const u8{
77-
"aarch64-linux-ohos",
78-
"arm-linux-ohos",
79-
"x86_64-linux-ohos",
44+
arch: Arch,
45+
abi: Abi,
8046
};
8147

8248
fn is_in_array(value: []const u8, array: []const []const u8) bool {
@@ -91,18 +57,18 @@ fn is_in_array(value: []const u8, array: []const []const u8) bool {
9157
const musl_targets = [_]LibCTarget{
9258
LibCTarget{
9359
.name = "aarch64",
94-
.arch = MultiArch.aarch64,
95-
.abi = MultiAbi.musl,
60+
.arch = Arch.aarch64,
61+
.abi = Abi.ohos,
9662
},
9763
LibCTarget{
9864
.name = "arm",
99-
.arch = MultiArch.arm,
100-
.abi = MultiAbi.musl,
65+
.arch = Arch.arm,
66+
.abi = Abi.ohoseabi,
10167
},
10268
LibCTarget{
10369
.name = "x86_64",
104-
.arch = MultiArch.x86_64,
105-
.abi = MultiAbi.musl,
70+
.arch = Arch.x86_64,
71+
.abi = Abi.ohos,
10672
},
10773
};
10874

@@ -294,14 +260,10 @@ pub fn main() !void {
294260
var ohos_common_content = HashToContents.init(allocator);
295261

296262
for (musl_targets) |libc_target| {
297-
var abi: []const u8 = "ohos";
298-
if (std.mem.eql(u8, libc_target.name, "arm")) {
299-
abi = "ohoseabi";
300-
}
301263
const target = try std.fmt.allocPrint(allocator, "{s}-{s}-{s}", .{
302264
libc_target.name,
303265
"linux",
304-
abi,
266+
libc_target.abi,
305267
});
306268

307269
const arch_generic_hash_content = generateGenericFileMap(allocator, &[_][]const u8{ generic_musl_libc_dir, "arch", libc_target.name }) catch |err| {

0 commit comments

Comments
 (0)