| Message ID | 1406290148-17601-4-git-send-email-vgupta@synopsys.com |
|---|---|
| State | Accepted |
| Headers | show |
On 25 July 2014 14:09, Vineet Gupta <Vineet.Gupta1@synopsys.com> wrote: > Signed-off-by: Vineet Gupta <vgupta@synopsys.com> > --- > .../nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c > index 346651826ece..967dad1b005e 100644 > --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c > +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c > @@ -4,4 +4,10 @@ > * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. > */ > > -#include <../../../../../../../libc/sysdeps/linux/arc/sigaction.c> > +/* > + * ARC syscall ABI only has __NR_rt_sigaction, thus vanilla sigaction does > + * some SA_RESTORER tricks before calling __syscall_rt_sigaction. > + * However including that file here causes a redefinition of __libc_sigaction > + * in static links involving pthreads > + */ > +//#include <../../../../../../../libc/sysdeps/linux/arc/sigaction.c> Is this related to https://patchwork.ozlabs.org/patch/286084/ From a quick glance I do not really see how that 286084 patch is needed but your patch above is in the same area.. TIA,
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c index 346651826ece..967dad1b005e 100644 --- a/libpthread/nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c +++ b/libpthread/nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c @@ -4,4 +4,10 @@ * Licensed under the LGPL v2.1 or later, see the file COPYING.LIB in this tarball. */ -#include <../../../../../../../libc/sysdeps/linux/arc/sigaction.c> +/* + * ARC syscall ABI only has __NR_rt_sigaction, thus vanilla sigaction does + * some SA_RESTORER tricks before calling __syscall_rt_sigaction. + * However including that file here causes a redefinition of __libc_sigaction + * in static links involving pthreads + */ +//#include <../../../../../../../libc/sysdeps/linux/arc/sigaction.c>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com> --- .../nptl/sysdeps/unix/sysv/linux/arc/pt-__syscall_rt_sigaction.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)