Merge pull request #12 from showlabor/master

AUTHORS

@@ -12,6 +12,7 @@ Christopher Seymour <chris.j.seymour@hotmail.com>
 David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
 Dominic Hamon <dma@stripysock.com>
 Eugene Zhuk <eugene.zhuk@gmail.com>
+Felix Homann <linuxaudio@showlabor.de>
 Google Inc.
 Oleksandr Sochka <sasha.sochka@gmail.com>
 Yusuke Suzuki <utatane.tea@gmail.com>

CONTRIBUTORS

@@ -26,6 +26,7 @@ Christopher Seymour <chris.j.seymour@hotmail.com>
 David Coeurjolly <david.coeurjolly@liris.cnrs.fr>
 Dominic Hamon <dma@stripysock.com>
 Eugene Zhuk <eugene.zhuk@gmail.com>
+Felix Homann <linuxaudio@showlabor.de>
 Oleksandr Sochka <sasha.sochka@gmail.com>
 Pierre Phaneuf <pphaneuf@google.com>
 Yusuke Suzuki <utatane.tea@gmail.com>

src/cycleclock.h

@@ -95,8 +95,8 @@ inline ATTRIBUTE_ALWAYS_INLINE int64_t Now() {
   _asm rdtsc
 #elif defined(COMPILER_MSVC)
   return __rdtsc();
-#elif defined(ARMV3)
-#if defined(ARMV6)  // V6 is the earliest arch that has a standard cyclecount
+#elif defined(__ARM_ARCH)
+#if (__ARM_ARCH >= 6)  // V6 is the earliest arch that has a standard cyclecount
   uint32_t pmccntr;
   uint32_t pmuseren;
   uint32_t pmcntenset;
@@ -107,7 +107,7 @@ inline ATTRIBUTE_ALWAYS_INLINE int64_t Now() {
     if (pmcntenset & 0x80000000ul) {  // Is it counting?
       asm("mrc p15, 0, %0, c9, c13, 0" : "=r"(pmccntr));
       // The counter is set up to count every 64th cycle
-      return static_cast<int64>(pmccntr) * 64;  // Should optimize to << 6
+      return static_cast<int64_t>(pmccntr) * 64;  // Should optimize to << 6
     }
   }
 #endif