diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-07-30 02:56:45 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-07-30 02:56:45 +0000 |
| commit | ceec7a232c0719f1e36e60e8f2f7edb2af9d79c9 (patch) | |
| tree | 074610a301f84733094d33cddca78eb23e8c1306 /libc/sysdeps/linux/mips/sys/asm.h | |
| parent | 92ac94812b84cef7d9bddfffd0446721a7a6ee06 (diff) | |
| download | uClibc-alpine-ceec7a232c0719f1e36e60e8f2f7edb2af9d79c9.tar.bz2 uClibc-alpine-ceec7a232c0719f1e36e60e8f2f7edb2af9d79c9.tar.xz | |
Last of the merges along with latest changes for NPTL. Nothing much
new on the NPTL stuff other than cleaning a few things up.
Diffstat (limited to 'libc/sysdeps/linux/mips/sys/asm.h')
| -rw-r--r-- | libc/sysdeps/linux/mips/sys/asm.h | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/libc/sysdeps/linux/mips/sys/asm.h b/libc/sysdeps/linux/mips/sys/asm.h index b590802fd..e961f3694 100644 --- a/libc/sysdeps/linux/mips/sys/asm.h +++ b/libc/sysdeps/linux/mips/sys/asm.h @@ -1,5 +1,4 @@ -/* Copyright (C) 1997, 1998, 2002, 2003, 2004, 2005 - Free Software Foundation, Inc. +/* Copyright (C) 1997, 1998, 2002, 2003 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ralf Baechle <ralf@gnu.org>. @@ -38,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 == _ABIO32 || _MIPS_SIM == _ABIN32 +#if (_MIPS_SIM == _MIPS_SIM_ABI32) || (_MIPS_SIM == _MIPS_SIM_NABI32) # define PTR .word # define PTRSIZE 4 # define PTRLOG 2 -#elif _MIPS_SIM == _ABI64 +#elif (_MIPS_SIM == _MIPS_SIM_ABI64) # define PTR .dword # define PTRSIZE 8 # define PTRLOG 3 @@ -51,7 +50,7 @@ /* * PIC specific declarations */ -#if _MIPS_SIM == _ABIO32 +#if (_MIPS_SIM == _MIPS_SIM_ABI32) # ifdef __PIC__ # define CPRESTORE(register) \ .cprestore register @@ -98,7 +97,7 @@ l: \ # define SETUP_GPX64_L(cp_reg, ra_save, l) # define RESTORE_GP64 # define USE_ALT_CP(a) -#else /* _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32 */ +#else /* (_MIPS_SIM == _MIPS_SIM_ABI64) || (_MIPS_SIM == _MIPS_SIM_NABI32) */ /* * For callee-saved gp calling convention: */ @@ -132,15 +131,15 @@ l: \ /* Use alternate register for context pointer. */ # define USE_ALT_CP(reg) \ .cplocal reg -#endif /* _MIPS_SIM != _ABIO32 */ +#endif /* _MIPS_SIM != _MIPS_SIM_ABI32 */ /* * Stack Frame Definitions */ -#if _MIPS_SIM == _ABIO32 +#if (_MIPS_SIM == _MIPS_SIM_ABI32) # define NARGSAVE 4 /* Space for 4 argument registers must be allocated. */ #endif -#if _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32 +#if (_MIPS_SIM == _MIPS_SIM_ABI64 || _MIPS_SIM == _MIPS_SIM_NABI32) # define NARGSAVE 0 /* No caller responsibilities. */ #endif @@ -288,7 +287,7 @@ symbol = value /* * Stack alignment */ -#if _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32 +#if (_MIPS_SIM == _MIPS_SIM_ABI64) || (_MIPS_SIM == _MIPS_SIM_NABI32) # define ALSZ 15 # define ALMASK ~15 #else @@ -299,7 +298,7 @@ symbol = value /* * Size of a register */ -#if _MIPS_SIM == _ABI64 || _MIPS_SIM == _ABIN32 +#if (_MIPS_SIM == _MIPS_SIM_ABI64) || (_MIPS_SIM == _MIPS_SIM_NABI32) # define SZREG 8 #else # define SZREG 4 @@ -390,7 +389,7 @@ symbol = value /* * How to add/sub/load/store/shift pointers. */ -#if (_MIPS_SIM == _ABIO32 && _MIPS_SZPTR == 32) +#if (_MIPS_SIM == _MIPS_SIM_ABI32 && _MIPS_SZPTR == 32) # define PTR_ADD add # define PTR_ADDI addi # define PTR_ADDU addu @@ -412,7 +411,7 @@ symbol = value # define PTR_SCALESHIFT 2 #endif -#if _MIPS_SIM == _ABIN32 +#if _MIPS_SIM == _MIPS_SIM_NABI32 # define PTR_ADD add # define PTR_ADDI addi # define PTR_ADDU add /* no u */ @@ -434,8 +433,8 @@ symbol = value # define PTR_SCALESHIFT 2 #endif -#if (_MIPS_SIM == _ABIO32 && _MIPS_SZPTR == 64 /* o64??? */) \ - || _MIPS_SIM == _ABI64 +#if (_MIPS_SIM == _MIPS_SIM_ABI32 && _MIPS_SZPTR == 64 /* o64??? */) \ + || _MIPS_SIM == _MIPS_SIM_ABI64 # define PTR_ADD dadd # define PTR_ADDI daddi # define PTR_ADDU daddu |