mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-01 17:30:07 +00:00
8b4a118222
Building with -Os produces linknamespace and localplt failures for, among other functions, gnu_dev_major, gnu_dev_minor and gnu_dev_makedev. The issue is that those functions are not inlined when building with -Os. While one could force them to be inlined in that case, it seems more natural to fix this issue similarly to other namespace issues. Thus, this patch makes gnu_dev_* into weak aliases for hidden symbols __gnu_dev_*; __gnu_dev_* are then defined as inlines in the internal include/sys/sysmacros.h, and uses of gnu_dev_* (often via the macros major, minor and makedev) for which there are namespace issues are changed to use __gnu_dev_*; where there are no namespace issues, use of libc_hidden_proto serves to avoid unnecessary local PLT entry use. Tested for x86_64, (a) without -Os, to verify the testsuite continues to pass without problems and that the functions called under their new names continue to be inlined as expected in that case; (b) with -Os, to verify that the linknamespace and localplt failures in question go away (but because of other such failures present, neither of the relevant bugs can yet be closed). [BZ #15105] [BZ #19463] * include/sys/sysmacros.h [!_ISOMAC] (__SYSMACROS_NEED_IMPLEMENTATION): Define macro. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (_SYS_SYSMACROS_H_WRAPPER): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (gnu_dev_major): Use libc_hidden_proto. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (gnu_dev_minor): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (gnu_dev_makedev): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__SYSMACROS_DECL_TEMPL): Undefine and redefine to add use __gnu_dev_ prefix. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__SYSMACROS_IMPL_TEMPL): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__gnu_dev_major): Declare and define as hidden inline function. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__gnu_dev_minor): Likewise. [!_SYS_SYSMACROS_H_WRAPPER && !_ISOMAC] (__gnu_dev_makedev): Likewise. * misc/makedev.c (OUT_OF_LINE_IMPL_TEMPL): Use __gnu_dev_ prefix. (gnu_dev_major): Use weak_alias and libc_hidden_weak. (gnu_dev_minor): Likewise. (gnu_dev_makedev): Likewise. * csu/check_fds.c (check_one_fd): Use __gnu_dev_makedev instead of makedev. * posix/wordexp.c (exec_comm_child): Likewise. * sysdeps/mach/hurd/xmknodat.c (__xmknodat): Use __gnu_dev_minor instead of minor and __gnu_dev_major instead of major. * sysdeps/unix/sysv/linux/device-nrs.h (DEV_TTY_P): Use __gnu_dev_major instead of major. * sysdeps/unix/sysv/linux/pathconf.c (distinguish_extX): Use __gnu_dev_major instead of gnu_dev_major and __gnu_dev_minor instead of gnu_dev_minor. * sysdeps/unix/sysv/linux/ptsname.c (MASTER_P): Likewise. (SLAVE_P): Likewise. (__ptsname_internal): Use __gnu_dev_minor instead of minor. * sysdeps/unix/sysv/linux/ttyname.h (is_pty): Use __gnu_dev_major instead of major.
121 lines
3.5 KiB
C
121 lines
3.5 KiB
C
/* Create a device file relative to an open directory. Hurd version.
|
|
Copyright (C) 1991-2018 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/>. */
|
|
|
|
#include <errno.h>
|
|
#include <sys/stat.h>
|
|
#include <hurd.h>
|
|
#include <hurd/fd.h>
|
|
#include <hurd/paths.h>
|
|
#include <fcntl.h>
|
|
#include <_itoa.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/sysmacros.h>
|
|
|
|
/* Create a device file named PATH relative to FD, with permission and
|
|
special bits MODE and device number DEV (which can be constructed
|
|
from major and minor device numbers with the `makedev' macro
|
|
above). */
|
|
int
|
|
__xmknodat (int vers, int fd, const char *path, mode_t mode, dev_t *dev)
|
|
{
|
|
error_t errnode, err;
|
|
file_t dir, node;
|
|
char *name;
|
|
char buf[100], *bp;
|
|
const char *translator;
|
|
size_t len;
|
|
|
|
if (vers != _MKNOD_VER)
|
|
return __hurd_fail (EINVAL);
|
|
|
|
if (S_ISCHR (mode))
|
|
{
|
|
translator = _HURD_CHRDEV;
|
|
len = sizeof (_HURD_CHRDEV);
|
|
}
|
|
else if (S_ISBLK (mode))
|
|
{
|
|
translator = _HURD_BLKDEV;
|
|
len = sizeof (_HURD_BLKDEV);
|
|
}
|
|
else if (S_ISFIFO (mode))
|
|
{
|
|
translator = _HURD_FIFO;
|
|
len = sizeof (_HURD_FIFO);
|
|
}
|
|
else if (S_ISREG (mode))
|
|
{
|
|
translator = NULL;
|
|
len = 0;
|
|
}
|
|
else
|
|
{
|
|
errno = EINVAL;
|
|
return -1;
|
|
}
|
|
|
|
if (translator != NULL && ! S_ISFIFO (mode))
|
|
{
|
|
/* We set the translator to "ifmt\0major\0minor\0", where IFMT
|
|
depends on the S_IFMT bits of our MODE argument, and MAJOR and
|
|
MINOR are ASCII decimal (octal or hex would do as well)
|
|
representations of our arguments. Thus the convention is that
|
|
CHRDEV and BLKDEV translators are invoked with two non-switch
|
|
arguments, giving the major and minor device numbers in %i format. */
|
|
|
|
bp = buf + sizeof (buf);
|
|
*--bp = '\0';
|
|
bp = _itoa (__gnu_dev_minor (*dev), bp, 10, 0);
|
|
*--bp = '\0';
|
|
bp = _itoa (__gnu_dev_major (*dev), bp, 10, 0);
|
|
memcpy (bp - len, translator, len);
|
|
translator = bp - len;
|
|
len = buf + sizeof (buf) - translator;
|
|
}
|
|
|
|
dir = __file_name_split_at (fd, path, &name);
|
|
if (dir == MACH_PORT_NULL)
|
|
return -1;
|
|
|
|
/* Create a new, unlinked node in the target directory. */
|
|
errnode = err = __dir_mkfile (dir, O_WRITE, (mode & ~S_IFMT) & ~_hurd_umask, &node);
|
|
|
|
if (! err && translator != NULL)
|
|
/* Set the node's translator to make it a device. */
|
|
err = __file_set_translator (node,
|
|
FS_TRANS_EXCL | FS_TRANS_SET,
|
|
FS_TRANS_EXCL | FS_TRANS_SET, 0,
|
|
translator, len,
|
|
MACH_PORT_NULL, MACH_MSG_TYPE_COPY_SEND);
|
|
|
|
if (! err)
|
|
/* Link the node, now a valid device, into the target directory. */
|
|
err = __dir_link (dir, node, name, 1);
|
|
|
|
__mach_port_deallocate (__mach_task_self (), dir);
|
|
if (! errnode)
|
|
__mach_port_deallocate (__mach_task_self (), node);
|
|
|
|
if (err)
|
|
return __hurd_fail (err);
|
|
return 0;
|
|
}
|
|
|
|
libc_hidden_def (__xmknodat)
|