mirror of
https://sourceware.org/git/glibc.git
synced 2024-09-20 08:30:00 +00:00
fd860eaaa8
This is fairly complicated, not because the users of __need_Emath and __need_error_t have complicated requirements, but because the core changes had a lot of fallout. __need_error_t exists for gnulib compatibility in argz.h and argp.h. error_t itself is a Hurdism, an enum containing all the E-constants, so you can do 'p (error_t) errno' in gdb and get a symbolic value. argz.h and argp.h use it for function return values, and they want to fall back to 'int' when that's not available. There is no reason why these nonstandard headers cannot just go ahead and include all of errno.h; so we do that. __need_Emath is defined only by .S files; what they _really_ need is for errno.h to avoid declaring anything other than the E-constants (e.g. 'extern int __errno_location(void);' is a syntax error in assembly language). This is replaced with a check for __ASSEMBLER__ in errno.h, plus a carefully documented requirement for bits/errno.h not to define anything other than macros. That in turn has the consequence that bits/errno.h must not define errno - fortunately, all live ports use the same definition of errno, so I've moved it to errno.h. The Hurd bits/errno.h must also take care not to define error_t when __ASSEMBLER__ is defined, which involves repeating all of the definitions twice, but it's a generated file so that's okay. * stdlib/errno.h: Remove __need_Emath and __need_error_t logic. Reorganize file. Declare errno here. When __ASSEMBLER__ is defined, don't declare anything other than the E-constants. * include/errno.h: Change conditional for exposing internal declarations to (not _ISOMAC and not __ASSEMBLER__). * bits/errno.h: Remove logic for __need_Emath. Document requirements for a port-specific bits/errno.h. * sysdeps/unix/sysv/linux/bits/errno.h * sysdeps/unix/sysv/linux/alpha/bits/errno.h * sysdeps/unix/sysv/linux/hppa/bits/errno.h * sysdeps/unix/sysv/linux/mips/bits/errno.h * sysdeps/unix/sysv/linux/sparc/bits/errno.h: Add multiple-include guard and check against improper inclusion. Remove __need_Emath logic. Don't declare errno here. Ensure all constants are defined as simple integer literals. Consistent formatting. * sysdeps/mach/hurd/errnos.awk: Likewise. Only define error_t and enum __error_t_codes if __ASSEMBLER__ is not defined. * sysdeps/mach/hurd/bits/errno.h: Regenerate. * argp/argp.h, string/argz.h: Don't define __need_error_t before including errno.h. * sysdeps/i386/i686/fpu/multiarch/s_cosf-sse2.S * sysdeps/i386/i686/fpu/multiarch/s_sincosf-sse2.S * sysdeps/i386/i686/fpu/multiarch/s_sinf-sse2.S * sysdeps/x86_64/fpu/s_cosf.S * sysdeps/x86_64/fpu/s_sincosf.S * sysdeps/x86_64/fpu/s_sinf.S: Just include errno.h; don't define __need_Emath or include bits/errno.h directly.
48 lines
1.1 KiB
C
48 lines
1.1 KiB
C
#ifndef _ERRNO_H
|
|
#include <stdlib/errno.h>
|
|
#if !defined _ISOMAC && !defined __ASSEMBLER__
|
|
|
|
# if IS_IN (rtld)
|
|
# include <dl-sysdep.h>
|
|
# ifndef RTLD_PRIVATE_ERRNO
|
|
# error "dl-sysdep.h must define RTLD_PRIVATE_ERRNO!"
|
|
# endif
|
|
# else
|
|
# define RTLD_PRIVATE_ERRNO 0
|
|
# endif
|
|
|
|
# if RTLD_PRIVATE_ERRNO
|
|
/* The dynamic linker uses its own private errno variable.
|
|
All access to errno inside the dynamic linker is serialized,
|
|
so a single (hidden) global variable is all it needs. */
|
|
|
|
# undef errno
|
|
# define errno rtld_errno
|
|
extern int rtld_errno attribute_hidden;
|
|
|
|
# elif IS_IN_LIB
|
|
|
|
# include <tls.h>
|
|
|
|
# undef errno
|
|
# if IS_IN (libc)
|
|
# define errno __libc_errno
|
|
# else
|
|
# define errno errno /* For #ifndef errno tests. */
|
|
# endif
|
|
extern __thread int errno attribute_tls_model_ie;
|
|
|
|
# endif /* IS_IN_LIB */
|
|
|
|
# define __set_errno(val) (errno = (val))
|
|
|
|
extern int *__errno_location (void) __THROW __attribute_const__
|
|
# if RTLD_PRIVATE_ERRNO
|
|
attribute_hidden
|
|
# endif
|
|
;
|
|
libc_hidden_proto (__errno_location)
|
|
|
|
#endif /* !_ISOMAC && !__ASSEMBLER__ */
|
|
#endif /* !_ERRNO_H */
|