Commit f58705b4a623b39ad10fe25a9a41507fdfc0b089 | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-03-12 00:32:50-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-03-12 00:33:06-04:00
log	f58705b4a623b39ad10fe25a9a41507fdfc0b089
tree	41c076ca172f0ca8b541541752238813de72c5c5
parent	3f1c8e3d58f31dabd22fd6d1fa408512e5cbbb07
signature	Commit is signed but in an unrecognized format.

fix `zig targets` not reporting native info

4 files changed, 29 insertions(+), 28 deletions(-)

src-self-hosted
- stage2.zig
src

src-self-hosted/stage2.zig+24-23

 @@ -626,16 +626,24 @@ fn detectNativeCpuWithLLVM(
 }
 // ABI warning
-export fn stage2_cmd_targets(zig_triple: [*:0]const u8) c_int {
+export fn stage2_cmd_targets(
-    cmdTargets(zig_triple) catch |err| {
+    zig_triple: ?[*:0]const u8,
+    mcpu: ?[*:0]const u8,
+    dynamic_linker: ?[*:0]const u8,
+) c_int {
+    cmdTargets(zig_triple, mcpu, dynamic_linker) catch |err| {
         std.debug.warn("unable to list targets: {}\n", .{@errorName(err)});
         return -1;
     };
     return 0;
 }
-fn cmdTargets(zig_triple: [*:0]const u8) !void {
+fn cmdTargets(
-    var cross_target = try CrossTarget.parse(.{ .arch_os_abi = mem.toSliceConst(u8, zig_triple) });
+    zig_triple_oz: ?[*:0]const u8,
+    mcpu_oz: ?[*:0]const u8,
+    dynamic_linker_oz: ?[*:0]const u8,
+) !void {
+    const cross_target = try stage2CrossTarget(zig_triple_oz, mcpu_oz, dynamic_linker_oz);
     var dynamic_linker: ?[*:0]u8 = null;
     const target = try crossTargetToTarget(cross_target, &dynamic_linker);
     return @import("print_targets.zig").cmdTargets(
 @@ -673,12 +681,11 @@ export fn stage2_target_parse(
     return .None;
 }
-fn stage2TargetParse(
+fn stage2CrossTarget(
-    stage1_target: *Stage2Target,
     zig_triple_oz: ?[*:0]const u8,
     mcpu_oz: ?[*:0]const u8,
     dynamic_linker_oz: ?[*:0]const u8,
-) !void {
+) !CrossTarget {
     const zig_triple = if (zig_triple_oz) |zig_triple_z| mem.toSliceConst(u8, zig_triple_z) else "native";
     const mcpu = if (mcpu_oz) |mcpu_z| mem.toSliceConst(u8, mcpu_z) else null;
     const dynamic_linker = if (dynamic_linker_oz) |dl_z| mem.toSliceConst(u8, dl_z) else null;
 @@ -716,6 +723,16 @@ fn stage2TargetParse(
         else => |e| return e,
     };
+    return target;
+}
+fn stage2TargetParse(
+    stage1_target: *Stage2Target,
+    zig_triple_oz: ?[*:0]const u8,
+    mcpu_oz: ?[*:0]const u8,
+    dynamic_linker_oz: ?[*:0]const u8,
+) !void {
+    const target = try stage2CrossTarget(zig_triple_oz, mcpu_oz, dynamic_linker_oz);
     try stage1_target.fromTarget(target);
 }
 @@ -905,22 +922,6 @@ const Stage2Target = extern struct {
     dynamic_linker: ?[*:0]const u8,
-    fn toTarget(in_target: Stage2Target) CrossTarget {
-        if (in_target.is_native) return .{};
-        const in_arch = in_target.arch - 1; // skip over ZigLLVM_UnknownArch
-        const in_os = in_target.os;
-        const in_abi = in_target.abi;
-        return .{
-            .Cross = .{
-                .cpu = Target.Cpu.baseline(enumInt(Target.Cpu.Arch, in_arch)),
-                .os = Target.Os.defaultVersionRange(enumInt(Target.Os.Tag, in_os)),
-                .abi = enumInt(Target.Abi, in_abi),
-            },
-        };
-    }
     fn fromTarget(self: *Stage2Target, cross_target: CrossTarget) !void {
         const allocator = std.heap.c_allocator;

src/main.cpp+1-1

...	@@ -1391,7 +1391,7 @@ static int main0(int argc, char **argv) {	...	@@ -1391,7 +1391,7 @@ static int main0(int argc, char **argv) {
1391	return main_exit(root_progress_node, EXIT_SUCCESS);	1391	return main_exit(root_progress_node, EXIT_SUCCESS);
1392	}	1392	}
1393	case CmdTargets:	1393	case CmdTargets:
1394	return stage2_cmd_targets(buf_ptr(&zig_triple_buf));	1394	return stage2_cmd_targets(target_string, mcpu, dynamic_linker);
1395	case CmdNone:	1395	case CmdNone:
1396	return print_full_usage(arg0, stderr, EXIT_FAILURE);	1396	return print_full_usage(arg0, stderr, EXIT_FAILURE);
1397	}	1397	}

src/stage2.cpp+1-1

...	@@ -260,7 +260,7 @@ Error stage2_target_parse(struct ZigTarget target, const char zig_triple, cons	...	@@ -260,7 +260,7 @@ Error stage2_target_parse(struct ZigTarget target, const char zig_triple, cons
260	return ErrorNone;	260	return ErrorNone;
261	}	261	}
262		262
263	int stage2_cmd_targets(const char *zig_triple) {	263	int stage2_cmd_targets(const char zig_triple, const char mcpu, const char *dynamic_linker) {
264	const char *msg = "stage0 called stage2_cmd_targets";	264	const char *msg = "stage0 called stage2_cmd_targets";
265	stage2_panic(msg, strlen(msg));	265	stage2_panic(msg, strlen(msg));
266	}	266	}

src/stage2.h+3-3

 @@ -201,9 +201,6 @@ ZIG_EXTERN_C void stage2_progress_complete_one(Stage2ProgressNode *node);
 ZIG_EXTERN_C void stage2_progress_update_node(Stage2ProgressNode *node,
         size_t completed_count, size_t estimated_total_items);
-// ABI warning
-ZIG_EXTERN_C int stage2_cmd_targets(const char *zig_triple);
 // ABI warning
 struct Stage2LibCInstallation {
     const char *include_dir;
 @@ -302,6 +299,9 @@ struct ZigTarget {
 ZIG_EXTERN_C enum Error stage2_target_parse(struct ZigTarget *target, const char *zig_triple, const char *mcpu,
         const char *dynamic_linker);
+// ABI warning
+ZIG_EXTERN_C int stage2_cmd_targets(const char *zig_triple, const char *mcpu, const char *dynamic_linker);
 // ABI warning
 struct Stage2NativePaths {