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. --- sysdeps/mips/atomicity.h | 7 ++++--- sysdeps/mips/bits/setjmp.h | 6 ++++-- sysdeps/mips/dl-machine.h | 2 +- sysdeps/mips/fpu/bits/mathdef.h | 2 ++ sysdeps/mips/machine-gmon.h | 8 +++++--- sysdeps/mips/mips64/__longjmp.c | 5 +++-- sysdeps/mips/mips64/setjmp_aux.c | 4 ++-- 7 files changed, 21 insertions(+), 13 deletions(-) (limited to 'sysdeps/mips') diff --git a/sysdeps/mips/atomicity.h b/sysdeps/mips/atomicity.h index 5148121091..f3d05bd50e 100644 --- a/sysdeps/mips/atomicity.h +++ b/sysdeps/mips/atomicity.h @@ -1,5 +1,5 @@ /* Low-level functions for atomic operations. Mips version. - Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. + Copyright (C) 2001, 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 @@ -21,6 +21,7 @@ #define _MIPS_ATOMICITY_H 1 #include +#include static inline int __attribute__ ((unused)) @@ -85,7 +86,7 @@ compare_and_swap (volatile 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" @@ -93,7 +94,7 @@ compare_and_swap (volatile 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" diff --git a/sysdeps/mips/bits/setjmp.h b/sysdeps/mips/bits/setjmp.h index b2ee3749dd..4ca199d7b6 100644 --- a/sysdeps/mips/bits/setjmp.h +++ b/sysdeps/mips/bits/setjmp.h @@ -1,5 +1,5 @@ /* Define the machine-dependent type `jmp_buf'. MIPS version. - Copyright (C) 1992, 1993, 1995, 1997, 2000, 2002, 2003 + Copyright (C) 1992, 1993, 1995, 1997, 2000, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -22,6 +22,8 @@ # error "Never include directly; use instead." #endif +#include + typedef struct { #if _MIPS_SIM == _MIPS_SIM_ABI32 @@ -60,7 +62,7 @@ typedef struct int __fpc_csr; /* Callee-saved floating point registers. */ -#if defined _ABI64 && _MIPS_SIM == _ABI64 +#if _MIPS_SIM == _MIPS_SIM_ABI64 double __fpregs[8]; #else double __fpregs[6]; diff --git a/sysdeps/mips/dl-machine.h b/sysdeps/mips/dl-machine.h index 570ac5b13d..bfd3a6250e 100644 --- a/sysdeps/mips/dl-machine.h +++ b/sysdeps/mips/dl-machine.h @@ -130,7 +130,7 @@ elf_machine_load_address (void) } /* The MSB of got[1] of a gnu object is set to identify gnu objects. */ -#if defined _ABI64 && _MIPS_SIM == _ABI64 +#if _MIPS_SIM == _MIPS_SIM_ABI64 # define ELF_MIPS_GNU_GOT1_MASK 0x8000000000000000L #else # define ELF_MIPS_GNU_GOT1_MASK 0x80000000L diff --git a/sysdeps/mips/fpu/bits/mathdef.h b/sysdeps/mips/fpu/bits/mathdef.h index 4a51768244..c1ce876bf7 100644 --- a/sysdeps/mips/fpu/bits/mathdef.h +++ b/sysdeps/mips/fpu/bits/mathdef.h @@ -21,6 +21,8 @@ # error "Never use directly; include instead" #endif +#include + #if defined __USE_ISOC99 && defined _MATH_H && !defined _MATH_H_MATHDEF # define _MATH_H_MATHDEF 1 diff --git a/sysdeps/mips/machine-gmon.h b/sysdeps/mips/machine-gmon.h index 5a87c85bf0..f23a4c3008 100644 --- a/sysdeps/mips/machine-gmon.h +++ b/sysdeps/mips/machine-gmon.h @@ -1,5 +1,5 @@ /* Machine-specific calling sequence for `mcount' profiling function. MIPS - Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003 + Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. @@ -18,6 +18,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#include + #define _MCOUNT_DECL(frompc,selfpc) \ static void __attribute_used__ __mcount (u_long frompc, u_long selfpc) @@ -81,10 +83,10 @@ static void __attribute_used__ __mcount (u_long frompc, u_long selfpc) # define CPRETURN #endif -#if defined _ABIN32 && _MIPS_SIM == _ABIN32 +#if _MIPS_SIM == _MIPS_SIM_NABI32 # define PTR_ADDU_STRING "add" /* no u */ # define PTR_SUBU_STRING "sub" /* no u */ -#elif defined _ABI64 && _MIPS_SIM == _ABI64 +#elif _MIPS_SIM == _MIPS_SIM_ABI64 # define PTR_ADDU_STRING "daddu" # define PTR_SUBU_STRING "dsubu" #else diff --git a/sysdeps/mips/mips64/__longjmp.c b/sysdeps/mips/mips64/__longjmp.c index 32587d1c87..b2705793b2 100644 --- a/sysdeps/mips/mips64/__longjmp.c +++ b/sysdeps/mips/mips64/__longjmp.c @@ -1,4 +1,5 @@ -/* Copyright (C) 1992, 1995, 1997, 2000, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1992, 1995, 1997, 2000, 2003, 2004 + Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Brendan Kehoe (brendan@zen.org). @@ -38,7 +39,7 @@ __longjmp (env, val_arg) register int val asm ("a1"); /* Pull back the floating point callee-saved registers. */ -#if defined _ABI64 && _MIPS_SIM == _ABI64 +#if _MIPS_SIM == _MIPS_SIM_ABI64 asm volatile ("l.d $f24, %0" : : "m" (env[0].__fpregs[0])); asm volatile ("l.d $f25, %0" : : "m" (env[0].__fpregs[1])); asm volatile ("l.d $f26, %0" : : "m" (env[0].__fpregs[2])); diff --git a/sysdeps/mips/mips64/setjmp_aux.c b/sysdeps/mips/mips64/setjmp_aux.c index b55a3c6c11..b5afd14cbf 100644 --- a/sysdeps/mips/mips64/setjmp_aux.c +++ b/sysdeps/mips/mips64/setjmp_aux.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997, 2003 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2003, 2004 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Brendan Kehoe (brendan@zen.org). @@ -29,7 +29,7 @@ __sigsetjmp_aux (jmp_buf env, int savemask, long long sp, long long fp, long long gp) { /* Store the floating point callee-saved registers... */ -#if defined _ABI64 && _MIPS_SIM == _ABI64 +#if _MIPS_SIM == _MIPS_SIM_ABI64 asm volatile ("s.d $f24, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[0])); asm volatile ("s.d $f25, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[1])); asm volatile ("s.d $f26, %0" : : "m" (env[0].__jmpbuf[0].__fpregs[2])); -- cgit 1.4.1