From 918f187fcf2a559a0fc284b085560442e16f6c75 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 20 Jul 2004 16:39:51 +0000 Subject: UPdate. * sysdeps/unix/sysv/linux/mips/Makefile ($(objpfx)syscall-%.h): Sort by syscalls. Make sure we get headers such as sgidefs.h from the build tree before just-installed ones. * sysdeps/mips/atomicity.h, sysdeps/mips/dl-machine.h, sysdeps/mips/machine-gmon.h, sysdeps/mips/bits/setjmp.h, sysdeps/mips/fpu/bits/mathdef.h, sysdeps/mips/mips64/__longjmp.c, sysdeps/mips/mips64/setjmp_aux.c, sysdeps/unix/sysv/linux/mips/kernel_stat.h, sysdeps/unix/sysv/linux/mips/pread.c, sysdeps/unix/sysv/linux/mips/pread64.c, sysdeps/unix/sysv/linux/mips/ptrace.c, sysdeps/unix/sysv/linux/mips/pwrite.c, sysdeps/unix/sysv/linux/mips/pwrite64.c, sysdeps/unix/sysv/linux/mips/sigaction.c, sysdeps/unix/sysv/linux/mips/sigcontextinfo.h, sysdeps/unix/sysv/linux/mips/bits/fcntl.h, sysdeps/unix/sysv/linux/mips/bits/sigcontext.h, sysdeps/unix/sysv/linux/mips/bits/stat.h, sysdeps/unix/sysv/linux/mips/sys/procfs.h, sysdeps/unix/sysv/linux/mips/sys/ptrace.h, sysdeps/unix/sysv/linux/mips/sys/tas.h, sysdeps/unix/sysv/linux/mips/sys/ucontext.h, sysdeps/unix/sysv/linux/mips/sys/user.h: Use standard names for ABI macros, include sgidefs.h where appropriate. sysdeps/unix/sysv/linux/mips/Makefile ($(objpfx)syscall-%.h): Likewise. sysdeps/unix/sysv/linux/mips/configure.in (asm-unistd.h): Likewise. sysdeps/unix/sysv/linux/mips/configure: Rebuilt. --- linuxthreads/sysdeps/mips/pspinlock.c | 4 +++- linuxthreads/sysdeps/mips/pt-machine.h | 8 +++++--- 2 files changed, 8 insertions(+), 4 deletions(-) (limited to 'linuxthreads/sysdeps/mips') diff --git a/linuxthreads/sysdeps/mips/pspinlock.c b/linuxthreads/sysdeps/mips/pspinlock.c index a9fb19f674..b04b9ffea9 100644 --- a/linuxthreads/sysdeps/mips/pspinlock.c +++ b/linuxthreads/sysdeps/mips/pspinlock.c @@ -1,5 +1,5 @@ /* POSIX spinlock implementation. MIPS version. - Copyright (C) 2000, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2000, 2002, 2003, 2004 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 @@ -22,6 +22,8 @@ #include #include "internals.h" +#include + /* This implementation is similar to the one used in the Linux kernel. */ int __pthread_spin_lock (pthread_spinlock_t *lock) diff --git a/linuxthreads/sysdeps/mips/pt-machine.h b/linuxthreads/sysdeps/mips/pt-machine.h index f9028d2640..c2f448e4be 100644 --- a/linuxthreads/sysdeps/mips/pt-machine.h +++ b/linuxthreads/sysdeps/mips/pt-machine.h @@ -1,6 +1,6 @@ /* Machine-dependent pthreads configuration and inline functions. - Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003 + Copyright (C) 1996, 1997, 1998, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ralf Baechle . @@ -26,6 +26,8 @@ #include +#include + #ifndef PT_EI # define PT_EI extern inline __attribute__ ((always_inline)) #endif @@ -64,7 +66,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval) #if _MIPS_SIM == _MIPS_SIM_ABI32 ".set mips2\n\t" #endif -#if defined _ABI64 && _MIPS_SIM == _ABI64 +#if _MIPS_SIM == _MIPS_SIM_ABI64 "lld %1,%5\n\t" #else "ll %1,%5\n\t" @@ -72,7 +74,7 @@ __compare_and_swap (long int *p, long int oldval, long int newval) "move %0,$0\n\t" "bne %1,%3,2f\n\t" "move %0,%4\n\t" -#if defined _ABI64 && _MIPS_SIM == _ABI64 +#if _MIPS_SIM == _MIPS_SIM_ABI64 "scd %0,%2\n\t" #else "sc %0,%2\n\t" -- cgit v1.2.3