diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | sysdeps/alpha/dl-machine.h | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/clone.S | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/rt_sigaction.S | 75 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/sys/ucontext.h | 41 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/alpha/syscalls.list | 1 |
6 files changed, 134 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index b616e3e592..d4c94003eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +1998-01-26 Richard Henderson <rth@cygnus.com> + + * sysdeps/alpha/dl-machine.h (TRAMPOLINE_TEMPLATE): Move declaration + of the trampoline function into the macro. + * sysdeps/unix/sysv/linux/alpha/clone.S: Fix ldgp for PROF. + * sysdeps/unix/sysv/linux/alpha/syscalls.list: Revert last change; + kernel 2.1.82 has this fixed. + + * sysdeps/unix/sysv/linux/alpha/rt_sigaction.S: New file. + * sysdeps/unix/sysv/linux/alpha/sys/ucontext.h: New file. + 1998-01-26 Ulrich Drepper <drepper@cygnus.com> * sysdeps/unix/sysv/linux/alpha/syscalls.list: Add change to diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h index e42ed3db68..455fd7b695 100644 --- a/sysdeps/alpha/dl-machine.h +++ b/sysdeps/alpha/dl-machine.h @@ -123,7 +123,9 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) /* This code is used in dl-runtime.c to call the `fixup' function and then redirect to the address it returns. */ -#define TRAMPOLINE_TEMPLATE(tramp_name, fixup_name, IMB) asm ( "\ +#define TRAMPOLINE_TEMPLATE(tramp_name, fixup_name, IMB) \ + extern void tramp_name (void); \ + asm ( "\ .globl " #tramp_name " .ent " #tramp_name " " #tramp_name ": @@ -205,8 +207,6 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile) #else #define ELF_MACHINE_RUNTIME_TRAMPOLINE \ TRAMPOLINE_TEMPLATE (_dl_runtime_resolve, fixup, imb); \ - extern void _dl_runtime_resolve (void); \ - extern void _dl_runtime_profile (void); \ strong_alias (_dl_runtime_resolve, _dl_runtime_profile); #endif diff --git a/sysdeps/unix/sysv/linux/alpha/clone.S b/sysdeps/unix/sysv/linux/alpha/clone.S index 3f097fe068..930e379296 100644 --- a/sysdeps/unix/sysv/linux/alpha/clone.S +++ b/sysdeps/unix/sysv/linux/alpha/clone.S @@ -28,14 +28,16 @@ .text ENTRY(__clone) - .frame sp,0,ra,0 #ifdef PROF + ldgp gp,0(pv) .set noat lda AT, _mcount jsr AT, (AT), _mcount .set at -#endif .prologue 1 +#else + .prologue 0 +#endif /* Sanity check arguments. */ ldiq v0,EINVAL diff --git a/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S b/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S new file mode 100644 index 0000000000..bcb2be0e28 --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/rt_sigaction.S @@ -0,0 +1,75 @@ +/* Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Richard Henderson <rth@cygnus.com>, 1998 + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <sysdep.h> + +/* 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 +ENTRY(__syscall_rt_sigaction) + .frame sp,0,ra,0 +#ifdef PROF + ldgp gp,0(pv) + .set noat + lda AT, _mcount + jsr AT, (AT), _mcount + .set at +#endif + .prologue 1 + + beq a1, 0f + ldl t0, 8(a1) + lda a4, sigreturn-__syscall_rt_sigaction(pv) + lda t1, rt_sigreturn-__syscall_rt_sigaction(pv) + and t0, 0x00000040, t0 # SA_SIGINFO + cmovne t0, t1, a4 +0: ldi v0,__NR_sigaction + callsys + bne a3,1f + ret + +1: br gp,2f +2: ldgp gp,0(gp) + jmp __syscall_error + +END(__syscall_rt_sigaction) + + .align 5 + .ent sigreturn +sigreturn: + .prologue 0 + mov sp,a0 + ldi v0,__NR_sigreturn + callsys + .end sigreturn + + .align 4 + .ent rt_sigreturn +rt_sigreturn: + .prologue 0 + mov sp,a0 + ldi v0,__NR_rt_sigreturn + callsys + .end rt_sigreturn diff --git a/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h b/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h new file mode 100644 index 0000000000..349dd1e2a2 --- /dev/null +++ b/sysdeps/unix/sysv/linux/alpha/sys/ucontext.h @@ -0,0 +1,41 @@ +/* Copyright (C) 1998 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#ifndef _SYS_UCONTEXT_H +#define _SYS_UCONTEXT_H 1 + +#include <features.h> +#include <signal.h> + +#include <bits/sigcontext.h> + +/* A machine context is exactly a sigcontext. */ +typedef struct sigcontext mcontext_t; + +/* Userlevel context. */ +typedef struct ucontext + { + unsigned long int uc_flags; + struct ucontext *uc_links; + unsigned long __uc_osf_sigmask; + stack_t uc_stack; + mcontext_t uc_mcontext; + __sigset_t uc_sigmask; + } ucontext_t; + +#endif /* sys/ucontext.h */ diff --git a/sysdeps/unix/sysv/linux/alpha/syscalls.list b/sysdeps/unix/sysv/linux/alpha/syscalls.list index 9b676185e2..17c55f0991 100644 --- a/sysdeps/unix/sysv/linux/alpha/syscalls.list +++ b/sysdeps/unix/sysv/linux/alpha/syscalls.list @@ -16,7 +16,6 @@ semget - semget 3 __semget semget semctl - semctl 4 __semctl semctl osf_sigprocmask - osf_sigprocmask 2 __osf_sigprocmask -s_sigaction sigaction osf_sigaction 3 __syscall_sigaction getpeername - getpeername 3 __getpeername getpeername getpriority - getpriority 2 __getpriority getpriority |