futex.h (sys_futex0): Change to static function with noinline, nomips16 attributes...

2012-08-29  Chung-Lin Tang  <cltang@codesourcery.com>

	libgomp/
	* config/linux/mips/futex.h (sys_futex0): Change to static
	function with noinline, nomips16 attributes under MIPS16. Adjust
	asm statement to place 'li v0,SYS_futex' immediately before
	syscall insn.

From-SVN: r190772

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 52c269dfbdabf5722de281709b5dbcbe9bc4cd1f..2f761d7177f9c3b20a555a38a78ec637d097e974 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,3 +1,10 @@
+2012-08-29  Chung-Lin Tang  <cltang@codesourcery.com>
+
+       * config/linux/mips/futex.h (sys_futex0): Change to static
+       function with noinline, nomips16 attributes under MIPS16. Adjust
+       asm statement to place 'li v0,SYS_futex' immediately before
+       syscall insn.
+
 2012-07-04  Sandra Loosemore <sandra@codesourcery.com>
 
        * libgomp.texi (Library Index): Renamed from "Index" to prevent

diff --git a/libgomp/config/linux/mips/futex.h b/libgomp/config/linux/mips/futex.h
index 93655d3114c185d5ee42223001bdb351b996461a..83b0aefede745345217651c82bb9432926a543d9 100644 (file)
--- a/libgomp/config/linux/mips/futex.h
+++ b/libgomp/config/linux/mips/futex.h
@@ -28,20 +28,26 @@
 #define FUTEX_WAIT 0
 #define FUTEX_WAKE 1
 
+#ifdef __mips16
+static void __attribute__((noinline,nomips16))
+#else
 static inline void
+#endif
 sys_futex0 (int *addr, int op, int val)
 {
-  register unsigned long __v0 asm("$2") = (unsigned long) SYS_futex;
+  register unsigned long __v0 asm("$2");
   register unsigned long __a0 asm("$4") = (unsigned long) addr;
   register unsigned long __a1 asm("$5") = (unsigned long) op;
   register unsigned long __a2 asm("$6") = (unsigned long) val;
   register unsigned long __a3 asm("$7") = 0;
 
-  __asm volatile ("syscall"
+  __asm volatile ("li $2, %6\n\t"
+                 "syscall"
                  /* returns $a3 (errno), $v0 (return value) */
                  : "=r" (__v0), "=r" (__a3)
-                 /* arguments in v0 (syscall) a0-a3 */
-                 : "r" (__v0), "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a3)
+                 /* arguments in a0-a3, and syscall number */
+                 : "r" (__a0), "r" (__a1), "r" (__a2), "r" (__a3),
+                    "IK" (SYS_futex)
                  /* clobbers at, v1, t0-t9, memory */
                  : "$1", "$3", "$8", "$9", "$10", "$11", "$12", "$13", "$14",
                    "$15", "$24", "$25", "memory");