mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-27 03:41:23 +08:00
63eb8df85a
Presently sys/sysmacros.h is entirely defined in sysdeps. This would
mean that the deprecation logic coming up in the next patch would have
to be written twice (in generic/ and unix/sysv/linux/). To avoid that,
hoist all but the unavoidably system-dependent logic to misc/, leaving a
bits/ header behind. This also promotes the Linux-specific encoding of
dev_t, which accommodates 32-bit major and minor numbers in a 64-bit dev_t,
to generic, as glibc's dev_t is always 64 bits wide.
The former Linux implementation used inline functions to avoid evaluating
arguments more than once. After this change, all platforms use inline
functions, which means that three new symbols are added to the generic ABI.
(These symbols are in the user namespace, which is how they have always
been on Linux. They begin with "gnu_dev_", so collisions with user code
are pretty unlikely.)
New ports henceforth need only provide a bits/sysmacros.h defining
internal macros __SYSMACROS_{DECLARE,DEFINE}_{MAJOR,MINOR,MAKEDEV}.
This is only necessary if the kernel encoding is incompatible with
the now-generic encoding (for instance, it would be necessary for
FreeBSD).
While I was at it, I added a basic round-trip test for these functions.
* sysdeps/generic/sys/sysmacros.h: Delete file.
* sysdeps/unix/sysv/linux/makedev.c: Delete file.
* sysdeps/unix/sysv/linux/sys/sysmacros.h: Move file ...
* bits/sysmacros.h: ... here; this encoding is now the generic
encoding. Now defines only the following macros:
__SYSMACROS_DECLARE_MAJOR, __SYSMACROS_DEFINE_MAJOR,
__SYSMACROS_DECLARE_MINOR, __SYSMACROS_DEFINE_MINOR,
__SYSMACROS_DECLARE_MAKEDEV, __SYSMACROS_DEFINE_MAKEDEV.
* misc/sys/sysmacros.h, misc/makedev.c: New files that use
bits/sysmacros.h and the above new macros to generate the
public implementations of major, minor, and makedev.
* misc/tst-makedev.c: New test.
* include/sys/sysmacros.h: New wrapper.
* misc/Makefile (headers): Add sys/sysmacros.h, bits/sysmacros.h.
(routines): Add makedev.
(tests): Add tst-makedev.
* misc/Versions [GLIBC_2.25]: Add gnu_dev_major, gnu_dev_minor,
gnu_dev_makedev.
* posix/Makefile (headers): Remove sys/sysmacros.h.
* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Remove makedev.
* sysdeps/arm/nacl/libc.abilist: Add GLIBC_2.25,
gnu_dev_major, gnu_dev_makedev, gnu_dev_minor.
* sysdeps/unix/sysv/linux/aarch64/libc.abilist
* sysdeps/unix/sysv/linux/alpha/libc.abilist
* sysdeps/unix/sysv/linux/arm/libc.abilist
* sysdeps/unix/sysv/linux/hppa/libc.abilist
* sysdeps/unix/sysv/linux/i386/libc.abilist
* sysdeps/unix/sysv/linux/ia64/libc.abilist
* sysdeps/unix/sysv/linux/m68k/coldfire/libc.abilist
* sysdeps/unix/sysv/linux/m68k/m680x0/libc.abilist
* sysdeps/unix/sysv/linux/microblaze/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n32/libc.abilist
* sysdeps/unix/sysv/linux/mips/mips64/n64/libc.abilist
* sysdeps/unix/sysv/linux/nios2/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/fpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc32/nofpu/libc.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc-le.abilist
* sysdeps/unix/sysv/linux/powerpc/powerpc64/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-32/libc.abilist
* sysdeps/unix/sysv/linux/s390/s390-64/libc.abilist
* sysdeps/unix/sysv/linux/sh/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc32/libc.abilist
* sysdeps/unix/sysv/linux/sparc/sparc64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx32/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilegx/tilegx64/libc.abilist
* sysdeps/unix/sysv/linux/tile/tilepro/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/64/libc.abilist
* sysdeps/unix/sysv/linux/x86_64/x32/libc.abilist:
Add GLIBC_2.25.
75 lines
2.9 KiB
C
75 lines
2.9 KiB
C
/* Definitions of macros to access `dev_t' values.
|
|
Copyright (C) 1996-2016 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
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C Library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#ifndef _BITS_SYSMACROS_H
|
|
#define _BITS_SYSMACROS_H 1
|
|
|
|
#ifndef _SYS_SYSMACROS_H
|
|
# error "Never include <bits/sysmacros.h> directly; use <sys/sysmacros.h> instead."
|
|
#endif
|
|
|
|
/* dev_t in glibc is a 64-bit quantity, with 32-bit major and minor numbers.
|
|
Our default encoding is MMMM Mmmm mmmM MMmm, where M is a hex digit of
|
|
the major number and m is a hex digit of the minor number. This is
|
|
downward compatible with legacy systems where dev_t is 16 bits wide,
|
|
encoded as MMmm. It is also downward compatible with the Linux kernel,
|
|
which (as of 2016) uses 32-bit dev_t, encoded as mmmM MMmm.
|
|
|
|
Systems that use an incompatible encoding for dev_t should override this
|
|
file in the appropriate sysdeps subdirectory. */
|
|
|
|
#define __SYSMACROS_DECLARE_MAJOR(DECL_TEMPL) \
|
|
DECL_TEMPL(unsigned int, major, (__dev_t __dev))
|
|
|
|
#define __SYSMACROS_DEFINE_MAJOR(DECL_TEMPL) \
|
|
__SYSMACROS_DECLARE_MAJOR (DECL_TEMPL) \
|
|
{ \
|
|
unsigned int __major; \
|
|
__major = ((__dev & (__dev_t) 0x00000000000fff00u) >> 8); \
|
|
__major |= ((__dev & (__dev_t) 0xfffff00000000000u) >> 32); \
|
|
return __major; \
|
|
}
|
|
|
|
#define __SYSMACROS_DECLARE_MINOR(DECL_TEMPL) \
|
|
DECL_TEMPL(unsigned int, minor, (__dev_t __dev))
|
|
|
|
#define __SYSMACROS_DEFINE_MINOR(DECL_TEMPL) \
|
|
__SYSMACROS_DECLARE_MINOR (DECL_TEMPL) \
|
|
{ \
|
|
unsigned int __minor; \
|
|
__minor = ((__dev & (__dev_t) 0x00000000000000ffu) >> 0); \
|
|
__minor |= ((__dev & (__dev_t) 0x00000ffffff00000u) >> 12); \
|
|
return __minor; \
|
|
}
|
|
|
|
#define __SYSMACROS_DECLARE_MAKEDEV(DECL_TEMPL) \
|
|
DECL_TEMPL(__dev_t, makedev, (unsigned int __major, unsigned int __minor))
|
|
|
|
#define __SYSMACROS_DEFINE_MAKEDEV(DECL_TEMPL) \
|
|
__SYSMACROS_DECLARE_MAKEDEV (DECL_TEMPL) \
|
|
{ \
|
|
__dev_t __dev; \
|
|
__dev = (((__dev_t) (__major & 0x00000fffu)) << 8); \
|
|
__dev |= (((__dev_t) (__major & 0xfffff000u)) << 32); \
|
|
__dev |= (((__dev_t) (__minor & 0x000000ffu)) << 0); \
|
|
__dev |= (((__dev_t) (__minor & 0xffffff00u)) << 12); \
|
|
return __dev; \
|
|
}
|
|
|
|
#endif /* bits/sysmacros.h */
|