Fix builds on x32 platform. #1152
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
From the Debian wiki: https://wiki.debian.org/X32Port X32 is an ABI for amd64/x86_64 CPUs using 32-bit integers, longs and pointers. The idea is to combine the smaller memory and cache footprint from 32-bit data types with the larger register set of x86_64. The 64-bit registers can make computation more efficient, and with 8 additional registers available, there is less pressure compared to i386/i686. rapidjson makes an incorrect assumption in a check for 64 bit platforms, and uses __LP64__ exclusively. This fix adds an additional check for __x86_64__ && __ILP32__ defines, as a very conservative fix. However, the usage of __LP64__ would be a problem for other "mixed" applications like ARM ILP32, so a better detection scheme might be needed in the future.
|
After discussing with @cuavas, I've duplicated this pull request with rapidjson upstream: |
|
This fix has been applied upstream. Tencent/rapidjson@323a0dc |
|
We've now synced upstream rapidjson, is this still necessary? |
|
This has been merged, yes. a8ebc11#diff-ad70ca65ccd212456aaca0efb96cd072L253 |
|
Great, thank you! |
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.
From the Debian wiki: https://wiki.debian.org/X32Port
X32 is an ABI for amd64/x86_64 CPUs using 32-bit integers, longs
and pointers. The idea is to combine the smaller memory and cache
footprint from 32-bit data types with the larger register set of
x86_64. The 64-bit registers can make computation more efficient,
and with 8 additional registers available, there is less pressure
compared to i386/i686.
rapidjson makes an incorrect assumption in a check for 64 bit platforms,
and uses LP64 exclusively. This fix adds an additional check for
x86_64 && ILP32 defines, as a very conservative fix. However, the
usage of LP64 would be a problem for other "mixed" applications like
ARM ILP32, so a better detection scheme might be needed in the future.