Commit e17297102a14620c8d53a3d1f4137314880a28ce | zig

author	Andrew Kelley <andrew@ziglang.org> 2020-10-15 16:48:44-07:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-10-15 16:48:44-07:00
log	e17297102a14620c8d53a3d1f4137314880a28ce
tree	3e30f4bfa2ea9db5f28e7b11cc80bc5313ed00b0
parent	8c4031fd87c385ede55834130cb05a1ac04b07ac
parent	d91e75f5cacebd80f574993160839f8af21a5984

Merge branch 'kubkon-enable-stage2-macos-tests'

closes #6661

3 files changed, 32 insertions(+), 18 deletions(-)

lib
- std
  - target.zig
  - zig
    cross_target.zig
test
- stage2
  - test.zig

lib/std/target.zig+20-14

 @@ -483,6 +483,16 @@ pub const Target = struct {
                 else => false,
             };
         }
+        pub fn floatAbi(abi: Abi) FloatAbi {
+            return switch (abi) {
+                .gnueabihf,
+                .eabihf,
+                .musleabihf,
+                => .hard,
+                else => .soft,
+            };
+        }
     };
     pub const ObjectFormat = enum {
 @@ -1259,13 +1269,7 @@ pub const Target = struct {
     };
     pub fn getFloatAbi(self: Target) FloatAbi {
-        return switch (self.abi) {
+        return self.abi.floatAbi();
-            .gnueabihf,
-            .eabihf,
-            .musleabihf,
-            => .hard,
-            else => .soft,
-        };
     }
     pub fn hasDynamicLinker(self: Target) bool {
 @@ -1336,12 +1340,12 @@ pub const Target = struct {
         const print = S.print;
         const copy = S.copy;
-        if (self.isAndroid()) {
+        if (self.abi == .android) {
             const suffix = if (self.cpu.arch.ptrBitWidth() == 64) "64" else "";
             return print(&result, "/system/bin/linker{}", .{suffix});
         }
-        if (self.isMusl()) {
+        if (self.abi.isMusl()) {
             const is_arm = switch (self.cpu.arch) {
                 .arm, .armeb, .thumb, .thumbeb => true,
                 else => false,
 @@ -1351,7 +1355,7 @@ pub const Target = struct {
                 .armeb, .thumbeb => "armeb",
                 else => |arch| @tagName(arch),
             };
-            const arch_suffix = if (is_arm and self.getFloatAbi() == .hard) "hf" else "";
+            const arch_suffix = if (is_arm and self.abi.floatAbi() == .hard) "hf" else "";
             return print(&result, "/lib/ld-musl-{}{}.so.1", .{ arch_part, arch_suffix });
         }
 @@ -1373,7 +1377,7 @@ pub const Target = struct {
                 .armeb,
                 .thumb,
                 .thumbeb,
-                => return copy(&result, switch (self.getFloatAbi()) {
+                => return copy(&result, switch (self.abi.floatAbi()) {
                     .hard => "/lib/ld-linux-armhf.so.3",
                     else => "/lib/ld-linux.so.3",
                 }),
 @@ -1444,13 +1448,15 @@ pub const Target = struct {
                 => return result,
             },
-            // Operating systems in this list have been verified as not having a standard
-            // dynamic linker path.
-            .freestanding,
             .ios,
             .tvos,
             .watchos,
             .macos,
+            => return copy(&result, "/usr/lib/dyld"),
+            // Operating systems in this list have been verified as not having a standard
+            // dynamic linker path.
+            .freestanding,
             .uefi,
             .windows,
             .emscripten,

lib/std/zig/cross_target.zig+9-1

 @@ -606,12 +606,20 @@ pub const CrossTarget = struct {
         const os_match = os_tag == Target.current.os.tag;
         // If the OS and CPU arch match, the binary can be considered native.
+        // TODO additionally match the CPU features. This `getExternalExecutor` function should
+        // be moved to std.Target and match any chosen target against the native target.
         if (os_match and cpu_arch == Target.current.cpu.arch) {
             // However, we also need to verify that the dynamic linker path is valid.
-            // TODO Until that is implemented, we prevent returning `.native` when the OS is non-native.
             if (self.os_tag == null) {
                 return .native;
             }
+            // TODO here we call toTarget, a deprecated function, because of the above TODO about moving
+            // this code to std.Target.
+            const opt_dl = self.dynamic_linker.get() orelse self.toTarget().standardDynamicLinkerPath().get();
+            if (opt_dl) |dl| blk: {
+                std.fs.cwd().access(dl, .{}) catch break :blk;
+                return .native;
+            }
         }
         // If the OS matches, we can use QEMU to emulate a foreign architecture.

test/stage2/test.zig+3-3

...	@@ -145,7 +145,7 @@ pub fn addCases(ctx: *TestContext) !void {	...	@@ -145,7 +145,7 @@ pub fn addCases(ctx: *TestContext) !void {
145	}	145	}
146		146
147	{	147	{
148	var case = ctx.exe("hello world", macosx_x64);	148	var case = ctx.exe("hello world with updates", macosx_x64);
149	case.addError("", &[_][]const u8{":1:1: error: no entry point found"});	149	case.addError("", &[_][]const u8{":1:1: error: no entry point found"});
150		150
151	// Incorrect return type	151	// Incorrect return type
...	@@ -183,7 +183,7 @@ pub fn addCases(ctx: *TestContext) !void {	...	@@ -183,7 +183,7 @@ pub fn addCases(ctx: *TestContext) !void {
183	\\ );	183	\\ );
184	\\ unreachable;	184	\\ unreachable;
185	\\}	185	\\}
186	,	186	,
187	"Hello, World!\n",	187	"Hello, World!\n",
188	);	188	);
189	// Now change the message only	189	// Now change the message only
...	@@ -993,7 +993,7 @@ pub fn addCases(ctx: *TestContext) !void {	...	@@ -993,7 +993,7 @@ pub fn addCases(ctx: *TestContext) !void {
993	\\ );	993	\\ );
994	\\ unreachable;	994	\\ unreachable;
995	\\}	995	\\}
996	,	996	,
997	"Hello, World!\n",	997	"Hello, World!\n",
998	);	998	);
999	try case.files.append(.{	999	try case.files.append(.{