diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2010-11-10 02:38:35 -0500 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2010-11-15 18:26:11 +0100 |
| commit | 2ea9855d590f308c38e0ccdc326e1cf1d4551cd3 (patch) | |
| tree | 3477c9253679fe3995d1ca9c3bb0d19e0dc56d69 | |
| parent | 457c305d8a919e4fc886c56bd153442e915a7c7e (diff) | |
| download | glibc-2ea9855d590f308c38e0ccdc326e1cf1d4551cd3.tar.gz glibc-2ea9855d590f308c38e0ccdc326e1cf1d4551cd3.tar.xz glibc-2ea9855d590f308c38e0ccdc326e1cf1d4551cd3.zip | |
Fix warnings in __bswap_16.
(cherry picked from commit 69da074d7adfab7b57004a0dea9403a928e310a5)
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/i386/bits/byteswap.h | 15 | ||||
| -rw-r--r-- | sysdeps/x86_64/bits/byteswap.h | 29 |
3 files changed, 29 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 1570ce7528..6c9908056e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-11-08 Ulrich Drepper <drepper@gmail.com> + + [BZ #12194] + * sysdeps/i386/bits/byteswap.h: Avoid warning in __bswap_16. + * sysdeps/x86_64/bits/byteswap.h: Likewise. + 2010-09-06 Andreas Schwab <schwab@redhat.com> * manual/Makefile: Don't mix pattern rules with normal rules. diff --git a/sysdeps/i386/bits/byteswap.h b/sysdeps/i386/bits/byteswap.h index 1f3fc5e524..c246ae86c6 100644 --- a/sysdeps/i386/bits/byteswap.h +++ b/sysdeps/i386/bits/byteswap.h @@ -1,5 +1,5 @@ /* Macros to swap the order of bytes in integer values. - Copyright (C) 1997, 1998, 2000, 2002, 2003, 2006, 2007, 2008 + Copyright (C) 1997, 1998, 2000, 2002, 2003, 2006, 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -27,26 +27,27 @@ /* 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))) #ifdef __GNUC__ # if __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 \ __asm__ ("rorw $8, %w0" \ : "=r" (__v) \ - : "0" (__x) \ - : "cc"); \ + : "0" (__x) \ + : "cc"); \ __v; })) # else /* This is better than nothing. */ # define __bswap_16(x) \ (__extension__ \ - ({ register unsigned short int __x = (x); __bswap_constant_16 (__x); })) + ({ register unsigned short int __x = (unsigned short int) (x); \ + __bswap_constant_16 (__x); })) # endif #else static __inline unsigned short int @@ -122,7 +123,7 @@ __bswap_32 (unsigned int __bsx) (__extension__ \ ({ union { __extension__ unsigned long long int __ll; \ unsigned long int __l[2]; } __w, __r; \ - if (__builtin_constant_p (x)) \ + if (__builtin_constant_p (x)) \ __r.__ll = __bswap_constant_64 (x); \ else \ { \ diff --git a/sysdeps/x86_64/bits/byteswap.h b/sysdeps/x86_64/bits/byteswap.h index 08b38e8523..e350fb8063 100644 --- a/sysdeps/x86_64/bits/byteswap.h +++ b/sysdeps/x86_64/bits/byteswap.h @@ -1,5 +1,5 @@ /* Macros to swap the order of bytes in integer values. - Copyright (C) 1997, 1998, 2000, 2002, 2003, 2007, 2008 + Copyright (C) 1997, 1998, 2000, 2002, 2003, 2007, 2008, 2010 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -29,12 +29,12 @@ /* 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))) #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 \ @@ -47,7 +47,8 @@ /* This is better than nothing. */ # define __bswap_16(x) \ (__extension__ \ - ({ register unsigned short int __x = (x); __bswap_constant_16 (__x); })) + ({ register unsigned short int __x = (unsigned short int) (x); \ + __bswap_constant_16 (__x); })) #endif @@ -120,16 +121,16 @@ # define __bswap_64(x) \ (__extension__ \ ({ union { __extension__ unsigned long long int __ll; \ - unsigned int __l[2]; } __w, __r; \ - if (__builtin_constant_p (x)) \ - __r.__ll = __bswap_constant_64 (x); \ - else \ - { \ - __w.__ll = (x); \ - __r.__l[0] = __bswap_32 (__w.__l[1]); \ - __r.__l[1] = __bswap_32 (__w.__l[0]); \ - } \ - __r.__ll; })) + unsigned int __l[2]; } __w, __r; \ + if (__builtin_constant_p (x)) \ + __r.__ll = __bswap_constant_64 (x); \ + else \ + { \ + __w.__ll = (x); \ + __r.__l[0] = __bswap_32 (__w.__l[1]); \ + __r.__l[1] = __bswap_32 (__w.__l[0]); \ + } \ + __r.__ll; })) # endif #endif |