diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2014-10-06 22:58:59 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2014-10-06 22:58:59 +0000 |
| commit | f7b425175c3fa2f063a6c5657d84b799929db459 (patch) | |
| tree | 1e0ef614915b3f58279845a294e48ac589166f31 /sysdeps/unix/make-syscalls.sh | |
| parent | abb280f799c47f76463b27d60f271208cbbf0c49 (diff) | |
| download | glibc-f7b425175c3fa2f063a6c5657d84b799929db459.tar.gz glibc-f7b425175c3fa2f063a6c5657d84b799929db459.tar.xz glibc-f7b425175c3fa2f063a6c5657d84b799929db459.zip | |
Support and use mixed compat/non-compat aliases in syscalls.list.
This patch enables syscalls.list entries to specify both compat and non-compat symbol versions for the same syscall definition, making use of this for setrlimit / chown / lchown where the inability to specify such aliases showed up in the course of work on bug 14138. The change to make-syscalls.sh is minimal: adding a SHARED conditional on the compat_symbol calls. It remains the case that if a compat symbol version is specified, the syscall is only built for the shared library at all if an explicit symbol version is given for a non-compat symbol (so it's necessary to specify "lchown@@GLIBC_2.0 chown@GLIBC_2.0" rather than just "lchown chown@GLIBC_2.0"). It also remains the case, as already commented in make-syscalls.sh, that no SHLIB_COMPAT conditionals are generated, so there would be problems if the same syscalls.list file, with compat symbols, were used for both configurations that should have those symbols and configurations for which they should be conditioned out with SHLIB_COMPAT. Tested for x86. * sysdeps/unix/make-syscalls.sh (emit_weak_aliases): Condition compat_symbol calls on [SHARED]. * sysdeps/unix/sysv/linux/powerpc/lchown.S: Remove file. * sysdeps/unix/sysv/linux/i386/syscalls.list (oldsetrlimit): Remove. (setrlimit): Add setrlimit@GLIBC_2.0 alias. * sysdeps/unix/sysv/linux/m68k/m680x0/syscalls.list (oldsetrlimit): Remove. (setrlimit): Add setrlimit@GLIBC_2.0 alias. * sysdeps/unix/sysv/linux/powerpc/powerpc32/syscalls.list (lchown): New syscall entry. (oldsetrlimit): Remove. (setrlimit): Add setrlimit@GLIBC_2.0 alias. * sysdeps/unix/sysv/linux/s390/s390-32/syscalls.list (oldsetrlimit): Remove. (setrlimit): Add setrlimit@GLIBC_2.0 alias.
Diffstat (limited to 'sysdeps/unix/make-syscalls.sh')
| -rw-r--r-- | sysdeps/unix/make-syscalls.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/unix/make-syscalls.sh b/sysdeps/unix/make-syscalls.sh index 6eba62c946..fd6ebb4dbc 100644 --- a/sysdeps/unix/make-syscalls.sh +++ b/sysdeps/unix/make-syscalls.sh @@ -113,7 +113,7 @@ emit_weak_aliases() *@*) base=`echo $name | sed 's/@.*//'` ver=`echo $name | sed 's/.*@//;s/\./_/g'` - echo " echo '#ifndef NOT_IN_libc'; \\" + echo " echo '#if defined SHARED && !defined NOT_IN_libc'; \\" if test -z "$vcount" ; then source=$strong vcount=1 |