Remove MultiArch and MultiAbi

Author: richerfu

tools/process_headers_ohos.zig

@@ -41,42 +41,8 @@ const Blake3 = std.crypto.hash.Blake3;
 
 const LibCTarget = struct {
     name: []const u8,
-    arch: MultiArch,
-    abi: MultiAbi,
-};
-
-const MultiArch = union(enum) {
-    aarch64,
-    arm,
-    x86_64,
-    specific: Arch,
-
-    fn eql(a: MultiArch, b: MultiArch) bool {
-        if (@intFromEnum(a) != @intFromEnum(b))
-            return false;
-        if (a != .specific)
-            return true;
-        return a.specific == b.specific;
-    }
-};
-
-const MultiAbi = union(enum) {
-    musl,
-    specific: Abi,
-
-    fn eql(a: MultiAbi, b: MultiAbi) bool {
-        if (@intFromEnum(a) != @intFromEnum(b))
-            return false;
-        if (std.meta.Tag(MultiAbi)(a) != .specific)
-            return true;
-        return a.specific == b.specific;
-    }
-};
-
-const targets_dirs = &[_][]const u8{
-    "aarch64-linux-ohos",
-    "arm-linux-ohos",
-    "x86_64-linux-ohos",
+    arch: Arch,
+    abi: Abi,
 };
 
 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 {
 const musl_targets = [_]LibCTarget{
     LibCTarget{
         .name = "aarch64",
-        .arch = MultiArch.aarch64,
-        .abi = MultiAbi.musl,
+        .arch = Arch.aarch64,
+        .abi = Abi.ohos,
     },
     LibCTarget{
         .name = "arm",
-        .arch = MultiArch.arm,
-        .abi = MultiAbi.musl,
+        .arch = Arch.arm,
+        .abi = Abi.ohoseabi,
     },
     LibCTarget{
         .name = "x86_64",
-        .arch = MultiArch.x86_64,
-        .abi = MultiAbi.musl,
+        .arch = Arch.x86_64,
+        .abi = Abi.ohos,
     },
 };
 
@@ -294,14 +260,10 @@ pub fn main() !void {
     var ohos_common_content = HashToContents.init(allocator);
 
     for (musl_targets) |libc_target| {
-        var abi: []const u8 = "ohos";
-        if (std.mem.eql(u8, libc_target.name, "arm")) {
-            abi = "ohoseabi";
-        }
         const target = try std.fmt.allocPrint(allocator, "{s}-{s}-{s}", .{
             libc_target.name,
             "linux",
-            abi,
+            libc_target.abi,
         });
 
         const arch_generic_hash_content = generateGenericFileMap(allocator, &[_][]const u8{ generic_musl_libc_dir, "arch", libc_target.name }) catch |err| {