diff options
| author | Michael Dusan <michael.dusan@gmail.com> | 2020-03-11 19:33:12 -0400 |
|---|---|---|
| committer | Michael Dusan <michael.dusan@gmail.com> | 2020-03-11 19:33:12 -0400 |
| commit | bfebc11d0633e3f4a3fe86d1a9d6f90ffdb1fbb6 (patch) | |
| tree | 60e7ad6b44d7e3e4052edab33fdcb25706022ac7 /src-self-hosted | |
| parent | c988167377c92359fed42f12ad32b5f349f9ffb8 (diff) | |
| download | zig-bfebc11d0633e3f4a3fe86d1a9d6f90ffdb1fbb6.tar.gz zig-bfebc11d0633e3f4a3fe86d1a9d6f90ffdb1fbb6.zip | |
fix zig-cache to treat cpu-features as raw-bytes
- add Stage2Target.cache_hash_len
- add cache_mem(ch, ptr, len)
- update call sites to use { ptr, len }
Diffstat (limited to 'src-self-hosted')
| -rw-r--r-- | src-self-hosted/stage2.zig | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src-self-hosted/stage2.zig b/src-self-hosted/stage2.zig index bdd68925ee..83a70c29e0 100644 --- a/src-self-hosted/stage2.zig +++ b/src-self-hosted/stage2.zig @@ -900,6 +900,7 @@ const Stage2Target = extern struct { llvm_cpu_features: ?[*:0]const u8, cpu_builtin_str: ?[*:0]const u8, cache_hash: ?[*:0]const u8, + cache_hash_len: usize, os_builtin_str: ?[*:0]const u8, dynamic_linker: ?[*:0]const u8, @@ -1129,6 +1130,7 @@ const Stage2Target = extern struct { } }; + const cache_hash_slice = cache_hash.toOwnedSlice(); self.* = .{ .arch = @enumToInt(target.cpu.arch) + 1, // skip over ZigLLVM_UnknownArch .vendor = 0, @@ -1138,7 +1140,8 @@ const Stage2Target = extern struct { .llvm_cpu_features = llvm_features_buffer.toOwnedSlice().ptr, .cpu_builtin_str = cpu_builtin_str_buffer.toOwnedSlice().ptr, .os_builtin_str = os_builtin_str_buffer.toOwnedSlice().ptr, - .cache_hash = cache_hash.toOwnedSlice().ptr, + .cache_hash = cache_hash_slice.ptr, + .cache_hash_len = cache_hash_slice.len, .is_native = cross_target.isNative(), .glibc_or_darwin_version = glibc_or_darwin_version, .dynamic_linker = dynamic_linker, |