fixes to 32-bit handling, to support 32-bit arm #4870
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
daurnimator
reviewed
Mar 31, 2020
| @@ -811,7 +815,7 @@ pub const NativeTargetInfo = struct { | |||
| } | |||
|
|
|||
| fn preadMin(file: fs.File, buf: []u8, offset: u64, min_read_len: usize) !usize { | |||
| var i: u64 = 0; | |||
| var i: usize = 0; | |||
This comment was marked as resolved.
This comment was marked as resolved.
Sorry, something went wrong.
There was a problem hiding this comment.
This fn is allowed to return short reads. i is just an offset, which is relative to min_read_len. usize was the correct type all along.
| const rpoff_usize = std.math.cast(usize, rpoff) catch |err| switch (err) { | ||
| error.Overflow => return error.InvalidElfFile, | ||
| }; | ||
| const rpath_list = mem.spanZ(@ptrCast([*:0]u8, strtab[rpoff_usize..].ptr)); |
There was a problem hiding this comment.
Is this was strtab[rpoff_usize..:0]. could we remove the @ptrCast? (and TODO above)
daurnimator
reviewed
Mar 31, 2020
| @@ -645,7 +646,7 @@ pub const NativeTargetInfo = struct { | |||
| { | |||
| var dyn_off = elfInt(is_64, need_bswap, ph32.p_offset, ph64.p_offset); | |||
| const p_filesz = elfInt(is_64, need_bswap, ph32.p_filesz, ph64.p_filesz); | |||
| const dyn_size: u64 = if (is_64) @sizeOf(elf.Elf64_Dyn) else @sizeOf(elf.Elf32_Dyn); | |||
| const dyn_size: usize = if (is_64) @sizeOf(elf.Elf64_Dyn) else @sizeOf(elf.Elf32_Dyn); | |||
There was a problem hiding this comment.
Does peer-type resolution not work here? (i.e. omit the type?)
There was a problem hiding this comment.
is_64 is runtime known, so it hits #137
There was a problem hiding this comment.
oh interesting. I thought @sizeOf would return a comptime-known usize rather than a comptime_int
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
With these changes, I was able to use ziglang/bootstrap to cross-compile an arm-linux-musleabihf tarball.