diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-11-28 23:04:32 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2012-12-03 14:54:31 -0500 |
| commit | c9d6789ebe028a260d3e5be0c26b7d02fdfe99fe (patch) | |
| tree | 540b79252626c184e1f70bdad414532de905730d | |
| parent | a69646e9bdc80d9bd25ac0d6ba8cd8e05cfcf288 (diff) | |
byteswap.h: fix gcc ver test for __builtin_bswap{32,64}
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>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | bits/byteswap.h | 4 | ||||
| -rw-r--r-- | sysdeps/x86/bits/byteswap.h | 4 |
3 files changed, 9 insertions, 4 deletions
@@ -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> * time/sys/time.h (settimeofday): Do not mark TV argument diff --git a/bits/byteswap.h b/bits/byteswap.h index e19e91ada7..7e5daedb83 100644 --- a/bits/byteswap.h +++ b/bits/byteswap.h @@ -39,7 +39,7 @@ (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) #ifdef __GNUC__ -# if __GNUC_PREREQ (4, 2) +# if __GNUC_PREREQ (4, 3) static __inline unsigned int __bswap_32 (unsigned int __bsx) { @@ -70,7 +70,7 @@ __bswap_32 (unsigned int __bsx) | (((x) & 0x000000000000ff00ull) << 40) \ | (((x) & 0x00000000000000ffull) << 56))) -# if __GNUC_PREREQ (4, 2) +# if __GNUC_PREREQ (4, 3) static __inline __uint64_t __bswap_64 (__uint64_t __bsx) { diff --git a/sysdeps/x86/bits/byteswap.h b/sysdeps/x86/bits/byteswap.h index babe567432..581687c7f2 100644 --- a/sysdeps/x86/bits/byteswap.h +++ b/sysdeps/x86/bits/byteswap.h @@ -40,7 +40,7 @@ (((x) & 0x0000ff00) << 8) | (((x) & 0x000000ff) << 24)) #ifdef __GNUC__ -# if __GNUC_PREREQ (4, 2) +# if __GNUC_PREREQ (4, 3) static __inline unsigned int __bswap_32 (unsigned int __bsx) { @@ -104,7 +104,7 @@ __bswap_32 (unsigned int __bsx) | (((x) & 0x000000000000ff00ull) << 40) \ | (((x) & 0x00000000000000ffull) << 56))) -# if __GNUC_PREREQ (4, 2) +# if __GNUC_PREREQ (4, 3) static __inline __uint64_t __bswap_64 (__uint64_t __bsx) { |