This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-121-g0c41943
- From: vapier at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 3 Aug 2012 16:08:55 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.16-ports-merge-121-g0c41943
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 0c41943a4d6dc2ce7fbf1ee90d9000852f177a89 (commit)
from bca393295a36ed9aba92df3209af48d6ffe571e3 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=0c41943a4d6dc2ce7fbf1ee90d9000852f177a89
commit 0c41943a4d6dc2ce7fbf1ee90d9000852f177a89
Author: Mike Frysinger <vapier@gentoo.org>
Date: Wed Aug 1 20:56:03 2012 -0400
ia64: fix byteswap conversion warning
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>
diff --git a/ports/ChangeLog.ia64 b/ports/ChangeLog.ia64
index efb2fa9..933ac23 100644
--- a/ports/ChangeLog.ia64
+++ b/ports/ChangeLog.ia64
@@ -1,3 +1,10 @@
+2012-08-03 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-08-03 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/ia64/configure.in (arch_minimum_kernel):
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>
-----------------------------------------------------------------------
Summary of changes:
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(-)
hooks/post-receive
--
GNU C Library master sources