diff options
author | Jakub Jelinek <jakub@redhat.com> | 2005-10-20 06:59:57 +0000 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2005-10-20 06:59:57 +0000 |
commit | b7071f6fc41f4c20510de3683f39e5c8ea8a2e1e (patch) | |
tree | 852f4f1992a3c9ecbb44b822df6702c7e635fc5a /sysdeps/generic | |
parent | acfebba27b162b3064c616142883541eaef3f725 (diff) |
Updated to fedora-glibc-20051020T0651
Diffstat (limited to 'sysdeps/generic')
-rw-r--r-- | sysdeps/generic/bits/byteswap.h | 19 | ||||
-rw-r--r-- | sysdeps/generic/bits/mman.h | 8 | ||||
-rw-r--r-- | sysdeps/generic/fdopendir.c | 3 | ||||
-rw-r--r-- | sysdeps/generic/s_csqrt.c | 6 | ||||
-rw-r--r-- | sysdeps/generic/s_csqrtf.c | 6 | ||||
-rw-r--r-- | sysdeps/generic/s_csqrtl.c | 6 |
6 files changed, 29 insertions, 19 deletions
diff --git a/sysdeps/generic/bits/byteswap.h b/sysdeps/generic/bits/byteswap.h index 5f08fed613..949ed0bc9d 100644 --- a/sysdeps/generic/bits/byteswap.h +++ b/sysdeps/generic/bits/byteswap.h @@ -25,32 +25,35 @@ #define _BITS_BYTESWAP_H 1 /* Swap bytes in 16 bit value. */ +#define __bswap_constant_16(x) \ + ((((x) >> 8) & 0xffu) | (((x) & 0xffu) << 8)) + #ifdef __GNUC__ # define __bswap_16(x) \ (__extension__ \ - ({ unsigned short int __bsx = (x); \ - ((((__bsx) >> 8) & 0xffu) | (((__bsx) & 0xffu) << 8)); })) + ({ unsigned short int __bsx = (x); __bswap_constant_16 (__bsx); })) #else static __inline unsigned short int __bswap_16 (unsigned short int __bsx) { - return ((((__bsx) >> 8) & 0xffu) | (((__bsx) & 0xffu) << 8)); + return __bswap_constant_16 (__bsx); } #endif /* Swap bytes in 32 bit value. */ +#define __bswap_constant_32(x) \ + ((((x) & 0xff000000u) >> 24) | (((x) & 0x00ff0000u) >> 8) | \ + (((x) & 0x0000ff00u) << 8) | (((x) & 0x000000ffu) << 24)) + #ifdef __GNUC__ # define __bswap_32(x) \ (__extension__ \ - ({ unsigned int __bsx = (x); \ - ((((__bsx) & 0xff000000u) >> 24) | (((__bsx) & 0x00ff0000u) >> 8) | \ - (((__bsx) & 0x0000ff00u) << 8) | (((__bsx) & 0x000000ffu) << 24)); })) + ({ register unsigned int __bsx = (x); __bswap_constant_32 (__bsx); })) #else static __inline unsigned int __bswap_32 (unsigned int __bsx) { - return ((((__bsx) & 0xff000000u) >> 24) | (((__bsx) & 0x00ff0000u) >> 8) | - (((__bsx) & 0x0000ff00u) << 8) | (((__bsx) & 0x000000ffu) << 24)); + return __bswap_constant_32 (__bsx); } #endif diff --git a/sysdeps/generic/bits/mman.h b/sysdeps/generic/bits/mman.h index a2ee064cae..0c15902706 100644 --- a/sysdeps/generic/bits/mman.h +++ b/sysdeps/generic/bits/mman.h @@ -1,5 +1,5 @@ /* Definitions for BSD-style memory management. - Copyright (C) 1994-1998,2000,01,02 Free Software Foundation, Inc. + Copyright (C) 1994-1998,2000,01,02,05 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -85,6 +85,12 @@ #define MS_SYNC 0 /* Synchronous memory sync. */ #define MS_INVALIDATE 2 /* Invalidate the caches. */ +/* Flags for `mremap'. */ +#ifdef __USE_GNU +# define MREMAP_MAYMOVE 1 /* Mapping address may change. */ +# define MREMAP_FIXED 2 /* Fifth argument sets new address. */ +#endif + /* Flags for `mlockall' (can be OR'd together). */ #define MCL_CURRENT 1 /* Lock all currently mapped pages. */ #define MCL_FUTURE 2 /* Lock all additions to address diff --git a/sysdeps/generic/fdopendir.c b/sysdeps/generic/fdopendir.c index 597ccd5a5e..ed30e89e7e 100644 --- a/sysdeps/generic/fdopendir.c +++ b/sysdeps/generic/fdopendir.c @@ -1,4 +1,5 @@ -/* Copyright (C) 2005 Free Software Foundation, Inc. +/* Open a directory stream from a file descriptor. Stub version. + Copyright (C) 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or diff --git a/sysdeps/generic/s_csqrt.c b/sysdeps/generic/s_csqrt.c index 0bb6690b17..04ed410a16 100644 --- a/sysdeps/generic/s_csqrt.c +++ b/sysdeps/generic/s_csqrt.c @@ -1,5 +1,5 @@ /* Complex square root of double value. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Based on an algorithm by Stephen L. Moshier <moshier@world.std.com>. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -79,8 +79,8 @@ __csqrt (__complex__ double x) { double r = __ieee754_sqrt (0.5 * fabs (__imag__ x)); - __real__ res = __copysign (r, __imag__ x); - __imag__ res = r; + __real__ res = r; + __imag__ res = __copysign (r, __imag__ x); } else { diff --git a/sysdeps/generic/s_csqrtf.c b/sysdeps/generic/s_csqrtf.c index b02c605a37..2fba69ce1b 100644 --- a/sysdeps/generic/s_csqrtf.c +++ b/sysdeps/generic/s_csqrtf.c @@ -1,5 +1,5 @@ /* Complex square root of float value. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Based on an algorithm by Stephen L. Moshier <moshier@world.std.com>. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -79,8 +79,8 @@ __csqrtf (__complex__ float x) { float r = __ieee754_sqrtf (0.5 * fabsf (__imag__ x)); - __real__ res = __copysignf (r, __imag__ x); - __imag__ res = r; + __real__ res = r; + __imag__ res = __copysignf (r, __imag__ x); } else { diff --git a/sysdeps/generic/s_csqrtl.c b/sysdeps/generic/s_csqrtl.c index 8e27750a04..9d00946c51 100644 --- a/sysdeps/generic/s_csqrtl.c +++ b/sysdeps/generic/s_csqrtl.c @@ -1,5 +1,5 @@ /* Complex square root of long double value. - Copyright (C) 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1997, 1998, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Based on an algorithm by Stephen L. Moshier <moshier@world.std.com>. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997. @@ -79,8 +79,8 @@ __csqrtl (__complex__ long double x) { long double r = __ieee754_sqrtl (0.5 * fabsl (__imag__ x)); - __real__ res = __copysignl (r, __imag__ x); - __imag__ res = r; + __real__ res = r; + __imag__ res = __copysignl (r, __imag__ x); } else { |