mirror of
https://sourceware.org/git/glibc.git
synced 2025-07-29 11:41:21 +03:00
Update.
2003-09-24 Ulrich Drepper <drepper@redhat.com> * sysdeps/ia64/dl-machine.h (RTLD_START): Remove setting of __libc_stack_end. Patch by David Mosberger. 2003-09-24 Jakub Jelinek <jakub@redhat.com> * elf/Versions (ld): Export __libc_stack_end@GLIBC_2.1 instead of __libc_stack_end@GLIBC_PRIVATE. * sysdeps/generic/dl-sysdep.c (DL_STACK_END): Define if not defined. (_dl_sysdep_start): Set __libc_stack_end here. * sysdeps/alpha/dl-machine.h (RTLD_START): Remove setting of __libc_stack_end. * sysdeps/arm/dl-machine.h (RTLD_START): Likewise. * sysdeps/cris/dl-machine.h (RTLD_START): Likewise. * sysdeps/i386/dl-machine.h (RTLD_START): Likewise. * sysdeps/m68k/dl-machine.h (RTLD_START): Likewise. * sysdeps/s390/s390-32/dl-machine.h (RTLD_START): Likewise. * sysdeps/s390/s390-64/dl-machine.h (RTLD_START): Likewise. * sysdeps/sh/dl-machine.h (RTLD_START): Likewise. * sysdeps/x86_64/dl-machine.h (RTLD_START): Likewise. * sysdeps/ia64/dl-machine.h (DL_STACK_END): Define. * sysdeps/sparc/sparc32/dl-machine.h (DL_STACK_END): Define. (RTLD_START): Remove setting of __libc_stack_end. * sysdeps/sparc/sparc64/dl-machine.h (DL_STACK_END): Define. (RTLD_START): Remove setting of __libc_stack_end. 2003-09-24 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/sys/sysmacros.h: Add gnu_dev_ prefix to function definitions. Adjust macro expansions accordingly. * sysdeps/unix/sysv/linux/Versions: Add gnu_dev_ prefix to major, minor, makedev name. * sysdeps/unix/sysv/linux/makedev.c: Likewise. 2003-09-24 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/sys/sysmacros.h (major, minor, makedev): Add __THROW.
This commit is contained in:
@ -26,26 +26,29 @@
|
||||
not going to hack weird hacks to support the dev_t representation
|
||||
they need. */
|
||||
#ifdef __GLIBC_HAVE_LONG_LONG
|
||||
extern unsigned int inline major (unsigned long long int __dev) __THROW;
|
||||
extern unsigned int inline minor (unsigned long long int __dev) __THROW;
|
||||
extern unsigned long long int inline makedev (unsigned int __major,
|
||||
unsigned int __minor) __THROW;
|
||||
extern unsigned int inline gnu_dev_major (unsigned long long int __dev)
|
||||
__THROW;
|
||||
extern unsigned int inline gnu_dev_minor (unsigned long long int __dev)
|
||||
__THROW;
|
||||
extern unsigned long long int inline gnu_dev_makedev (unsigned int __major,
|
||||
unsigned int __minor)
|
||||
__THROW;
|
||||
|
||||
# if defined __GNUC__ && __GNUC__ >= 2
|
||||
extern inline unsigned int
|
||||
major (unsigned long long int __dev)
|
||||
gnu_dev_major (unsigned long long int __dev) __THROW
|
||||
{
|
||||
return ((__dev >> 8) & 0xfff) | ((unsigned int) (__dev >> 32) & ~0xfff);
|
||||
}
|
||||
|
||||
extern inline unsigned int
|
||||
minor (unsigned long long int __dev)
|
||||
gnu_dev_minor (unsigned long long int __dev) __THROW
|
||||
{
|
||||
return (__dev & 0xff) | ((unsigned int) (__dev >> 12) & ~0xff);
|
||||
}
|
||||
|
||||
extern inline unsigned long long int
|
||||
makedev (unsigned int __major, unsigned int __minor)
|
||||
gnu_dev_makedev (unsigned int __major, unsigned int __minor) __THROW
|
||||
{
|
||||
return ((__minor & 0xff) | ((__major & 0xfff) << 8)
|
||||
| (((unsigned long long int) (__minor & ~0xff)) << 12)
|
||||
@ -54,11 +57,10 @@ makedev (unsigned int __major, unsigned int __minor)
|
||||
# endif
|
||||
|
||||
|
||||
/* Historically the three symbols were macros. In case some programs
|
||||
use #ifdef to check for definition provide some dummy macros. */
|
||||
# define major(dev) major (dev)
|
||||
# define minor(dev) minor (dev)
|
||||
# define makedev(maj, min) makedev (maj, min)
|
||||
/* Access the functions with their traditional names. */
|
||||
# define major(dev) gnu_dev_major (dev)
|
||||
# define minor(dev) gnu_dev_minor (dev)
|
||||
# define makedev(maj, min) gnu_dev_makedev (maj, min)
|
||||
#endif
|
||||
|
||||
#endif /* sys/sysmacros.h */
|
||||
|
Reference in New Issue
Block a user