mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
Update.
* sysdeps/generic/bits/byteswap.h (__bswap_64): Partly revert last patch. We must use unsigned int for l member of union.
This commit is contained in:
parent
51ac41a799
commit
bf2c10ded6
@ -1,5 +1,8 @@
|
|||||||
2001-01-07 Ulrich Drepper <drepper@redhat.com>
|
2001-01-07 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
|
* sysdeps/generic/bits/byteswap.h (__bswap_64): Partly revert last
|
||||||
|
patch. We must use unsigned int for l member of union.
|
||||||
|
|
||||||
* sysdeps/powerpc/elf/libc-start.c (__libc_start_main): Don't call
|
* sysdeps/powerpc/elf/libc-start.c (__libc_start_main): Don't call
|
||||||
_dl_aux_init for shared libraries.
|
_dl_aux_init for shared libraries.
|
||||||
|
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* Macros to swap the order of bytes in integer values.
|
/* Macros to swap the order of bytes in integer values.
|
||||||
Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
|
Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
@ -53,7 +53,7 @@ __bswap_32 (unsigned int __bsx)
|
|||||||
|
|
||||||
#if defined __GNUC__ && __GNUC__ >= 2
|
#if defined __GNUC__ && __GNUC__ >= 2
|
||||||
/* Swap bytes in 64 bit value. */
|
/* Swap bytes in 64 bit value. */
|
||||||
#define __bswap_constant_64(x) \
|
# define __bswap_constant_64(x) \
|
||||||
((((x) & 0xff00000000000000ull) >> 56) \
|
((((x) & 0xff00000000000000ull) >> 56) \
|
||||||
| (((x) & 0x00ff000000000000ull) >> 40) \
|
| (((x) & 0x00ff000000000000ull) >> 40) \
|
||||||
| (((x) & 0x0000ff0000000000ull) >> 24) \
|
| (((x) & 0x0000ff0000000000ull) >> 24) \
|
||||||
@ -66,7 +66,7 @@ __bswap_32 (unsigned int __bsx)
|
|||||||
# define __bswap_64(x) \
|
# define __bswap_64(x) \
|
||||||
(__extension__ \
|
(__extension__ \
|
||||||
({ union { __extension__ unsigned long long int __ll; \
|
({ union { __extension__ unsigned long long int __ll; \
|
||||||
unsigned long int __l[2]; } __w, __r; \
|
unsigned int __l[2]; } __w, __r; \
|
||||||
if (__builtin_constant_p (x)) \
|
if (__builtin_constant_p (x)) \
|
||||||
__r.__ll = __bswap_constant_64 (x); \
|
__r.__ll = __bswap_constant_64 (x); \
|
||||||
else \
|
else \
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/* Macros to swap the order of bytes in integer values.
|
/* Macros to swap the order of bytes in integer values.
|
||||||
Copyright (C) 1997, 1998, 2000 Free Software Foundation, Inc.
|
Copyright (C) 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
|
||||||
This file is part of the GNU C Library.
|
This file is part of the GNU C Library.
|
||||||
|
|
||||||
The GNU C Library is free software; you can redistribute it and/or
|
The GNU C Library is free software; you can redistribute it and/or
|
||||||
@ -53,7 +53,7 @@ __bswap_32 (unsigned int __bsx)
|
|||||||
|
|
||||||
#if defined __GNUC__ && __GNUC__ >= 2
|
#if defined __GNUC__ && __GNUC__ >= 2
|
||||||
/* Swap bytes in 64 bit value. */
|
/* Swap bytes in 64 bit value. */
|
||||||
#define __bswap_constant_64(x) \
|
# define __bswap_constant_64(x) \
|
||||||
((((x) & 0xff00000000000000ull) >> 56) \
|
((((x) & 0xff00000000000000ull) >> 56) \
|
||||||
| (((x) & 0x00ff000000000000ull) >> 40) \
|
| (((x) & 0x00ff000000000000ull) >> 40) \
|
||||||
| (((x) & 0x0000ff0000000000ull) >> 24) \
|
| (((x) & 0x0000ff0000000000ull) >> 24) \
|
||||||
@ -66,7 +66,7 @@ __bswap_32 (unsigned int __bsx)
|
|||||||
# define __bswap_64(x) \
|
# define __bswap_64(x) \
|
||||||
(__extension__ \
|
(__extension__ \
|
||||||
({ union { __extension__ unsigned long long int __ll; \
|
({ union { __extension__ unsigned long long int __ll; \
|
||||||
unsigned long int __l[2]; } __w, __r; \
|
unsigned int __l[2]; } __w, __r; \
|
||||||
if (__builtin_constant_p (x)) \
|
if (__builtin_constant_p (x)) \
|
||||||
__r.__ll = __bswap_constant_64 (x); \
|
__r.__ll = __bswap_constant_64 (x); \
|
||||||
else \
|
else \
|
||||||
|
Loading…
Reference in New Issue
Block a user