mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2024-11-27 03:41:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

byteswap.h: fix gcc ver test for __builtin_bswap{32,64}

Browse Source 
The __builtin_bswap* functions were introduced in gcc-4.3, not gcc-4.2.
Fix the __GNUC_PREREQ tests to reflect this.

Otherwise trying to compile code with gcc-4.2 falls down:
In file included from /usr/include/endian.h:60,
                 from /usr/include/ctype.h:40,
/usr/include/bits/byteswap.h: In function 'unsigned int __bswap_32(unsigned int)':
/usr/include/bits/byteswap.h:46: error: '__builtin_bswap32' was not declared in this scope
/usr/include/bits/byteswap.h: In function 'long long unsigned int __bswap_64(long long unsigned int)':
/usr/include/bits/byteswap.h:110: error: '__builtin_bswap64' was not declared in this scope

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2012-11-28 23:04:32 -05:00
parent a69646e9bd
commit c9d6789ebe
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2012-12-03 Mike Frysinger <vapier@gentoo.org>
* bits/byteswap.h [__GNUC__]: Change __GNUC_PREREQ from 4.2 to 4.3.
* sysdeps/x86/bits/byteswap.h [__GNUC__]: Likewise.
2012-12-03 Jeff Law <law@redhat.com> 2012-12-03 Jeff Law <law@redhat.com>
* time/sys/time.h (settimeofday): Do not mark TV argument * time/sys/time.h (settimeofday): Do not mark TV argument

4
bits/byteswap.h
View File

@ -39,7 +39,7 @@
(((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24))
#ifdef __GNUC__ #ifdef __GNUC__
# if __GNUC_PREREQ (4, 2) # if __GNUC_PREREQ (4, 3)
static __inline unsigned int static __inline unsigned int
__bswap_32 (unsigned int __bsx) __bswap_32 (unsigned int __bsx)
{ {
@ -70,7 +70,7 @@ __bswap_32 (unsigned int __bsx)
| (((x) & 0x000000000000ff00ull) << 40) \ | (((x) & 0x000000000000ff00ull) << 40) \
| (((x) & 0x00000000000000ffull) << 56))) | (((x) & 0x00000000000000ffull) << 56)))
# if __GNUC_PREREQ (4, 2) # if __GNUC_PREREQ (4, 3)
static __inline __uint64_t static __inline __uint64_t
__bswap_64 (__uint64_t __bsx) __bswap_64 (__uint64_t __bsx)
{ {

4
sysdeps/x86/bits/byteswap.h
View File

@ -40,7 +40,7 @@
(((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24))
#ifdef __GNUC__ #ifdef __GNUC__
# if __GNUC_PREREQ (4, 2) # if __GNUC_PREREQ (4, 3)
static __inline unsigned int static __inline unsigned int
__bswap_32 (unsigned int __bsx) __bswap_32 (unsigned int __bsx)
{ {
@ -104,7 +104,7 @@ __bswap_32 (unsigned int __bsx)
| (((x) & 0x000000000000ff00ull) << 40) \ | (((x) & 0x000000000000ff00ull) << 40) \
| (((x) & 0x00000000000000ffull) << 56))) | (((x) & 0x00000000000000ffull) << 56)))
# if __GNUC_PREREQ (4, 2) # if __GNUC_PREREQ (4, 3)
static __inline __uint64_t static __inline __uint64_t
__bswap_64 (__uint64_t __bsx) __bswap_64 (__uint64_t __bsx)
{ {