Fix cycleclock.h for gcc/ARM. #12
Conversation
Currently there are tests for ARMV3 and ARMV6 in cycleclock.h which are not defined using gcc on ARM. Since there is also a cast to the unknown type int64 I assume that the ARM code has not been tested. Therefore this patch replaces the checks for ARMV3 and ARMV6 by checks for __ARM_ARCH. Also, the cast to int64 is fixed by casting to int64_t.
There was a problem hiding this comment.
you should be able to combine this into one check:
#if (__ARM_ARCH >= 6) will not be true if __ARM_ARCH is not defined.
There was a problem hiding this comment.
I just briefly glimpsed in the code again: There's code specific for __ARM_ARCH >= 6 and code for __ARM_ARCH. The latter of which includes the return statement. It's not possible to combine these into a single check.
Maybe the first check should be altered to #if (__ARM_ARCH >= 3) to be more in line with the origianl version. But since I don't know where or when the original ARMV3 would appear I just leave it this way.
|
Could you take a look at the instructions in the CONTRIBUTING.md file regarding the contributor license agreement? I couldn't find you in either the CONTRIBUTORS, AUTHORS, or our internal list of agreement signatories. Thanks! |
|
@pphaneuf: I just signed the individual CLA electronically. I don't know how long it will take to process. |
|
@showlabor Add a commit to this pull request adding yourself to the AUTHORS and CONTRIBUTORS file (see #10 for an example) and one of us can go ahead and merge this. |
|
@ckennelly I had just been at it ;-) |
|
@showlabor Thanks, I just confirmed that your electronic signature is registered correctly! I'm just around for this kind of verification, I'll let @dominichamon finish the code review and merge in the pull request as appropriate. |
Currently there are tests for ARMV3 and ARMV6 in cycleclock.h which are not
defined using gcc on ARM. Since there is also a cast to the unknown type
int64 I assume that the ARM code has not been tested. Therefore this patch
replaces the checks for ARMV3 and ARMV6 by checks for __ARM_ARCH. Also, the
cast to int64 is fixed by casting to int64_t.