diff options
author | Andrew Bennett <andrew.bennett@imgtec.com> | 2015-08-24 22:06:29 +0100 |
---|---|---|
committer | Matthew Fortune <matthew.fortune@imgtec.com> | 2015-09-08 16:52:43 +0100 |
commit | 7498d7676dc9ffb38fcb39635bae7c195740d6f7 (patch) | |
tree | 777b1522f456dde55596ed3388229f57eb6a9dfe /sysdeps/mips/bits | |
parent | 697ed91ca901f8e2ce3ba2b7cf69cdb18c8b37ad (diff) | |
download | glibc-7498d7676dc9ffb38fcb39635bae7c195740d6f7.tar glibc-7498d7676dc9ffb38fcb39635bae7c195740d6f7.tar.gz glibc-7498d7676dc9ffb38fcb39635bae7c195740d6f7.tar.bz2 glibc-7498d7676dc9ffb38fcb39635bae7c195740d6f7.zip |
MIPS: Only use .set mips* assembler directives when necessary
There are a few .set mips* assembler directives used in the MIPS specific
sysdep code that force an instruction to be assembled for a specific ISA.
The reason for these is to allow an instruction to be encoded when it might
not be supported in the current ISA (when the code is run the Linux kernel
will trap and emulate any unsupported instructions). Unfortunately forcing
a specific ISA means that when assembling for a newer ISA, where the
instruction has a different encoding, the wrong encoding will be used.
* sysdeps/mips/bits/atomic.h [_MIPS_SIM == _ABIO32] (MIPS_PUSH_MIPS2):
Only use .set mips2 if the current ISA is below mips2.
* sysdeps/mips/sys/tas.h [_MIPS_SIM == _ABIO32] (_test_and_set):
Likewise.
* sysdeps/mips/nptl/tls.h (READ_THREAD_POINTER): Only use .set
mips32r2 if the current ISA is below mips32r2.
* sysdeps/mips/tls-macros.h (TLS_RDHWR): New define.
(TLS_IE): Updated to use the TLD_RDHWR macro.
(TLS_LE): Likewise.
* sysdeps/unix/mips/sysdep.h (__mips_isa_rev): Moved out of #ifdef
__ASSEMBLER__ condition.
Diffstat (limited to 'sysdeps/mips/bits')
-rw-r--r-- | sysdeps/mips/bits/atomic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/mips/bits/atomic.h b/sysdeps/mips/bits/atomic.h index a39188160b..375448957c 100644 --- a/sysdeps/mips/bits/atomic.h +++ b/sysdeps/mips/bits/atomic.h @@ -38,7 +38,7 @@ typedef uintptr_t uatomicptr_t; typedef intmax_t atomic_max_t; typedef uintmax_t uatomic_max_t; -#if _MIPS_SIM == _ABIO32 +#if _MIPS_SIM == _ABIO32 && __mips < 2 #define MIPS_PUSH_MIPS2 ".set mips2\n\t" #else #define MIPS_PUSH_MIPS2 |