Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Arm 64bit detection #949

Merged
merged 2 commits into from
Sep 12, 2019
Merged

Fix Arm 64bit detection #949

merged 2 commits into from
Sep 12, 2019

Conversation

amaury-ml
Copy link

@amaury-ml amaury-ml commented Sep 10, 2019

arch64 is probably meant for aarch64, but forgets arm64 which is the iOS way.
But this needs simplification: LP64 is 64 bits, ILP32 is 32 bits. Checking for the target architecture is not the way to go and leads to mistaks like this.
Not a bug, just a simplification of something already messy.

Quickly tested using:

$CXX nova/external/glm/glm/detail/setup.hpp -dM -E | grep GLM_MODEL
$CXX -m32 nova/external/glm/glm/detail/setup.hpp -dM -E | grep GLM_MODEL
$CXX -mx32 nova/external/glm/glm/detail/setup.hpp -dM -E | grep GLM_MODEL
$CXX --target=armv7a nova/external/glm/glm/detail/setup.hpp -dM -E | grep GLM_MODEL
$CXX --target=aarch64 nova/external/glm/glm/detail/setup.hpp -dM -E | grep GLM_MODEL

CXX = gcc clang g++ clang++

Amaury Le Leyzour added 2 commits September 10, 2019 10:44
__aarch64__ is the correct way, __arm64__ is for iOS.
But the memory model does not need any of these architecture defines to be fully
relevant. __LP64__ means Long Pointer 64 (ie 64bits), and __ILP32__ is Integer Long Pointer 32 (ie 32bits).
That's enough and avoids errors like __arch64__ (correct way is __aarch64__) but forgets __arm64__ (iOS).
@Groovounet Groovounet merged commit 4ff530b into g-truc:master Sep 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants