| author |  Andrew Kelley <andrew@ziglang.org> 2021-04-13 11:51:58-07:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2021-04-15 19:06:39-07:00 |
| log | 798ad631f3f9836de663bc6c728b415e0a13528f |
| tree | 345fe3987200eedf7e00c905dc9e5e98f29ebaa9 |
| parent | 6dba9bc6fc6741e51af86f71e3057cffed7406a6 |
stage2 start.zig: slight simplification
fewer required language features to allow this to work2 files changed, 7 insertions(+), 3 deletions(-)
lib- std
lib/std/start.zig+3-3
| ... | ... | @@ -11,8 +11,8 @@ const builtin = @import("builtin"); |
| 11 | 11 | const assert = std.debug.assert; |
| 12 | 12 | const uefi = std.os.uefi; |
| 13 | 13 | const tlcsprng = @import("crypto/tlcsprng.zig"); |
| 14 | const native_arch = std.Target.current.cpu.arch; | |
| 15 | const native_os = std.Target.current.os.tag; | |
| 14 | const native_arch = builtin.cpu.arch; | |
| 15 | const native_os = builtin.os.tag; | |
| 16 | 16 | |
| 17 | 17 | var argc_argv_ptr: [*]usize = undefined; |
| 18 | 18 | |
| ... | ... | @@ -80,7 +80,7 @@ fn _start2() callconv(.Naked) noreturn { |
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | fn exit2(code: u8) noreturn { |
| 83 | switch (native_arch) { | |
| 83 | switch (builtin.stage2_arch) { | |
| 84 | 84 | .x86_64 => { |
| 85 | 85 | asm volatile ("syscall" |
| 86 | 86 | : |
src/Compilation.zig+4
| ... | ... | @@ -3078,7 +3078,10 @@ pub fn generateBuiltinZigSource(comp: *Compilation, allocator: *Allocator) Alloc |
| 3078 | 3078 | \\/// Zig version. When writing code that supports multiple versions of Zig, prefer |
| 3079 | 3079 | \\/// feature detection (i.e. with `@hasDecl` or `@hasField`) over version checks. |
| 3080 | 3080 | \\pub const zig_version = try std.SemanticVersion.parse("{s}"); |
| 3081 | \\/// Temporary until self-hosted is feature complete. | |
| 3081 | 3082 | \\pub const zig_is_stage2 = {}; |
| 3083 | \\/// Temporary until self-hosted supports the `cpu.arch` value. | |
| 3084 | \\pub const stage2_arch: std.Target.Cpu.Arch = .{}; | |
| 3082 | 3085 | \\ |
| 3083 | 3086 | \\pub const output_mode = std.builtin.OutputMode.{}; |
| 3084 | 3087 | \\pub const link_mode = std.builtin.LinkMode.{}; |
| ... | ... | @@ -3093,6 +3096,7 @@ pub fn generateBuiltinZigSource(comp: *Compilation, allocator: *Allocator) Alloc |
| 3093 | 3096 | , .{ |
| 3094 | 3097 | build_options.version, |
| 3095 | 3098 | !use_stage1, |
| 3099 | std.zig.fmtId(@tagName(target.cpu.arch)), | |
| 3096 | 3100 | std.zig.fmtId(@tagName(comp.bin_file.options.output_mode)), |
| 3097 | 3101 | std.zig.fmtId(@tagName(comp.bin_file.options.link_mode)), |
| 3098 | 3102 | comp.bin_file.options.is_test, |