Update word size detection #87
Closed
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
The detection for word size was dependent on `__LONG_WIDTH__` for at least gcc Alpine Linux (probably other musl distros too). This is not working with clang which does not define `__LONG_WIDTH__`. Replace `__LONG_WIDTH__` by `__SIZE_WIDTH__`. As this will not work as expected for x32 ABI, add a robust x32 detection first.
mayeut
commented
Jun 5, 2022
Comment on lines
+46
to
+48
| #if defined(__x86_64__) && defined(__ILP32__) | ||
| // this is the way to detect x32 ABI per https://wiki.debian.org/X32Port | ||
| # define BASE64_WORDSIZE 64 |
There was a problem hiding this comment.
I wanted to keep the old behavior for platforms other than x32 ABI but this check could be simplified in this specific instance to just:
#if defined(__x86_64__)
// force word size on __x86_64__
// on x32 ABI which defines __x86_64__ and uses 64-bit words but 32-bit pointers, __SIZE_WIDTH__ == 32
# define BASE64_WORDSIZE 64
There was a problem hiding this comment.
Indeed, I'll fix it in the rebase.
aklomp
pushed a commit
that referenced
this pull request
Jun 5, 2022
The detection for word size was dependent on `__LONG_WIDTH__` for at least gcc Alpine Linux (probably other musl distros too). This is not working with clang which does not define `__LONG_WIDTH__`. Replace `__LONG_WIDTH__` by `__SIZE_WIDTH__`. As this will not work as expected for x32 ABI, add robust x32 detection first. Closes #87.
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.
The detection for word size was dependent on
__LONG_WIDTH__for at least gcc Alpine Linux (probably other musl distros too).This is not working with clang which does not define
__LONG_WIDTH__.Replace
__LONG_WIDTH__by__SIZE_WIDTH__.As this will not work as expected for x32 ABI, add a robust x32 detection first.