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:
@@ -1,4 +1,4 @@
|
||||
/* Copyright (C) 1997, 1998, 2002, 2003 Free Software Foundation, Inc.
|
||||
/* Copyright (C) 1997, 1998, 2002, 2003, 2004 Free Software Foundation, Inc.
|
||||
This file is part of the GNU C Library.
|
||||
Contributed by Ralf Baechle <ralf@gnu.org>.
|
||||
|
||||
@@ -37,11 +37,11 @@
|
||||
* 64 bit address space isn't used yet, so we may use the R3000 32 bit
|
||||
* defines for now.
|
||||
*/
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI32) || (_MIPS_SIM == _MIPS_SIM_NABI32)
|
||||
#if _MIPS_SIM == _ABIO32 || _MIPS_SIM == _ABIN32
|
||||
# define PTR .word
|
||||
# define PTRSIZE 4
|
||||
# define PTRLOG 2
|
||||
#elif (_MIPS_SIM == _MIPS_SIM_ABI64)
|
||||
#elif _MIPS_SIM == _ABI64
|
||||
# define PTR .dword
|
||||
# define PTRSIZE 8
|
||||
# define PTRLOG 3
|
||||
@@ -50,7 +50,7 @@
|
||||
/*
|
||||
* PIC specific declarations
|
||||
*/
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI32)
|
||||
#if _MIPS_SIM == _ABIO32
|
||||
# ifdef __PIC__
|
||||
# define CPRESTORE(register) \
|
||||
.cprestore register
|
||||
@@ -97,7 +97,7 @@ l: \
|
||||
# define SETUP_GPX64_L(cp_reg, ra_save, l)
|
||||
# define RESTORE_GP64
|
||||
# define USE_ALT_CP(a)
|
||||
#else /* (_MIPS_SIM == _MIPS_SIM_ABI64) || (_MIPS_SIM == _MIPS_SIM_NABI32) */
|
||||
#else /* _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32 */
|
||||
/*
|
||||
* For callee-saved gp calling convention:
|
||||
*/
|
||||
@@ -131,15 +131,15 @@ l: \
|
||||
/* Use alternate register for context pointer. */
|
||||
# define USE_ALT_CP(reg) \
|
||||
.cplocal reg
|
||||
#endif /* _MIPS_SIM != _MIPS_SIM_ABI32 */
|
||||
#endif /* _MIPS_SIM != _ABIO32 */
|
||||
|
||||
/*
|
||||
* Stack Frame Definitions
|
||||
*/
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI32)
|
||||
#if _MIPS_SIM == _ABIO32
|
||||
# define NARGSAVE 4 /* Space for 4 argument registers must be allocated. */
|
||||
#endif
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32)
|
||||
#if _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32
|
||||
# define NARGSAVE 0 /* No caller responsibilities. */
|
||||
#endif
|
||||
|
||||
@@ -287,7 +287,7 @@ symbol = value
|
||||
/*
|
||||
* Stack alignment
|
||||
*/
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI64) || (_MIPS_SIM == _MIPS_SIM_NABI32)
|
||||
#if _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32
|
||||
# define ALSZ 15
|
||||
# define ALMASK ~15
|
||||
#else
|
||||
@@ -298,7 +298,7 @@ symbol = value
|
||||
/*
|
||||
* Size of a register
|
||||
*/
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI64) || (_MIPS_SIM == _MIPS_SIM_NABI32)
|
||||
#if _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32
|
||||
# define SZREG 8
|
||||
#else
|
||||
# define SZREG 4
|
||||
@@ -389,7 +389,7 @@ symbol = value
|
||||
/*
|
||||
* How to add/sub/load/store/shift pointers.
|
||||
*/
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI32 && _MIPS_SZPTR == 32)
|
||||
#if (_MIPS_SIM == _ABIO32 && _MIPS_SZPTR == 32)
|
||||
# define PTR_ADD add
|
||||
# define PTR_ADDI addi
|
||||
# define PTR_ADDU addu
|
||||
@@ -411,7 +411,7 @@ symbol = value
|
||||
# define PTR_SCALESHIFT 2
|
||||
#endif
|
||||
|
||||
#if _MIPS_SIM == _MIPS_SIM_NABI32
|
||||
#if _MIPS_SIM == _ABIN32
|
||||
# define PTR_ADD add
|
||||
# define PTR_ADDI addi
|
||||
# define PTR_ADDU add /* no u */
|
||||
@@ -433,8 +433,8 @@ symbol = value
|
||||
# define PTR_SCALESHIFT 2
|
||||
#endif
|
||||
|
||||
#if (_MIPS_SIM == _MIPS_SIM_ABI32 && _MIPS_SZPTR == 64 /* o64??? */) \
|
||||
|| _MIPS_SIM == _MIPS_SIM_ABI64
|
||||
#if (_MIPS_SIM == _ABIO32 && _MIPS_SZPTR == 64 /* o64??? */) \
|
||||
|| _MIPS_SIM == _ABI64
|
||||
# define PTR_ADD dadd
|
||||
# define PTR_ADDI daddi
|
||||
# define PTR_ADDU daddu
|
||||
|
||||
Reference in New Issue
Block a user