tile: Fix __bswap_64 return type in tile bits/byteswap.h

diff --git a/ports/ChangeLog.tile b/ports/ChangeLog.tile
index 1419b3559dd53e58bee757ed9cec00cb388f24bc..db4db0eedc3f2d9c2e63b924212325e78db1abe3 100644 (file)
--- a/ports/ChangeLog.tile
+++ b/ports/ChangeLog.tile
@@ -1,5 +1,8 @@
 2012-11-20  Chris Metcalf  <cmetcalf@tilera.com>
 
+       * sysdeps/tile/bits/byteswap.h: Include <bits/types.h>.
+       (__bswap_64): Use __uint64_t instead of unsigned long long int.
+
        * sysdeps/tile/s_fma.c: Remove redundant #defines now provided
        in sysdeps/tile/math_private.h.
 

diff --git a/ports/sysdeps/tile/bits/byteswap.h b/ports/sysdeps/tile/bits/byteswap.h
index 8e610c6fc8f67914c72ca26f2a33900b3fccbe29..4d1b25549ea5ae3b65482129d9020cc45295b8ff 100644 (file)
--- a/ports/sysdeps/tile/bits/byteswap.h
+++ b/ports/sysdeps/tile/bits/byteswap.h
@@ -23,10 +23,12 @@
 #ifndef _BITS_BYTESWAP_H
 #define _BITS_BYTESWAP_H 1
 
+#include <bits/types.h>
+
 /* gcc __builtin_bswap64() can constant-fold, etc, so always use it. */
 #define __bswap_16(x) ((unsigned short)(__builtin_bswap32(x) >> 16))
 #define __bswap_32(x) ((unsigned int)__builtin_bswap32(x))
-#define __bswap_64(x) ((unsigned long long)__builtin_bswap64(x))
+#define __bswap_64(x) ((__uint64_t)__builtin_bswap64(x))
 
 #define __bswap_constant_16(x) __bswap_16(x)
 #define __bswap_constant_32(x) __bswap_32(x)