mirror of
https://sourceware.org/git/glibc.git
synced 2025-12-24 17:51:17 +03:00
Update.
2004-11-05 Maciej W. Rozycki <macro@mips.com> * sysdeps/mips/dl-machine.h: Include <sgidefs.h>. Use _ABIO32, _ABIN32 and _ABI64 for ABI selection throughout. * sysdeps/mips/elf/start.S: Likewise. * sysdeps/mips/mips64/__longjmp.c: Likewise. * sysdeps/mips/mips64/bsd-_setjmp.S: Likewise. * sysdeps/mips/mips64/bsd-setjmp.S: Likewise. * sysdeps/mips/mips64/setjmp.S: Likewise. * sysdeps/mips/mips64/setjmp_aux.c: Likewise. * sysdeps/mips/sys/regdef.h: Likewise. * sysdeps/mips/sys/ucontext.h: Likewise. * sysdeps/unix/mips/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/kernel-features.h: Likewise. * sysdeps/unix/sysv/linux/mips/pread.c: Likewise. * sysdeps/unix/sysv/linux/mips/pread64.c: Likewise. * sysdeps/unix/sysv/linux/mips/ptrace.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite.c: Likewise. * sysdeps/unix/sysv/linux/mips/pwrite64.c: Likewise. * sysdeps/unix/sysv/linux/mips/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/mips/sys/procfs.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/ucontext.h: Likewise. * sysdeps/mips/atomicity.h: Use _ABIO32, _ABIN32 and _ABI64 for ABI selection throughout. * sysdeps/mips/bits/setjmp.h: Likewise. * sysdeps/mips/fpu/bits/mathdef.h: Likewise. * sysdeps/mips/machine-gmon.h: Likewise. * sysdeps/mips/sys/asm.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/fcntl.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/sigcontext.h: Likewise. * sysdeps/unix/sysv/linux/mips/bits/stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/kernel_stat.h: Likewise. * sysdeps/unix/sysv/linux/mips/sigcontextinfo.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/ptrace.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/tas.h: Likewise. * sysdeps/unix/sysv/linux/mips/sys/user.h: Likewise. * sysdeps/mips/sgidefs.h: Prevent <asm/sgidefs.h> from being included by kernel headers and undo its settings if already included. Define _ABIO32, _ABIN32 and _ABI64 if missing and use them to define _MIPS_SIM_ABI32, _MIPS_SIM_NABI32 and _MIPS_SIM_ABI64 for compatibility. * sysdeps/unix/sysv/linux/mips/Makefile: Use _ABIO32, _ABIN32 and _ABI64 for ABI selection in generated syscall-list.h * sysdeps/unix/sysv/linux/mips/configure.in: Use _ABIO32, _ABIN32 and _ABI64 for ABI selection in generated asm-unistd.h. * sysdeps/unix/sysv/linux/mips/configure: Regenerate. * sysdeps/unix/sysv/linux/mips/pwrite.c (__libc_pwrite): Correct an inverted _MIPS_SIM conditional.
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
02111-1307 USA. */
|
||||
|
||||
#include <errno.h>
|
||||
#include <sgidefs.h>
|
||||
#include <signal.h>
|
||||
#include <string.h>
|
||||
|
||||
@@ -40,7 +41,7 @@ int __libc_missing_rt_sigs;
|
||||
|
||||
#endif
|
||||
|
||||
#if _MIPS_SIM != _MIPS_SIM_ABI32
|
||||
#if _MIPS_SIM != _ABIO32
|
||||
|
||||
# ifdef __NR_rt_sigreturn
|
||||
static void restore_rt (void) asm ("__restore_rt");
|
||||
@@ -82,7 +83,7 @@ __libc_sigaction (sig, act, oact)
|
||||
memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kernel_sigset_t));
|
||||
kact.sa_flags = act->sa_flags;
|
||||
# ifdef HAVE_SA_RESTORER
|
||||
# if _MIPS_SIM == _MIPS_SIM_ABI32
|
||||
# if _MIPS_SIM == _ABIO32
|
||||
kact.sa_restorer = act->sa_restorer;
|
||||
# else
|
||||
kact.sa_restorer = &restore_rt;
|
||||
@@ -140,7 +141,7 @@ __libc_sigaction (sig, act, oact)
|
||||
oact->sa_mask.__val[0] = k_osigact.sa_mask;
|
||||
oact->sa_flags = k_osigact.sa_flags;
|
||||
# ifdef HAVE_SA_RESTORER
|
||||
# if _MIPS_SIM == _MIPS_SIM_ABI32
|
||||
# if _MIPS_SIM == _ABIO32
|
||||
oact->sa_restorer = k_osigact.sa_restorer;
|
||||
# else
|
||||
oact->sa_restorer = &restore;
|
||||
@@ -177,7 +178,7 @@ asm \
|
||||
);
|
||||
|
||||
/* The return code for realtime-signals. */
|
||||
#if _MIPS_SIM != _MIPS_SIM_ABI32
|
||||
#if _MIPS_SIM != _ABIO32
|
||||
# ifdef __NR_rt_sigreturn
|
||||
RESTORE (restore_rt, __NR_rt_sigreturn)
|
||||
# endif
|
||||
|
||||
Reference in New Issue
Block a user