From 710a43449926e29c1a48954d1ab7fdcf59b8c6fd Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 2 Mar 2006 03:32:37 +0000 Subject: rename file so we block the common version from being built --- libc/sysdeps/linux/alpha/Makefile.arch | 2 +- libc/sysdeps/linux/alpha/__syscall_rt_sigaction.S | 81 +++++++++++++++++++++++ libc/sysdeps/linux/alpha/rt_sigaction.S | 81 ----------------------- 3 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 libc/sysdeps/linux/alpha/__syscall_rt_sigaction.S delete mode 100644 libc/sysdeps/linux/alpha/rt_sigaction.S (limited to 'libc/sysdeps') diff --git a/libc/sysdeps/linux/alpha/Makefile.arch b/libc/sysdeps/linux/alpha/Makefile.arch index 0a0fbdba4..5097008ab 100644 --- a/libc/sysdeps/linux/alpha/Makefile.arch +++ b/libc/sysdeps/linux/alpha/Makefile.arch @@ -9,7 +9,7 @@ CSRC := __syscall_error.c sigprocmask.c SSRC := \ __longjmp.S brk.S bsd-_setjmp.S bsd-setjmp.S clone.S \ - divl.S divq.S pipe.S reml.S remq.S rt_sigaction.S setjmp.S \ + divl.S divq.S pipe.S reml.S remq.S __syscall_rt_sigaction.S setjmp.S \ syscall.S include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch diff --git a/libc/sysdeps/linux/alpha/__syscall_rt_sigaction.S b/libc/sysdeps/linux/alpha/__syscall_rt_sigaction.S new file mode 100644 index 000000000..f7e9e44a6 --- /dev/null +++ b/libc/sysdeps/linux/alpha/__syscall_rt_sigaction.S @@ -0,0 +1,81 @@ +/* Copyright (C) 1998, 2003, 2004 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Richard Henderson , 1998 + + 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, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include +#include + +/* On Alpha we desparately want to avoid having to issue an imb. Ordinarily + the kernel would have to issue one after setting up the signal return + stack, but the Linux rt_sigaction syscall is prepared to accept a pointer + to the sigreturn syscall, instead of inlining it on the stack. + + This just about halves signal delivery time. */ + + .text + +.globl __syscall_rt_sigaction +.align 4 +.ent __syscall_rt_sigaction, 0 +__syscall_rt_sigaction: + .frame sp,0,ra,0 + ldgp gp,0(pv) + .prologue 1 + + beq a1, 0f + ldl t0, 8(a1) # sa_flags + + /* The unwinder will subtract one from the return address when + attempting to find the call instruction that led us here. + Since we didn't get here via a normal call, if we do nothing + we would pick up the wrong symbol and the wrong FDE. Account + for this by adding a nop to the start of the function and + then skipping it here by adding 4. */ + ldah a4, __syscall_sigreturn+4(gp) !gprelhigh + ldah t1, __syscall_rt_sigreturn+4(gp) !gprelhigh + lda a4, __syscall_sigreturn+4(a4) !gprellow + lda t1, __syscall_rt_sigreturn+4(t1) !gprellow + and t0, 0x40, t0 # SA_SIGINFO + cmovne t0, t1, a4 + +0: ldi v0, __NR_rt_sigaction + callsys + bne a3, $error + ret + +$error: + jmp zero,__syscall_error + +.end __syscall_rt_sigaction + +__syscall_sigreturn: + nop + mov sp, a0 + ldi v0, __NR_sigreturn + callsys + .size __syscall_sigreturn, .-__syscall_sigreturn + .type __syscall_sigreturn, @function + +__syscall_rt_sigreturn: + nop + mov sp,a0 + ldi v0,__NR_rt_sigreturn + callsys + .size __syscall_rt_sigreturn, .-__syscall_rt_sigreturn + .type __syscall_rt_sigreturn, @function diff --git a/libc/sysdeps/linux/alpha/rt_sigaction.S b/libc/sysdeps/linux/alpha/rt_sigaction.S deleted file mode 100644 index f7e9e44a6..000000000 --- a/libc/sysdeps/linux/alpha/rt_sigaction.S +++ /dev/null @@ -1,81 +0,0 @@ -/* Copyright (C) 1998, 2003, 2004 Free Software Foundation, Inc. - This file is part of the GNU C Library. - Contributed by Richard Henderson , 1998 - - 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, write to the Free - Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA - 02111-1307 USA. */ - -#include -#include -#include - -/* On Alpha we desparately want to avoid having to issue an imb. Ordinarily - the kernel would have to issue one after setting up the signal return - stack, but the Linux rt_sigaction syscall is prepared to accept a pointer - to the sigreturn syscall, instead of inlining it on the stack. - - This just about halves signal delivery time. */ - - .text - -.globl __syscall_rt_sigaction -.align 4 -.ent __syscall_rt_sigaction, 0 -__syscall_rt_sigaction: - .frame sp,0,ra,0 - ldgp gp,0(pv) - .prologue 1 - - beq a1, 0f - ldl t0, 8(a1) # sa_flags - - /* The unwinder will subtract one from the return address when - attempting to find the call instruction that led us here. - Since we didn't get here via a normal call, if we do nothing - we would pick up the wrong symbol and the wrong FDE. Account - for this by adding a nop to the start of the function and - then skipping it here by adding 4. */ - ldah a4, __syscall_sigreturn+4(gp) !gprelhigh - ldah t1, __syscall_rt_sigreturn+4(gp) !gprelhigh - lda a4, __syscall_sigreturn+4(a4) !gprellow - lda t1, __syscall_rt_sigreturn+4(t1) !gprellow - and t0, 0x40, t0 # SA_SIGINFO - cmovne t0, t1, a4 - -0: ldi v0, __NR_rt_sigaction - callsys - bne a3, $error - ret - -$error: - jmp zero,__syscall_error - -.end __syscall_rt_sigaction - -__syscall_sigreturn: - nop - mov sp, a0 - ldi v0, __NR_sigreturn - callsys - .size __syscall_sigreturn, .-__syscall_sigreturn - .type __syscall_sigreturn, @function - -__syscall_rt_sigreturn: - nop - mov sp,a0 - ldi v0,__NR_rt_sigreturn - callsys - .size __syscall_rt_sigreturn, .-__syscall_rt_sigreturn - .type __syscall_rt_sigreturn, @function -- cgit v1.2.3