2000-06-13 07:33:12 +00:00
|
|
|
# File name Caller Syscall name Args Strong name Weak names
|
1996-01-19 00:42:21 +00:00
|
|
|
|
2014-10-08 23:19:32 +00:00
|
|
|
adjtimex adjtime adjtimex i:p __adjtimex adjtimex ntp_adjtime
|
2012-05-10 14:51:08 +00:00
|
|
|
alarm - alarm i:i alarm
|
Make obsolete syscall wrappers into compat symbols (bug 18472).
Various Linux kernel syscalls have become obsolete over time.
Specifically, the following are obsolete in all kernel versions
supported by glibc, are not present for architectures more recently
added to the kernel, and as such, the wrapper functions for them
should be compat symbols, not in static libc and not available for new
links with shared libc.
* bdflush: in Linux 2.6, does nothing if present.
* create_module get_kernel_syms query_module: Linux 2.4 module
interface, syscalls not present in Linux 2.6.
* uselib: part of the mechanism for loading a.out shared libraries,
irrelevant with ELF.
This patch adds support for syscalls.list to list syscall aliases of
the form NAME@VERSION:OBSOLETED, with SHLIB_COMPAT conditionals being
generated for such aliases. Those five syscalls are then made into
compat symbols (obsoleted in glibc 2.23, so future ports won't have
these symbols at all), with the header <sys/kdaemon.h> declaring
bdflush being removed. When we move to 3.2 as minimum kernel version,
the same can be done for nfsservctl (removed in Linux 3.1) as well.
Tested for x86_64 and x86 (testsuite, as well as checking that the
symbols in question indeed become compat symbols, that they are indeed
omitted from static libc, and that the generated SHLIB_COMPAT
conditionals look right).
[BZ #18472]
* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Handle entries
for the form NAME@VERSION:OBSOLETED and generate SHLIB_COMPAT
conditionals for them.
* sysdeps/unix/make-syscalls.sh (emit_weak_aliases): Likewise.
* sysdeps/unix/sysv/linux/sys/kdaemon.h: Remove file.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Remove
sys/kdaemon.h.
* sysdeps/unix/sysv/linux/syscalls.list (bdflush): Make into
compat-only syscall, obsoleted in glibc 2.23.
(create_module): Likewise.
(get_kernel_syms): Likewise.
(query_module): Likewise.
(uselib): Likewise.
* manual/sysinfo.texi (System Parameters): Do not mention bdflush.
2015-12-14 22:52:15 +00:00
|
|
|
bdflush EXTRA bdflush i:ii __compat_bdflush bdflush@GLIBC_2.0:GLIBC_2.23
|
2000-06-27 00:14:44 +00:00
|
|
|
capget EXTRA capget i:pp capget
|
|
|
|
|
capset EXTRA capset i:pp capset
|
2011-03-31 02:00:57 +00:00
|
|
|
clock_adjtime EXTRA clock_adjtime i:ip clock_adjtime
|
2014-10-30 19:44:31 +00:00
|
|
|
creat - creat Ci:si creat
|
Make obsolete syscall wrappers into compat symbols (bug 18472).
Various Linux kernel syscalls have become obsolete over time.
Specifically, the following are obsolete in all kernel versions
supported by glibc, are not present for architectures more recently
added to the kernel, and as such, the wrapper functions for them
should be compat symbols, not in static libc and not available for new
links with shared libc.
* bdflush: in Linux 2.6, does nothing if present.
* create_module get_kernel_syms query_module: Linux 2.4 module
interface, syscalls not present in Linux 2.6.
* uselib: part of the mechanism for loading a.out shared libraries,
irrelevant with ELF.
This patch adds support for syscalls.list to list syscall aliases of
the form NAME@VERSION:OBSOLETED, with SHLIB_COMPAT conditionals being
generated for such aliases. Those five syscalls are then made into
compat symbols (obsoleted in glibc 2.23, so future ports won't have
these symbols at all), with the header <sys/kdaemon.h> declaring
bdflush being removed. When we move to 3.2 as minimum kernel version,
the same can be done for nfsservctl (removed in Linux 3.1) as well.
Tested for x86_64 and x86 (testsuite, as well as checking that the
symbols in question indeed become compat symbols, that they are indeed
omitted from static libc, and that the generated SHLIB_COMPAT
conditionals look right).
[BZ #18472]
* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Handle entries
for the form NAME@VERSION:OBSOLETED and generate SHLIB_COMPAT
conditionals for them.
* sysdeps/unix/make-syscalls.sh (emit_weak_aliases): Likewise.
* sysdeps/unix/sysv/linux/sys/kdaemon.h: Remove file.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Remove
sys/kdaemon.h.
* sysdeps/unix/sysv/linux/syscalls.list (bdflush): Make into
compat-only syscall, obsoleted in glibc 2.23.
(create_module): Likewise.
(get_kernel_syms): Likewise.
(query_module): Likewise.
(uselib): Likewise.
* manual/sysinfo.texi (System Parameters): Do not mention bdflush.
2015-12-14 22:52:15 +00:00
|
|
|
create_module EXTRA create_module 3 __compat_create_module create_module@GLIBC_2.0:GLIBC_2.23
|
Fri Jun 28 02:41:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* nss/Makefile (databases): New variable.
(routines, libnss_files-routines): Use it.
(subdir-dirs): Compute from $(services).
* sysdeps/unix/sysv/linux/syscalls.list (create_module, delete_module,
init_module, klogctl): Use EXTRA in the "caller" column so these get
added to unix-extra-syscalls and thus compiled in misc.
* string/Makefile (routines): Add strndup.
* string/strndup.c: New file.
* string/string.h: Declare strndup.
(strndupa): New macro.
* string/string.h: Declare __strdup.
* string/strdup.c: Deansideclized. Define __ name and weak alias.
* string/string.h: Don't define memccpy as macro for [__OPTIMIZE__].
Thu Jun 27 23:43:22 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/alpha/dl-machine.h (elf_machine_rela): The Alpha's
address-of operation and plt format conspire to require all
dynamic relocs to be resolved to actual symbols not plt entries.
Thu Jun 27 02:49:28 1996 Ulrich Drepper <drepper@cygnus.com>
* catgets/gencat.c: Add casts to avoid signed<->unsigned warnings.
* grp/initgroups.c (initgroups): De-ansi-fy.
Move declaration of NGROUPS and GROUPS outside #if so that
the code compiles for NGROUPS_MAX != 0.
* inet/Makefile (headers): Add netinet/ether.h and netinet/if_ether.h.
(routines): Add ether_aton, ether_aton_r, ether_hton, ether_line,
ether_ntoa, ether_ntoa_r, and ether_ntoh.
* inet/ether_aton.c, inet/ether_aton_r.c, inet/ether_hton.c,
inet/ether_line.c, inet/ether_ntoa.c, inet/ether_ntoa_r.c,
inet/ether_ntoh.c: New files. Implementation of functions to
handle Ethernet address to host mapping.
* inet/netinet/ether.h: New file. Declare ether_* functions.
* netinet/ether.h: Wrapper around inet/netinet/ether.h for glibc
compilation.
* nss/ethers-lookup.c: New file. Lookup function for ethers database.
* nss/Makefile (routines): Add ethers-lookup.
(libnss_files-routines): Add files-ethers.
* nss/getXXent_r.c: Don't define set*ent and end*ent function
with _r suffix.
* nss/nss_files/files-XXX.c (internal_endent): Don't reset
KEEP_STREAM every time called.
(_nss_files_end): Reset KEEP_STREAM here instead.
(internal_getent): If STREAM == NULL try to open instead of
signalling error.
Use cast to prevent warning.
Terminate read line in case the buffer is too small.
* nss/nss_files/files-ethers.c: New file. Implementation of
Ethernet adress<->hostname lookup through files interface.
* stdlib/mbstowcs.c: Define based on mbsrtowcs().
* stdlib/mbtowc.c: Define based on mbrtowc().
* stdlib/wcstombs.c: Define based on wcsrtombs().
* stdlib/wctomb.c: Define based on wcrtomb().
* sunrpc/xdr.c (xdr_u_int): Avoid bogus call to
unexpected_sizes_in_xdr_u_int.
* sysdeps/generic/netinet/if_ether.h: New file. Generic declaration
of `struct ether_addr'.
* sysdeps/unix/sysv/linux/netinet/if_ether.h: New file. Linux specific
declaration of `struct ether_addr'.
* wcsmbs/mbrtowc.c: Handle case where argument PS is NULL.
* wcsmbs/mbsrtowcs.c: Ditto.
* wcsmbs/wcrtomb.c: Ditto.
* wcsmbs/wcsrtombs.c: Ditto.
* wcsmbs/mbsinit.c: Prepare for PS being NULL.
1996-06-28 08:56:59 +00:00
|
|
|
delete_module EXTRA delete_module 3 delete_module
|
2005-11-15 21:54:29 +00:00
|
|
|
epoll_create EXTRA epoll_create i:i epoll_create
|
2008-08-01 23:49:18 +00:00
|
|
|
epoll_create1 EXTRA epoll_create1 i:i epoll_create1
|
2005-11-15 21:54:29 +00:00
|
|
|
epoll_ctl EXTRA epoll_ctl i:iiip epoll_ctl
|
2005-11-15 19:59:57 +00:00
|
|
|
epoll_wait EXTRA epoll_wait Ci:ipii epoll_wait
|
2016-03-17 19:07:39 +00:00
|
|
|
eventfd EXTRA eventfd2 i:ii eventfd
|
2014-10-01 20:58:20 +00:00
|
|
|
execve - execve i:spp __execve execve
|
2007-05-07 04:01:23 +00:00
|
|
|
fdatasync - fdatasync Ci:i fdatasync
|
2000-06-13 07:33:12 +00:00
|
|
|
flock - flock i:ii __flock flock
|
Make obsolete syscall wrappers into compat symbols (bug 18472).
Various Linux kernel syscalls have become obsolete over time.
Specifically, the following are obsolete in all kernel versions
supported by glibc, are not present for architectures more recently
added to the kernel, and as such, the wrapper functions for them
should be compat symbols, not in static libc and not available for new
links with shared libc.
* bdflush: in Linux 2.6, does nothing if present.
* create_module get_kernel_syms query_module: Linux 2.4 module
interface, syscalls not present in Linux 2.6.
* uselib: part of the mechanism for loading a.out shared libraries,
irrelevant with ELF.
This patch adds support for syscalls.list to list syscall aliases of
the form NAME@VERSION:OBSOLETED, with SHLIB_COMPAT conditionals being
generated for such aliases. Those five syscalls are then made into
compat symbols (obsoleted in glibc 2.23, so future ports won't have
these symbols at all), with the header <sys/kdaemon.h> declaring
bdflush being removed. When we move to 3.2 as minimum kernel version,
the same can be done for nfsservctl (removed in Linux 3.1) as well.
Tested for x86_64 and x86 (testsuite, as well as checking that the
symbols in question indeed become compat symbols, that they are indeed
omitted from static libc, and that the generated SHLIB_COMPAT
conditionals look right).
[BZ #18472]
* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Handle entries
for the form NAME@VERSION:OBSOLETED and generate SHLIB_COMPAT
conditionals for them.
* sysdeps/unix/make-syscalls.sh (emit_weak_aliases): Likewise.
* sysdeps/unix/sysv/linux/sys/kdaemon.h: Remove file.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Remove
sys/kdaemon.h.
* sysdeps/unix/sysv/linux/syscalls.list (bdflush): Make into
compat-only syscall, obsoleted in glibc 2.23.
(create_module): Likewise.
(get_kernel_syms): Likewise.
(query_module): Likewise.
(uselib): Likewise.
* manual/sysinfo.texi (System Parameters): Do not mention bdflush.
2015-12-14 22:52:15 +00:00
|
|
|
get_kernel_syms EXTRA get_kernel_syms i:p __compat_get_kernel_syms get_kernel_syms@GLIBC_2.0:GLIBC_2.23
|
Remove cached PID/TID in clone
This patch remove the PID cache and usage in current GLIBC code. Current
usage is mainly used a performance optimization to avoid the syscall,
however it adds some issues:
- The exposed clone syscall will try to set pid/tid to make the new
thread somewhat compatible with current GLIBC assumptions. This cause
a set of issue with new workloads and usecases (such as BZ#17214 and
[1]) as well for new internal usage of clone to optimize other algorithms
(such as clone plus CLONE_VM for posix_spawn, BZ#19957).
- The caching complexity also added some bugs in the past [2] [3] and
requires more effort of each port to handle such requirements (for
both clone and vfork implementation).
- Caching performance gain in mainly on getpid and some specific
code paths. The getpid performance leverage is questionable [4],
either by the idea of getpid being a hotspot as for the getpid
implementation itself (if it is indeed a justifiable hotspot a
vDSO symbol could let to a much more simpler solution).
Other usage is mainly for non usual code paths, such as pthread
cancellation signal and handling.
For thread creation (on stack allocation) the code simplification in fact
adds some performance gain due the no need of transverse the stack cache
and invalidate each element pid.
Other thread usages will require a direct getpid syscall, such as
cancellation/setxid signal, thread cancellation, thread fail path (at
create_thread), and thread signal (pthread_kill and pthread_sigqueue).
However these are hardly usual hotspots and I think adding a syscall is
justifiable.
It also simplifies both the clone and vfork arch-specific implementation.
And by review each fork implementation there are some discrepancies that
this patch also solves:
- microblaze clone/vfork does not set/reset the pid/tid field
- hppa uses the default vfork implementation that fallback to fork.
Since vfork is deprecated I do not think we should bother with it.
The patch also removes the TID caching in clone. My understanding for
such semantic is try provide some pthread usage after a user program
issue clone directly (as done by thread creation with CLONE_PARENT_SETTID
and pthread tid member). However, as stated before in multiple discussions
threads, GLIBC provides clone syscalls without further supporting all this
semantics.
I ran a full make check on x86_64, x32, i686, armhf, aarch64, and powerpc64le.
For sparc32, sparc64, and mips I ran the basic fork and vfork tests from
posix/ folder (on a qemu system). So it would require further testing
on alpha, hppa, ia64, m68k, nios2, s390, sh, and tile (I excluded microblaze
because it is already implementing the patch semantic regarding clone/vfork).
[1] https://codereview.chromium.org/800183004/
[2] https://sourceware.org/ml/libc-alpha/2006-07/msg00123.html
[3] https://sourceware.org/bugzilla/show_bug.cgi?id=15368
[4] http://yarchive.net/comp/linux/getpid_caching.html
* sysdeps/nptl/fork.c (__libc_fork): Remove pid cache setting.
* nptl/allocatestack.c (allocate_stack): Likewise.
(__reclaim_stacks): Likewise.
(setxid_signal_thread): Obtain pid through syscall.
* nptl/nptl-init.c (sigcancel_handler): Likewise.
(sighandle_setxid): Likewise.
* nptl/pthread_cancel.c (pthread_cancel): Likewise.
* sysdeps/unix/sysv/linux/pthread_kill.c (__pthread_kill): Likewise.
* sysdeps/unix/sysv/linux/pthread_sigqueue.c (pthread_sigqueue):
Likewise.
* sysdeps/unix/sysv/linux/createthread.c (create_thread): Likewise.
* sysdeps/unix/sysv/linux/getpid.c: Remove file.
* nptl/descr.h (struct pthread): Change comment about pid value.
* nptl/pthread_getattr_np.c (pthread_getattr_np): Remove thread
pid assert.
* sysdeps/unix/sysv/linux/pthread-pids.h (__pthread_initialize_pids):
Do not set pid value.
* nptl_db/td_ta_thr_iter.c (iterate_thread_list): Remove thread
pid cache check.
* nptl_db/td_thr_validate.c (td_thr_validate): Likewise.
* sysdeps/aarch64/nptl/tcb-offsets.sym: Remove pid offset.
* sysdeps/alpha/nptl/tcb-offsets.sym: Likewise.
* sysdeps/arm/nptl/tcb-offsets.sym: Likewise.
* sysdeps/hppa/nptl/tcb-offsets.sym: Likewise.
* sysdeps/i386/nptl/tcb-offsets.sym: Likewise.
* sysdeps/ia64/nptl/tcb-offsets.sym: Likewise.
* sysdeps/m68k/nptl/tcb-offsets.sym: Likewise.
* sysdeps/microblaze/nptl/tcb-offsets.sym: Likewise.
* sysdeps/mips/nptl/tcb-offsets.sym: Likewise.
* sysdeps/nios2/nptl/tcb-offsets.sym: Likewise.
* sysdeps/powerpc/nptl/tcb-offsets.sym: Likewise.
* sysdeps/s390/nptl/tcb-offsets.sym: Likewise.
* sysdeps/sh/nptl/tcb-offsets.sym: Likewise.
* sysdeps/sparc/nptl/tcb-offsets.sym: Likewise.
* sysdeps/tile/nptl/tcb-offsets.sym: Likewise.
* sysdeps/x86_64/nptl/tcb-offsets.sym: Likewise.
* sysdeps/unix/sysv/linux/aarch64/clone.S: Remove pid and tid caching.
* sysdeps/unix/sysv/linux/alpha/clone.S: Likewise.
* sysdeps/unix/sysv/linux/arm/clone.S: Likewise.
* sysdeps/unix/sysv/linux/hppa/clone.S: Likewise.
* sysdeps/unix/sysv/linux/i386/clone.S: Likewise.
* sysdeps/unix/sysv/linux/ia64/clone2.S: Likewise.
* sysdeps/unix/sysv/linux/mips/clone.S: Likewise.
* sysdeps/unix/sysv/linux/nios2/clone.S: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/clone.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sh/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/clone.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/tile/clone.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise.
* sysdeps/unix/sysv/linux/aarch64/vfork.S: Remove pid set and reset.
* sysdeps/unix/sysv/linux/alpha/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/arm/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/i386/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/ia64/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/m68k/clone.S: Likewise.
* sysdeps/unix/sysv/linux/m68k/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/mips/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/nios2/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/sh/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc32/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/tile/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/x86_64/vfork.S: Likewise.
* sysdeps/unix/sysv/linux/tst-clone2.c (f): Remove direct pthread
struct access.
(clone_test): Remove function.
(do_test): Rewrite to take in consideration pid is not cached anymore.
2016-10-10 18:08:39 +00:00
|
|
|
getpid - getpid Ei: __getpid getpid
|
2003-03-23 19:44:31 +00:00
|
|
|
getegid - getegid Ei: __getegid getegid
|
|
|
|
|
geteuid - geteuid Ei: __geteuid geteuid
|
2002-08-03 19:46:32 +00:00
|
|
|
getpgid - getpgid i:i __getpgid getpgid
|
2003-03-23 19:44:31 +00:00
|
|
|
getpgrp - getpgrp Ei: getpgrp
|
2002-12-16 10:25:45 +00:00
|
|
|
getpmsg - getpmsg i:ipppp getpmsg
|
2003-03-23 19:44:31 +00:00
|
|
|
getppid - getppid Ei: __getppid getppid
|
* elf/rtld-Rules ($(objpfx)rtld-libc.a): Use $(verbose) in ar command.
* sysdeps/mach/hurd/getresuid.c: New file.
* sysdeps/mach/hurd/getresgid.c: New file.
* sysdeps/mach/hurd/setresuid.c: New file.
* sysdeps/mach/hurd/setresgid.c: New file.
* posix/unistd.h [__USE_GNU] (getresuid, getresgid, setresuid,
setresgid): Declare them.
* NEWS: Mention it.
* include/unistd.h
(__getresuid, __getresgid, __setresuid, __setresgid): Declare them,
add libc_hidden_proto.
* posix/Versions (libc: GLIBC_2.3.2): New set. Add
getresuid, getresgid, setresuid, setresgid here.
* Versions.def (libc): Define GLIBC_2.3.2 set.
* sysdeps/generic/getresuid.c (__getresuid): Fix argument types.
Add libc_hidden_def.
* sysdeps/generic/getresgid.c (__getresgid): Likewise.
* sysdeps/generic/setresgid.c: New file.
* sysdeps/generic/setresuid.c: New file.
* sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc]
(sysdep_routines): Don't add getresuid and getresgid here.
* sysdeps/unix/sysv/linux/arm/Makefile [$(subdir) = misc]
(sysdep_routines): Don't add setresuid and setresgid here.
* sysdeps/unix/sysv/linux/cris/Makefile: Likewise.
* sysdeps/unix/sysv/linux/sh/Makefile: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/Makefile: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/Makefile: Likewise.
* sysdeps/unix/sysv/linux/i386/Makefile: Likewise.
* sysdeps/unix/sysv/linux/m68k/Makefile: Likewise.
* posix/Makefile (routines): Add them all here instead.
* sysdeps/unix/sysv/linux/i386/getresuid.c (getresuid): Renamed to
__getresuid. Add libc_hidden_def for that, and weak alias to old name.
* sysdeps/unix/sysv/linux/i386/getresgid.c (getresgid): Renamed to
__getresgid. Add libc_hidden_def for that, and weak alias to old name.
* sysdeps/unix/sysv/linux/i386/setresuid.c: Add libc_hidden_def.
[! __NR_setresuid]: Include generic file.
* sysdeps/unix/sysv/linux/i386/setresgid.c (setresgid): Renamed to
__setresgid. Add libc_hidden_def for that, and weak alias to old name.
[! __NR_setresuid]: Include generic file.
* sysdeps/unix/sysv/linux/syscalls.list (setresuid, setresgid):
Caller is - now, not EXTRA.
* sysdeps/unix/sysv/linux/sparc/sparc32/syscalls.list
(setresuid, setresgid, getresuid, getresgid): Likewise.
* sysdeps/unix/sysv/linux/syscalls.list (getresuid, getresgid):
Add these calls here.
* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove them here.
* sysdeps/unix/sysv/linux/hppa/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/powerpc/powerpc64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/mips/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/ia64/syscalls.list: Likewise.
* sysdeps/unix/sysv/linux/Makefile [$(subdir) = misc]
(sysdep_routines): Add setfsuid and setfsgid here.
* sysdeps/unix/sysv/linux/arm/Makefile: Not here.
* sysdeps/unix/sysv/linux/sparc/sparc32/Makefile: Likewise.
* sysdeps/unix/sysv/linux/cris/Makefile: Likewise.
* sysdeps/unix/sysv/linux/sh/Makefile: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-32/Makefile: Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/Makefile: Likewise.
* sysdeps/unix/sysv/linux/i386/Makefile: Likewise.
* sysdeps/unix/sysv/linux/m68k/Makefile: Likewise.
* hurd/errno.c: Renamed to ...
* hurd/errno-loc.c: ... this.
* hurd/Makefile (routines): errno -> errno-loc
2002-10-14 01:03:16 +00:00
|
|
|
getresuid - getresuid i:ppp getresuid
|
|
|
|
|
getresgid - getresgid i:ppp getresgid
|
2000-06-13 07:33:12 +00:00
|
|
|
getsid - getsid i:i getsid
|
Fri Jun 28 02:41:08 1996 Roland McGrath <roland@delasyd.gnu.ai.mit.edu>
* nss/Makefile (databases): New variable.
(routines, libnss_files-routines): Use it.
(subdir-dirs): Compute from $(services).
* sysdeps/unix/sysv/linux/syscalls.list (create_module, delete_module,
init_module, klogctl): Use EXTRA in the "caller" column so these get
added to unix-extra-syscalls and thus compiled in misc.
* string/Makefile (routines): Add strndup.
* string/strndup.c: New file.
* string/string.h: Declare strndup.
(strndupa): New macro.
* string/string.h: Declare __strdup.
* string/strdup.c: Deansideclized. Define __ name and weak alias.
* string/string.h: Don't define memccpy as macro for [__OPTIMIZE__].
Thu Jun 27 23:43:22 1996 Richard Henderson <rth@tamu.edu>
* sysdeps/alpha/dl-machine.h (elf_machine_rela): The Alpha's
address-of operation and plt format conspire to require all
dynamic relocs to be resolved to actual symbols not plt entries.
Thu Jun 27 02:49:28 1996 Ulrich Drepper <drepper@cygnus.com>
* catgets/gencat.c: Add casts to avoid signed<->unsigned warnings.
* grp/initgroups.c (initgroups): De-ansi-fy.
Move declaration of NGROUPS and GROUPS outside #if so that
the code compiles for NGROUPS_MAX != 0.
* inet/Makefile (headers): Add netinet/ether.h and netinet/if_ether.h.
(routines): Add ether_aton, ether_aton_r, ether_hton, ether_line,
ether_ntoa, ether_ntoa_r, and ether_ntoh.
* inet/ether_aton.c, inet/ether_aton_r.c, inet/ether_hton.c,
inet/ether_line.c, inet/ether_ntoa.c, inet/ether_ntoa_r.c,
inet/ether_ntoh.c: New files. Implementation of functions to
handle Ethernet address to host mapping.
* inet/netinet/ether.h: New file. Declare ether_* functions.
* netinet/ether.h: Wrapper around inet/netinet/ether.h for glibc
compilation.
* nss/ethers-lookup.c: New file. Lookup function for ethers database.
* nss/Makefile (routines): Add ethers-lookup.
(libnss_files-routines): Add files-ethers.
* nss/getXXent_r.c: Don't define set*ent and end*ent function
with _r suffix.
* nss/nss_files/files-XXX.c (internal_endent): Don't reset
KEEP_STREAM every time called.
(_nss_files_end): Reset KEEP_STREAM here instead.
(internal_getent): If STREAM == NULL try to open instead of
signalling error.
Use cast to prevent warning.
Terminate read line in case the buffer is too small.
* nss/nss_files/files-ethers.c: New file. Implementation of
Ethernet adress<->hostname lookup through files interface.
* stdlib/mbstowcs.c: Define based on mbsrtowcs().
* stdlib/mbtowc.c: Define based on mbrtowc().
* stdlib/wcstombs.c: Define based on wcsrtombs().
* stdlib/wctomb.c: Define based on wcrtomb().
* sunrpc/xdr.c (xdr_u_int): Avoid bogus call to
unexpected_sizes_in_xdr_u_int.
* sysdeps/generic/netinet/if_ether.h: New file. Generic declaration
of `struct ether_addr'.
* sysdeps/unix/sysv/linux/netinet/if_ether.h: New file. Linux specific
declaration of `struct ether_addr'.
* wcsmbs/mbrtowc.c: Handle case where argument PS is NULL.
* wcsmbs/mbsrtowcs.c: Ditto.
* wcsmbs/wcrtomb.c: Ditto.
* wcsmbs/wcsrtombs.c: Ditto.
* wcsmbs/mbsinit.c: Prepare for PS being NULL.
1996-06-28 08:56:59 +00:00
|
|
|
init_module EXTRA init_module 5 init_module
|
2005-08-17 06:17:34 +00:00
|
|
|
inotify_add_watch EXTRA inotify_add_watch i:isi inotify_add_watch
|
|
|
|
|
inotify_init EXTRA inotify_init i: inotify_init
|
2008-07-25 04:51:56 +00:00
|
|
|
inotify_init1 EXTRA inotify_init1 i:I inotify_init1
|
2005-08-17 06:17:34 +00:00
|
|
|
inotify_rm_watch EXTRA inotify_rm_watch i:ii inotify_rm_watch
|
2000-06-13 07:33:12 +00:00
|
|
|
ioperm - ioperm i:iii ioperm
|
|
|
|
|
iopl - iopl i:i iopl
|
|
|
|
|
klogctl EXTRA syslog i:isi klogctl
|
|
|
|
|
lchown - lchown i:sii __lchown lchown
|
2000-09-08 08:41:45 +00:00
|
|
|
mincore - mincore i:anV mincore
|
2001-04-19 23:25:40 +00:00
|
|
|
mlock - mlock i:bn mlock
|
|
|
|
|
mlockall - mlockall i:i mlockall
|
2000-06-13 07:33:12 +00:00
|
|
|
mount EXTRA mount i:sssip __mount mount
|
2005-10-14 13:42:37 +00:00
|
|
|
mremap EXTRA mremap b:ainip __mremap mremap
|
2001-04-19 23:25:40 +00:00
|
|
|
munlock - munlock i:ai munlock
|
|
|
|
|
munlockall - munlockall i: munlockall
|
2014-11-01 12:26:09 +00:00
|
|
|
nanosleep - nanosleep Ci:pp __nanosleep nanosleep
|
2000-06-13 07:33:12 +00:00
|
|
|
nfsservctl EXTRA nfsservctl i:ipp nfsservctl
|
Update.
* sysdeps/generic/sysdep-cancel.h: New file.
* sysdeps/unix/make-syscalls.sh: Handle C at start of args as
cancelable syscall.
* sysdeps/unix/inet/syscalls.list (accept, connect, recv, recvfrom,
recvmsg, send, sendmsg, sendto): Make cancelable.
* sysdeps/unix/mman/syscalls.list (msync): Likewise.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (llseek, pread,
pwrite, accept, connect, recv, recvfrom, recvmsg, send, sendmsg,
sendto, osf_select): Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list (accept, connect, recv,
recvfrom, recvmsg, send, sendmsg, sendto): Likewise.
* sysdeps/unix/sysv/linux/ia64/syscalls.list (llseek, pread,
pwrite, accept, connect, recv, recvfrom, recvmsg, send, sendmsg,
sendto): Likewise.
* sysdeps/unix/sysv/linux/mips/syscalls.list (accept, connect, recv,
recvfrom, recvmsg, send, sendmsg, sendto): Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (llseek, pread,
pwrite, accept, connect, recv, recvfrom, recvmsg, send, sendmsg,
sendto): Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (llseek, pread,
pwrite, accept, connect, recv, recvfrom, recvmsg, send, sendmsg,
sendto, select): Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list (llseek, pread,
pwrite, accept, connect, recvfrom, recvmsg, sendmsg, sendto):
Likewise.
* sysdeps/unix/sysv/linux/syscalls.list (creat, nanosleep, pause,
select, fcntl): Likewise.
* sysdeps/unix/sysv/syscalls.list (pause, poll): Likewise.
* sysdeps/unix/syscalls.list (close, fcntl, fsync, lseek, open,
read, readv, select, sigsuspend, write, writev): Likewise.
2002-12-14 Jakub Jelinek <jakub@redhat.com>
2002-12-15 01:00:22 +00:00
|
|
|
pause - pause Ci: __libc_pause pause
|
2002-08-03 19:46:32 +00:00
|
|
|
pipe - pipe i:f __pipe pipe
|
2008-07-27 18:26:13 +00:00
|
|
|
pipe2 - pipe2 i:fi __pipe2 pipe2
|
2000-11-23 07:53:16 +00:00
|
|
|
pivot_root EXTRA pivot_root i:ss pivot_root
|
2012-05-23 06:53:36 +00:00
|
|
|
poll - poll Ci:pii __libc_poll __poll poll
|
2003-01-28 05:59:24 +00:00
|
|
|
prctl EXTRA prctl i:iiiii __prctl prctl
|
2002-12-16 10:25:45 +00:00
|
|
|
putpmsg - putpmsg i:ippii putpmsg
|
Make obsolete syscall wrappers into compat symbols (bug 18472).
Various Linux kernel syscalls have become obsolete over time.
Specifically, the following are obsolete in all kernel versions
supported by glibc, are not present for architectures more recently
added to the kernel, and as such, the wrapper functions for them
should be compat symbols, not in static libc and not available for new
links with shared libc.
* bdflush: in Linux 2.6, does nothing if present.
* create_module get_kernel_syms query_module: Linux 2.4 module
interface, syscalls not present in Linux 2.6.
* uselib: part of the mechanism for loading a.out shared libraries,
irrelevant with ELF.
This patch adds support for syscalls.list to list syscall aliases of
the form NAME@VERSION:OBSOLETED, with SHLIB_COMPAT conditionals being
generated for such aliases. Those five syscalls are then made into
compat symbols (obsoleted in glibc 2.23, so future ports won't have
these symbols at all), with the header <sys/kdaemon.h> declaring
bdflush being removed. When we move to 3.2 as minimum kernel version,
the same can be done for nfsservctl (removed in Linux 3.1) as well.
Tested for x86_64 and x86 (testsuite, as well as checking that the
symbols in question indeed become compat symbols, that they are indeed
omitted from static libc, and that the generated SHLIB_COMPAT
conditionals look right).
[BZ #18472]
* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Handle entries
for the form NAME@VERSION:OBSOLETED and generate SHLIB_COMPAT
conditionals for them.
* sysdeps/unix/make-syscalls.sh (emit_weak_aliases): Likewise.
* sysdeps/unix/sysv/linux/sys/kdaemon.h: Remove file.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Remove
sys/kdaemon.h.
* sysdeps/unix/sysv/linux/syscalls.list (bdflush): Make into
compat-only syscall, obsoleted in glibc 2.23.
(create_module): Likewise.
(get_kernel_syms): Likewise.
(query_module): Likewise.
(uselib): Likewise.
* manual/sysinfo.texi (System Parameters): Do not mention bdflush.
2015-12-14 22:52:15 +00:00
|
|
|
query_module EXTRA query_module i:sipip __compat_query_module query_module@GLIBC_2.0:GLIBC_2.23
|
2000-06-13 07:33:12 +00:00
|
|
|
quotactl EXTRA quotactl i:isip quotactl
|
2003-03-03 10:05:49 +00:00
|
|
|
remap_file_pages - remap_file_pages i:piiii __remap_file_pages remap_file_pages
|
2000-06-13 07:33:12 +00:00
|
|
|
sched_getp - sched_getparam i:ip __sched_getparam sched_getparam
|
|
|
|
|
sched_gets - sched_getscheduler i:i __sched_getscheduler sched_getscheduler
|
|
|
|
|
sched_primax - sched_get_priority_max i:i __sched_get_priority_max sched_get_priority_max
|
|
|
|
|
sched_primin - sched_get_priority_min i:i __sched_get_priority_min sched_get_priority_min
|
|
|
|
|
sched_rr_gi - sched_rr_get_interval i:ip __sched_rr_get_interval sched_rr_get_interval
|
|
|
|
|
sched_setp - sched_setparam i:ip __sched_setparam sched_setparam
|
2002-08-03 19:46:32 +00:00
|
|
|
sched_sets - sched_setscheduler i:iip __sched_setscheduler sched_setscheduler
|
2000-06-13 07:33:12 +00:00
|
|
|
sched_yield - sched_yield i: __sched_yield sched_yield
|
Update.
* sysdeps/generic/sysdep-cancel.h: New file.
* sysdeps/unix/make-syscalls.sh: Handle C at start of args as
cancelable syscall.
* sysdeps/unix/inet/syscalls.list (accept, connect, recv, recvfrom,
recvmsg, send, sendmsg, sendto): Make cancelable.
* sysdeps/unix/mman/syscalls.list (msync): Likewise.
* sysdeps/unix/sysv/linux/alpha/syscalls.list (llseek, pread,
pwrite, accept, connect, recv, recvfrom, recvmsg, send, sendmsg,
sendto, osf_select): Likewise.
* sysdeps/unix/sysv/linux/hppa/syscalls.list (accept, connect, recv,
recvfrom, recvmsg, send, sendmsg, sendto): Likewise.
* sysdeps/unix/sysv/linux/ia64/syscalls.list (llseek, pread,
pwrite, accept, connect, recv, recvfrom, recvmsg, send, sendmsg,
sendto): Likewise.
* sysdeps/unix/sysv/linux/mips/syscalls.list (accept, connect, recv,
recvfrom, recvmsg, send, sendmsg, sendto): Likewise.
* sysdeps/unix/sysv/linux/s390/s390-64/syscalls.list (llseek, pread,
pwrite, accept, connect, recv, recvfrom, recvmsg, send, sendmsg,
sendto): Likewise.
* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list (llseek, pread,
pwrite, accept, connect, recv, recvfrom, recvmsg, send, sendmsg,
sendto, select): Likewise.
* sysdeps/unix/sysv/linux/x86_64/syscalls.list (llseek, pread,
pwrite, accept, connect, recvfrom, recvmsg, sendmsg, sendto):
Likewise.
* sysdeps/unix/sysv/linux/syscalls.list (creat, nanosleep, pause,
select, fcntl): Likewise.
* sysdeps/unix/sysv/syscalls.list (pause, poll): Likewise.
* sysdeps/unix/syscalls.list (close, fcntl, fsync, lseek, open,
read, readv, select, sigsuspend, write, writev): Likewise.
2002-12-14 Jakub Jelinek <jakub@redhat.com>
2002-12-15 01:00:22 +00:00
|
|
|
select - _newselect Ci:iPPPP __select __libc_select select
|
2002-06-07 12:34:08 +00:00
|
|
|
sendfile - sendfile i:iipi sendfile
|
|
|
|
|
sendfile64 - sendfile64 i:iipi sendfile64
|
2000-06-13 07:33:12 +00:00
|
|
|
setfsgid EXTRA setfsgid i:i setfsgid
|
|
|
|
|
setfsuid EXTRA setfsuid i:i setfsuid
|
2002-08-03 19:46:32 +00:00
|
|
|
setpgid - setpgid i:ii __setpgid setpgid
|
2000-07-17 22:28:59 +00:00
|
|
|
sigaltstack - sigaltstack i:PP __sigaltstack sigaltstack
|
2007-09-18 16:21:06 +00:00
|
|
|
splice EXTRA splice Ci:iPiPii splice
|
2012-05-10 14:51:08 +00:00
|
|
|
stime - stime i:p stime
|
linux/getsysstats.c: use sysinfo() instead of parsing /proc/meminfo
Profiling git's test suite, Linus noted [1] that a disproportionately
large amount of time was spent reading /proc/meminfo. This is done by
the glibc functions get_phys_pages and get_avphys_pages, but they only
need the MemTotal and MemFree fields, respectively. That same
information can be obtained with a single syscall, sysinfo, instead of
six: open, fstat, mmap, read, close, munmap. While sysinfo also
provides more than necessary, it does a lot less work than what the
kernel needs to do to provide the entire /proc/meminfo. Both strace -T
and in-app microbenchmarks shows that the sysinfo() approach is
roughly an order of magnitude faster.
sysinfo() is much older than what glibc currently requires, so I don't
think there's any reason to keep the old parsing code. Moreover, this
makes get_[av]phys_pages work even in the absence of /proc.
Linus noted that something as simple as 'bash -c "echo"' would trigger
the reading of /proc/meminfo, but gdb says that many more applications
than just bash are affected:
Starting program: /bin/bash "-c" "echo"
Breakpoint 1, __get_phys_pages () at ../sysdeps/unix/sysv/linux/getsysstats.c:283
283 ../sysdeps/unix/sysv/linux/getsysstats.c: No such file or directory.
(gdb) bt
So it seems that any application that uses qsort on a moderately sized
array will incur this cost (once), which is obviously proportionately
more expensive for lots of short-lived processes (such as the git test
suite).
[1] http://thread.gmane.org/gmane.linux.kernel/2019285
Signed-off-by: Rasmus Villemoes <rv@rasmusvillemoes.dk>
* sysdeps/unix/sysv/linux/getsysstats.c (__get_phys_pages):
Use sysinfo system call instead of parsing /proc/meminfo.
* sysdeps/unix/sysv/linux/getsysstats.c (__get_avphys_pages):
Likewise.
2015-08-18 09:55:34 +00:00
|
|
|
sysinfo EXTRA sysinfo i:p __sysinfo sysinfo
|
2000-06-13 07:33:12 +00:00
|
|
|
swapon - swapon i:si __swapon swapon
|
|
|
|
|
swapoff - swapoff i:s __swapoff swapoff
|
2007-09-18 16:21:06 +00:00
|
|
|
tee EXTRA tee Ci:iiii tee
|
2006-02-08 18:25:19 +00:00
|
|
|
unshare EXTRA unshare i:i unshare
|
Make obsolete syscall wrappers into compat symbols (bug 18472).
Various Linux kernel syscalls have become obsolete over time.
Specifically, the following are obsolete in all kernel versions
supported by glibc, are not present for architectures more recently
added to the kernel, and as such, the wrapper functions for them
should be compat symbols, not in static libc and not available for new
links with shared libc.
* bdflush: in Linux 2.6, does nothing if present.
* create_module get_kernel_syms query_module: Linux 2.4 module
interface, syscalls not present in Linux 2.6.
* uselib: part of the mechanism for loading a.out shared libraries,
irrelevant with ELF.
This patch adds support for syscalls.list to list syscall aliases of
the form NAME@VERSION:OBSOLETED, with SHLIB_COMPAT conditionals being
generated for such aliases. Those five syscalls are then made into
compat symbols (obsoleted in glibc 2.23, so future ports won't have
these symbols at all), with the header <sys/kdaemon.h> declaring
bdflush being removed. When we move to 3.2 as minimum kernel version,
the same can be done for nfsservctl (removed in Linux 3.1) as well.
Tested for x86_64 and x86 (testsuite, as well as checking that the
symbols in question indeed become compat symbols, that they are indeed
omitted from static libc, and that the generated SHLIB_COMPAT
conditionals look right).
[BZ #18472]
* sysdeps/unix/Makefile ($(objpfx)stub-syscalls.c): Handle entries
for the form NAME@VERSION:OBSOLETED and generate SHLIB_COMPAT
conditionals for them.
* sysdeps/unix/make-syscalls.sh (emit_weak_aliases): Likewise.
* sysdeps/unix/sysv/linux/sys/kdaemon.h: Remove file.
* sysdeps/unix/sysv/linux/Makefile (sysdep_headers): Remove
sys/kdaemon.h.
* sysdeps/unix/sysv/linux/syscalls.list (bdflush): Make into
compat-only syscall, obsoleted in glibc 2.23.
(create_module): Likewise.
(get_kernel_syms): Likewise.
(query_module): Likewise.
(uselib): Likewise.
* manual/sysinfo.texi (System Parameters): Do not mention bdflush.
2015-12-14 22:52:15 +00:00
|
|
|
uselib EXTRA uselib i:s __compat_uselib uselib@GLIBC_2.0:GLIBC_2.23
|
2012-05-10 14:51:08 +00:00
|
|
|
utime - utime i:sP utime
|
2007-09-18 16:21:06 +00:00
|
|
|
vmsplice EXTRA vmsplice Ci:iPii vmsplice
|
2000-07-17 22:28:59 +00:00
|
|
|
wait4 - wait4 i:iWiP __wait4 wait4
|
2002-04-19 08:00:18 +00:00
|
|
|
|
2002-08-03 19:46:32 +00:00
|
|
|
chown - chown i:sii __libc_chown __chown chown
|
2002-08-15 08:25:16 +00:00
|
|
|
|
2014-09-30 14:32:08 +00:00
|
|
|
fchownat - fchownat i:isiii fchownat
|
|
|
|
|
linkat - linkat i:isisi linkat
|
|
|
|
|
mkdirat - mkdirat i:isi mkdirat
|
|
|
|
|
readlinkat - readlinkat i:issi readlinkat
|
|
|
|
|
symlinkat - symlinkat i:sis symlinkat
|
|
|
|
|
unlinkat - unlinkat i:isi unlinkat
|
|
|
|
|
|
2003-03-27 09:48:09 +00:00
|
|
|
setxattr - setxattr i:sspii setxattr
|
|
|
|
|
lsetxattr - lsetxattr i:sspii lsetxattr
|
|
|
|
|
fsetxattr - fsetxattr i:ispii fsetxattr
|
|
|
|
|
getxattr - getxattr i:sspi getxattr
|
|
|
|
|
lgetxattr - lgetxattr i:sspi lgetxattr
|
|
|
|
|
fgetxattr - fgetxattr i:ispi fgetxattr
|
|
|
|
|
listxattr - listxattr i:ssi listxattr
|
|
|
|
|
llistxattr - llistxattr i:ssi llistxattr
|
|
|
|
|
flistxattr - flistxattr i:isi flistxattr
|
|
|
|
|
removexattr - removexattr i:ss removexattr
|
|
|
|
|
lremovexattr - lremovexattr i:ss lremovexattr
|
|
|
|
|
fremovexattr - fremovexattr i:is fremovexattr
|
2004-04-13 02:15:43 +00:00
|
|
|
|
2015-06-17 20:19:04 +00:00
|
|
|
mq_timedsend - mq_timedsend Ci:ipiip __mq_timedsend mq_timedsend
|
|
|
|
|
mq_timedreceive - mq_timedreceive Ci:ipipp __mq_timedreceive mq_timedreceive
|
2015-06-17 20:17:49 +00:00
|
|
|
mq_setattr - mq_getsetattr i:ipp mq_setattr
|
2008-02-10 19:43:56 +00:00
|
|
|
|
|
|
|
|
timerfd_create EXTRA timerfd_create i:ii timerfd_create
|
|
|
|
|
timerfd_settime EXTRA timerfd_settime i:iipp timerfd_settime
|
|
|
|
|
timerfd_gettime EXTRA timerfd_gettime i:ip timerfd_gettime
|
2010-08-16 14:06:38 +00:00
|
|
|
|
|
|
|
|
fanotify_init EXTRA fanotify_init i:ii fanotify_init
|
2011-04-01 14:33:37 +00:00
|
|
|
|
|
|
|
|
name_to_handle_at EXTRA name_to_handle_at i:isppi name_to_handle_at
|
2011-04-01 17:05:15 +00:00
|
|
|
open_by_handle_at EXTRA open_by_handle_at Ci:ipi open_by_handle_at
|
2011-05-28 04:53:13 +00:00
|
|
|
|
|
|
|
|
setns EXTRA setns i:ii setns
|
2011-11-01 13:59:32 +00:00
|
|
|
|
|
|
|
|
process_vm_readv EXTRA process_vm_readv i:ipipii process_vm_readv
|
|
|
|
|
process_vm_writev EXTRA process_vm_writev i:ipipii process_vm_writev
|
