This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH] ia64: fix byteswap conversion warning
- From: Mike Frysinger <vapier at gentoo dot org>
- To: libc-alpha at sourceware dot org
- Date: Wed, 1 Aug 2012 21:16:58 -0400
- Subject: [PATCH] ia64: fix byteswap conversion warning
- References: <Pine.LNX.4.64.1206211408450.13170@digraph.polyomino.org.uk>
Same fix as went in for other architectures.
URL: http://sourceware.org/bugzilla/show_bug.cgi?id=12194
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---
ports/ChangeLog.ia64 | 7 +++++++
ports/sysdeps/ia64/bits/byteswap-16.h | 2 +-
ports/sysdeps/ia64/bits/byteswap.h | 2 +-
3 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index 31d86da..8877cc5 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,10 @@
+2012-08-01 Mike Frysinger <vapier@gentoo.org>
+
+ [BZ #12194]
+ * sysdeps/ia64/bits/byteswap-16.h (__bswap_16): Avoid -Wconversion
+ warning.
+ * sysdeps/ia64/bits/byteswap.h (__bswap_constant_16): Likewise.
+
2012-07-26 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h (__ptrace_eventcodes):
diff --git a/ports/sysdeps/ia64/bits/byteswap-16.h b/ports/sysdeps/ia64/bits/byteswap-16.h
index 0a85909..4a53ffa 100644
--- a/ports/sysdeps/ia64/bits/byteswap-16.h
+++ b/ports/sysdeps/ia64/bits/byteswap-16.h
@@ -23,7 +23,7 @@
#if defined __GNUC__ && __GNUC__ >= 2
# define __bswap_16(x) \
(__extension__ \
- ({ register unsigned short int __v, __x = (x); \
+ ({ register unsigned short int __v, __x = (unsigned short int) (x); \
if (__builtin_constant_p (x)) \
__v = __bswap_constant_16 (__x); \
else \
diff --git a/ports/sysdeps/ia64/bits/byteswap.h b/ports/sysdeps/ia64/bits/byteswap.h
index 6861248..d363c3e 100644
--- a/ports/sysdeps/ia64/bits/byteswap.h
+++ b/ports/sysdeps/ia64/bits/byteswap.h
@@ -25,7 +25,7 @@
/* Swap bytes in 16 bit value. */
#define __bswap_constant_16(x) \
- ((((x) >> 8) & 0xff) | (((x) & 0xff) << 8))
+ ((unsigned short int)((((x) >> 8) & 0xff) | (((x) & 0xff) << 8)))
/* Get __bswap_16. */
#include <bits/byteswap-16.h>
--
1.7.9.7