diff options
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/errnos.h | 46 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/i386/sysdep.S | 5 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/m68k/sysdep.S | 5 |
3 files changed, 28 insertions, 28 deletions
diff --git a/sysdeps/unix/sysv/linux/errnos.h b/sysdeps/unix/sysv/linux/errnos.h index 40707d1d62..4456e570f0 100644 --- a/sysdeps/unix/sysv/linux/errnos.h +++ b/sysdeps/unix/sysv/linux/errnos.h @@ -19,34 +19,40 @@ Boston, MA 02111-1307, USA. */ #ifdef _ERRNO_H -#undef EDOM -#undef ERANGE -#include <linux/errno.h> +# undef EDOM +# undef ERANGE +# include <linux/errno.h> -#ifndef __ASSEMBLER__ -#if defined __USE_REENTRANT && (!defined _LIBC || defined _LIBC_REENTRANT) -/* Declare alias of `errno' variable so it is accessible even if macro - with name `errno' is defined. */ -extern int __errno; +# ifndef __ASSEMBLER__ +# ifdef _LIBC +/* We now need a declaration of the `errno' variable. */ +extern int errno; -/* When using threads, errno is a per-thread value. */ +/* Function to get address of global `errno' variable. */ extern int *__errno_location __P ((void)) __attribute__ ((__const__)); -#define errno (*__errno_location ()) - -#define __set_errno(val) errno = __errno = (val) - -#else /* !__USE_REENTRENT || (_LIBC && !_LIBC_REENTRANT) */ -#define __set_errno(val) errno = (val) - -#endif /* __USE_REENTRANT && (!_LIBC || _LIBC_REENTRANT) */ -#endif /* !__ASSEMBLER */ +# ifdef _LIBC_REENTRANT +static inline int +__set_errno (int __err) +{ + return *__errno_location () = errno = __err; +} +# else /* !_LIBC_REENTRANT */ +# define __set_errno(val) errno = (val) +# endif /* _LIBC_REENTRANT */ +# endif /* _LIBC */ + +# if defined __USE_REENTRANT && (!defined _LIBC || defined _LIBC_REENTRANT) +/* When using threads, errno is a per-thread value. */ +# define errno (*__errno_location ()) +# endif +# endif /* !__ASSEMBLER__ */ #endif /* _ERRNO_H */ #if !defined (_ERRNO_H) && defined (__need_Emath) /* This is ugly but the kernel header is not clean enough. We must define only the values EDOM and ERANGE in case __need_Emath is defined. The value is the same for all Linux ports. */ -#define EDOM 33 /* Math argument out of domain of function. */ -#define ERANGE 34 /* Math result not representable. */ +# define EDOM 33 /* Math argument out of domain of function. */ +# define ERANGE 34 /* Math result not representable. */ #endif /* !_ERRNO_H && __need_Emath */ diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.S b/sysdeps/unix/sysv/linux/i386/sysdep.S index 742ba2b1a9..c9c78842d8 100644 --- a/sysdeps/unix/sysv/linux/i386/sysdep.S +++ b/sysdeps/unix/sysv/linux/i386/sysdep.S @@ -32,10 +32,7 @@ Cambridge, MA 02139, USA. */ errno: .zero 4 .globl _errno .type _errno,@object -_errno = errno /* This name is expected by hj libc.so.5 startup code. */ - .globl __errno - .type __errno,@object -__errno = errno /* This name is expected by the MT code. */ +_errno = errno /* This name is expected by hj's libc.so.5 startup code. */ .text /* The following code is only used in the shared library when we diff --git a/sysdeps/unix/sysv/linux/m68k/sysdep.S b/sysdeps/unix/sysv/linux/m68k/sysdep.S index 848ece58e8..7016a26a60 100644 --- a/sysdeps/unix/sysv/linux/m68k/sysdep.S +++ b/sysdeps/unix/sysv/linux/m68k/sysdep.S @@ -32,10 +32,7 @@ errno: .space 4 .size errno,4 .globl _errno .type _errno,@object -_errno = errno /* This name is expected by hj libc.so.5 startup code. */ - .globl __errno - .type __errno,@object -__errno = errno /* This name is expected by the MT code. */ +_errno = errno /* This name is expected by hj's libc.so.5 startup code. */ .text /* The following code is only used in the shared library when we |