aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/s390/bits/byteswap.h
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2012-03-28 16:39:25 +0200
committerAndreas Jaeger <aj@suse.de>2012-04-03 09:13:59 +0200
commitb1aa60f32d34030b28bca04aeee084cd3bedecfa (patch)
tree430b4c30f7a613b4b219528ec861de1b2c5b1172 /sysdeps/s390/bits/byteswap.h
parent39c59c35723120c32dc42dde4115bba92305179f (diff)
downloadglibc-b1aa60f32d34030b28bca04aeee084cd3bedecfa.tar
glibc-b1aa60f32d34030b28bca04aeee084cd3bedecfa.tar.gz
glibc-b1aa60f32d34030b28bca04aeee084cd3bedecfa.tar.bz2
glibc-b1aa60f32d34030b28bca04aeee084cd3bedecfa.zip
Add __bswap_64 definition for non GCC compilers.
[BZ#13926] Currently __bswap_64 is not defined at all for non-GCC compilers. Define it but guard it with __GLIBC_HAVE_LONG_LONG. endian.h uses __bswap_64, make the functions only available if __GLIBC_HAVE_LONG_LONG is defined.
Diffstat (limited to 'sysdeps/s390/bits/byteswap.h')
-rw-r--r--sysdeps/s390/bits/byteswap.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/sysdeps/s390/bits/byteswap.h b/sysdeps/s390/bits/byteswap.h
index ac325b0e49..fd7c279509 100644
--- a/sysdeps/s390/bits/byteswap.h
+++ b/sysdeps/s390/bits/byteswap.h
@@ -1,5 +1,5 @@
/* Macros to swap the order of bytes in integer values. s390 version.
- Copyright (C) 2000-2003, 2008, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2000-2003, 2008, 2011, 2012 Free Software Foundation, Inc.
Contributed by Martin Schwidefsky (schwidefsky@de.ibm.com).
This file is part of the GNU C Library.
@@ -150,16 +150,16 @@ __bswap_32 (unsigned int __bsx)
__r.__l[1] = __bswap_32 (__w.__l[0]); \
__r.__ll; })
# endif
-#else
+#elif __GLIBC_HAVE_LONG_LONG
# define __bswap_constant_64(x) \
- ((((x) & 0xff00000000000000ul) >> 56) \
- | (((x) & 0x00ff000000000000ul) >> 40) \
- | (((x) & 0x0000ff0000000000ul) >> 24) \
- | (((x) & 0x000000ff00000000ul) >> 8) \
- | (((x) & 0x00000000ff000000ul) << 8) \
- | (((x) & 0x0000000000ff0000ul) << 24) \
- | (((x) & 0x000000000000ff00ul) << 40) \
- | (((x) & 0x00000000000000fful) << 56))
+ ((((x) & 0xff00000000000000ull) >> 56) \
+ | (((x) & 0x00ff000000000000ull) >> 40) \
+ | (((x) & 0x0000ff0000000000ull) >> 24) \
+ | (((x) & 0x000000ff00000000ull) >> 8) \
+ | (((x) & 0x00000000ff000000ull) << 8) \
+ | (((x) & 0x0000000000ff0000ull) << 24) \
+ | (((x) & 0x000000000000ff00ull) << 40) \
+ | (((x) & 0x00000000000000ffull) << 56))
static __inline unsigned long long int
__bswap_64 (unsigned long long int __bsx)