mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +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.
119 lines
4.3 KiB
Makefile
119 lines
4.3 KiB
Makefile
# Copyright (C) 1991-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/>.
|
|
|
|
#
|
|
# Sub-makefile for misc portion of the library.
|
|
#
|
|
|
|
subdir := misc
|
|
|
|
include ../Makeconfig
|
|
|
|
headers := sys/uio.h bits/uio.h sys/ioctl.h bits/ioctls.h bits/ioctl-types.h \
|
|
sys/ptrace.h sys/file.h sys/dir.h sys/cdefs.h \
|
|
ar.h a.out.h libgen.h stab.h bits/stab.def sgtty.h \
|
|
ttyent.h paths.h sys/reboot.h \
|
|
sys/mman.h sys/param.h bits/param.h \
|
|
fstab.h mntent.h search.h err.h error.h \
|
|
sys/queue.h sysexits.h syscall.h sys/syscall.h sys/swap.h \
|
|
sys/select.h ustat.h sys/ustat.h bits/ustat.h sys/sysinfo.h \
|
|
regexp.h bits/select.h bits/mman.h sys/xattr.h \
|
|
syslog.h sys/syslog.h \
|
|
bits/syslog.h bits/syslog-ldbl.h bits/syslog-path.h bits/error.h \
|
|
bits/select2.h bits/hwcap.h sys/auxv.h \
|
|
sys/sysmacros.h bits/sysmacros.h
|
|
|
|
routines := brk sbrk sstk ioctl \
|
|
readv writev preadv preadv64 pwritev pwritev64 \
|
|
setreuid setregid \
|
|
seteuid setegid \
|
|
getpagesize \
|
|
getdtsz \
|
|
gethostname sethostname getdomain setdomain \
|
|
select pselect \
|
|
acct chroot fsync sync fdatasync syncfs reboot \
|
|
gethostid sethostid \
|
|
revoke vhangup \
|
|
swapon swapoff mktemp mkstemp mkstemp64 mkdtemp \
|
|
mkostemp mkostemp64 mkstemps mkstemps64 mkostemps mkostemps64 \
|
|
ualarm usleep \
|
|
gtty stty \
|
|
ptrace \
|
|
fstab mntent mntent_r \
|
|
utimes lutimes futimes futimesat \
|
|
truncate ftruncate truncate64 ftruncate64 \
|
|
chflags fchflags \
|
|
insremque getttyent getusershell getpass ttyslot \
|
|
syslog syscall daemon \
|
|
mmap mmap64 munmap mprotect msync madvise mincore remap_file_pages\
|
|
mlock munlock mlockall munlockall \
|
|
efgcvt efgcvt_r qefgcvt qefgcvt_r \
|
|
hsearch hsearch_r tsearch lsearch \
|
|
err error ustat \
|
|
getsysstats dirname regexp \
|
|
getloadavg getclktck \
|
|
fgetxattr flistxattr fremovexattr fsetxattr getxattr \
|
|
listxattr lgetxattr llistxattr lremovexattr lsetxattr \
|
|
removexattr setxattr getauxval ifunc-impl-list makedev
|
|
|
|
generated += tst-error1.mtrace tst-error1-mem.out
|
|
|
|
aux := init-misc
|
|
install-lib := libg.a
|
|
gpl2lgpl := error.c error.h
|
|
|
|
tests := tst-dirname tst-tsearch tst-fdset tst-efgcvt tst-mntent tst-hsearch \
|
|
tst-error1 tst-pselect tst-insremque tst-mntent2 bug-hsearch1 \
|
|
tst-mntent-blank-corrupt tst-mntent-blank-passno bug18240 \
|
|
tst-preadvwritev tst-preadvwritev64 tst-makedev
|
|
ifeq ($(run-built-tests),yes)
|
|
tests-special += $(objpfx)tst-error1-mem.out
|
|
endif
|
|
|
|
CFLAGS-select.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-tsearch.c = $(uses-callbacks)
|
|
CFLAGS-lsearch.c = $(uses-callbacks)
|
|
CFLAGS-pselect.c = -fexceptions
|
|
CFLAGS-readv.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-writev.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-preadv.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-preadv64.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pwritev.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-pwritev64.c = -fexceptions -fasynchronous-unwind-tables
|
|
CFLAGS-usleep.c = -fexceptions
|
|
CFLAGS-syslog.c = -fexceptions
|
|
CFLAGS-error.c = -fexceptions
|
|
CFLAGS-getpass.c = -fexceptions
|
|
CFLAGS-mkstemp.c = -fexceptions
|
|
CFLAGS-mkstemp64.c = -fexceptions
|
|
CFLAGS-getsysstats.c = -fexceptions
|
|
CFLAGS-getusershell.c = -fexceptions
|
|
CFLAGS-err.c = -fexceptions
|
|
CFLAGS-tst-tsearch.c = $(stack-align-test-flags)
|
|
|
|
include ../Rules
|
|
|
|
$(objpfx)libg.a: $(dep-dummy-lib); $(make-dummy-lib)
|
|
|
|
$(objpfx)tst-tsearch: $(libm)
|
|
|
|
tst-error1-ENV = MALLOC_TRACE=$(objpfx)tst-error1.mtrace
|
|
tst-error1-ARGS = $(objpfx)tst-error1.out
|
|
$(objpfx)tst-error1-mem.out: $(objpfx)tst-error1.out
|
|
$(common-objpfx)malloc/mtrace $(objpfx)tst-error1.mtrace > $@; \
|
|
$(evaluate-test)
|