about summary refs log tree commit diff
path: root/sysdeps/mips/sys
diff options
context:
space:
mode:
authorAndrew Bennett <andrew.bennett@imgtec.com>2015-08-24 22:06:29 +0100
committerMatthew Fortune <matthew.fortune@imgtec.com>2015-09-08 16:52:43 +0100
commit7498d7676dc9ffb38fcb39635bae7c195740d6f7 (patch)
tree777b1522f456dde55596ed3388229f57eb6a9dfe /sysdeps/mips/sys
parent697ed91ca901f8e2ce3ba2b7cf69cdb18c8b37ad (diff)
downloadglibc-7498d7676dc9ffb38fcb39635bae7c195740d6f7.tar.gz
glibc-7498d7676dc9ffb38fcb39635bae7c195740d6f7.tar.xz
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/sys')
-rw-r--r--sysdeps/mips/sys/tas.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/sysdeps/mips/sys/tas.h b/sysdeps/mips/sys/tas.h
index e14b5f04c1..2820ff6f05 100644
--- a/sysdeps/mips/sys/tas.h
+++ b/sysdeps/mips/sys/tas.h
@@ -41,7 +41,7 @@ __NTH (_test_and_set (int *__p, int __v))
   __asm__ __volatile__
     ("/* Inline test and set */\n"
      ".set	push\n\t"
-#if _MIPS_SIM == _ABIO32
+#if _MIPS_SIM == _ABIO32 && __mips < 2
      ".set	mips2\n\t"
 #endif
      "sync\n\t"