| Message ID | 20190910105331.25628-1-aurelien@aurel32.net |
|---|---|
| State | New |
| Headers | show |
| Series | alpha: force old OSF1 syscalls for getegid, geteuid and getppid [BZ #24986] | expand |
* Aurelien Jarno: > Changelog: > [BZ #24986] > * sysdeps/unix/alpha/getegid.S: Move to ... > * sysdeps/unix/sysv/linux/alpha/getegid.S: ... here. > * sysdeps/unix/alpha/geteuid.S: Move to ... > * sysdeps/unix/sysv/linux/alpha/geteuid.S: ... here. > * sysdeps/unix/alpha/getppid.S: Move to ... > * sysdeps/unix/sysv/linux/alpha/getppid.S: ... here Looks reasonable to me. Thanks, Florian
On 2019-09-10 13:20, Florian Weimer wrote: > * Aurelien Jarno: > > > Changelog: > > [BZ #24986] > > * sysdeps/unix/alpha/getegid.S: Move to ... > > * sysdeps/unix/sysv/linux/alpha/getegid.S: ... here. > > * sysdeps/unix/alpha/geteuid.S: Move to ... > > * sysdeps/unix/sysv/linux/alpha/geteuid.S: ... here. > > * sysdeps/unix/alpha/getppid.S: Move to ... > > * sysdeps/unix/sysv/linux/alpha/getppid.S: ... here > > Looks reasonable to me. > The other alternative instead of moving the files is to add those files with a simple #include <sysdeps/unix/alpha/getXXXX.S>. It's the strategy chosen for pipe.S for example.
On Tue, Sep 10, 2019 at 10:58 AM Aurelien Jarno <aurelien@aurel32.net> wrote: > On 2019-09-10 13:20, Florian Weimer wrote: > > * Aurelien Jarno: > > > > > Changelog: > > > [BZ #24986] > > > * sysdeps/unix/alpha/getegid.S: Move to ... > > > * sysdeps/unix/sysv/linux/alpha/getegid.S: ... here. > > > * sysdeps/unix/alpha/geteuid.S: Move to ... > > > * sysdeps/unix/sysv/linux/alpha/geteuid.S: ... here. > > > * sysdeps/unix/alpha/getppid.S: Move to ... > > > * sysdeps/unix/sysv/linux/alpha/getppid.S: ... here > > > > Looks reasonable to me. > > The other alternative instead of moving the files is to add those files > with a simple #include <sysdeps/unix/alpha/getXXXX.S>. It's the strategy > chosen for pipe.S for example. What are the odds that a hypothetical future port to Alpha with a non-Linux kernel would want to use these files, though? If they're not likely to be wanted, moving the files is simpler. zw
On 2019-09-10 11:44, Zack Weinberg wrote: > On Tue, Sep 10, 2019 at 10:58 AM Aurelien Jarno <aurelien@aurel32.net> wrote: > > On 2019-09-10 13:20, Florian Weimer wrote: > > > * Aurelien Jarno: > > > > > > > Changelog: > > > > [BZ #24986] > > > > * sysdeps/unix/alpha/getegid.S: Move to ... > > > > * sysdeps/unix/sysv/linux/alpha/getegid.S: ... here. > > > > * sysdeps/unix/alpha/geteuid.S: Move to ... > > > > * sysdeps/unix/sysv/linux/alpha/geteuid.S: ... here. > > > > * sysdeps/unix/alpha/getppid.S: Move to ... > > > > * sysdeps/unix/sysv/linux/alpha/getppid.S: ... here > > > > > > Looks reasonable to me. > > > > The other alternative instead of moving the files is to add those files > > with a simple #include <sysdeps/unix/alpha/getXXXX.S>. It's the strategy > > chosen for pipe.S for example. > > What are the odds that a hypothetical future port to Alpha with a > non-Linux kernel would want to use these files, though? If they're > not likely to be wanted, moving the files is simpler. There is already little interest for the Linux kernel port, so I really doubt a non-Linux kernel port will happen. I have therefore committed the patch.
diff --git a/ChangeLog b/ChangeLog index 00658e68350..4950b4e2125 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2019-09-10 Aurelien Jarno <aurelien@aurel32.net> + + [BZ #24986] + * sysdeps/unix/alpha/getegid.S: Move to ... + * sysdeps/unix/sysv/linux/alpha/getegid.S: ... here. + * sysdeps/unix/alpha/geteuid.S: Move to ... + * sysdeps/unix/sysv/linux/alpha/geteuid.S: ... here. + * sysdeps/unix/alpha/getppid.S: Move to ... + * sysdeps/unix/sysv/linux/alpha/getppid.S: ... here + 2019-09-09 Paul Eggert <eggert@cs.ucla.edu> Fix http: URL in 'configure' diff --git a/sysdeps/unix/alpha/getegid.S b/sysdeps/unix/sysv/linux/alpha/getegid.S similarity index 100% rename from sysdeps/unix/alpha/getegid.S rename to sysdeps/unix/sysv/linux/alpha/getegid.S diff --git a/sysdeps/unix/alpha/geteuid.S b/sysdeps/unix/sysv/linux/alpha/geteuid.S similarity index 100% rename from sysdeps/unix/alpha/geteuid.S rename to sysdeps/unix/sysv/linux/alpha/geteuid.S diff --git a/sysdeps/unix/alpha/getppid.S b/sysdeps/unix/sysv/linux/alpha/getppid.S similarity index 100% rename from sysdeps/unix/alpha/getppid.S rename to sysdeps/unix/sysv/linux/alpha/getppid.S
On alpha, Linux kernel 5.1 added the standard getegid, geteuid and getppid syscalls (commit ecf7e0a4ad15287). Up to now alpha was using the corresponding OSF1 syscalls through: - sysdeps/unix/alpha/getegid.S - sysdeps/unix/alpha/geteuid.S - sysdeps/unix/alpha/getppid.S When building against kernel headers >= 5.1, the glibc now use the new syscalls through sysdeps/unix/sysv/linux/syscalls.list. When it is then used with an older kernel, the corresponding 3 functions fail. A quick fix is to move the OSF1 wrappers under the sysdeps/unix/sysv/linux/alpha directory so they override the standard linux ones. A better fix would be to try the new syscalls and fallback to the old OSF1 in case the new ones fail. This can be implemented in a later commit. Changelog: [BZ #24986] * sysdeps/unix/alpha/getegid.S: Move to ... * sysdeps/unix/sysv/linux/alpha/getegid.S: ... here. * sysdeps/unix/alpha/geteuid.S: Move to ... * sysdeps/unix/sysv/linux/alpha/geteuid.S: ... here. * sysdeps/unix/alpha/getppid.S: Move to ... * sysdeps/unix/sysv/linux/alpha/getppid.S: ... here --- ChangeLog | 10 ++++++++++ sysdeps/unix/{ => sysv/linux}/alpha/getegid.S | 0 sysdeps/unix/{ => sysv/linux}/alpha/geteuid.S | 0 sysdeps/unix/{ => sysv/linux}/alpha/getppid.S | 0 4 files changed, 10 insertions(+) rename sysdeps/unix/{ => sysv/linux}/alpha/getegid.S (100%) rename sysdeps/unix/{ => sysv/linux}/alpha/geteuid.S (100%) rename sysdeps/unix/{ => sysv/linux}/alpha/getppid.S (100%)