projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ac3efa7)
futex_bits.h (sys_futex0): Change operands "op" and "val" to int.
authorUros Bizjak <ubizjak@gmail.com>
Thu, 28 May 2015 17:36:47 +0000 (19:36 +0200)
committerUros Bizjak <uros@gcc.gnu.org>
Thu, 28 May 2015 17:36:47 +0000 (19:36 +0200)
* config/linux/x86/futex_bits.h (sys_futex0) [__x86_64__]: Change
operands "op" and "val" to int.

* config/linux/sh/futex_bits.h (sys_futex0) Change operands
"op" and "val" to int.

* config/linux/alpha/futex_bits.h (sys_futex0) Change operands
"op" and "val" to int.

* config/linux/futex.cc (gtm_futex_wait, gtm_futex_wake):
Declare as static int.
(FUTEX_PRIVATE_FLAG): Remove L suffix.
* config/linux/futex_bits.h (sys_futex0) Change operand "op" to int.

Revert:
* config/linux/x86/futex.h (sys_futex0) [!__x86_64__]:
Change operand "op" to long.

From-SVN: r223844

libitm/ChangeLog patch | blob | history
libitm/config/linux/alpha/futex_bits.h patch | blob | history
libitm/config/linux/futex.cc patch | blob | history
libitm/config/linux/futex_bits.h patch | blob | history
libitm/config/linux/sh/futex_bits.h patch | blob | history
libitm/config/linux/x86/futex_bits.h patch | blob | history

diff --git a/libitm/ChangeLog b/libitm/ChangeLog
index 91f1dd043926bf05991beb753f822f9b5c22704a..d745b54816b23be0bc578b772774957852640dae 100644 (file)
--- a/libitm/ChangeLog
+++ b/libitm/ChangeLog
@@ -1,8 +1,29 @@
 2015-05-27  Uros Bizjak  <ubizjak@gmail.com>
 
-       * config/linux/x86/futex_bits.h (sys_futex0) [!__x86_64__]:
-       Change operand "op" to long.
-       [__PIC__]: Remove sys_futex0 function.
+       * config/linux/x86/futex_bits.h (sys_futex0) [__x86_64__]: Change
+       operands "op" and "val" to int.
+
+2015-05-27  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/linux/sh/futex_bits.h (sys_futex0) Change operands
+       "op" and "val" to int.
+
+2015-05-27  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/linux/alpha/futex_bits.h (sys_futex0) Change operands
+       "op" and "val" to int.
+
+2015-05-27  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/linux/futex.cc (gtm_futex_wait, gtm_futex_wake):
+       Declare as static int.
+       (FUTEX_PRIVATE_FLAG): Remove L suffix.
+       * config/linux/futex_bits.h (sys_futex0) Change operand "op" to int.
+
+2015-05-27  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/linux/x86/futex_bits.h (sys_futex0) [__PIC__]: Remove
+       sys_futex0 function.
 
 2015-05-13  Michael Haubenwallner  <michael.haubenwallner@ssi-schaefer.com>
 
diff --git a/libitm/config/linux/alpha/futex_bits.h b/libitm/config/linux/alpha/futex_bits.h
index 58ed1f7e1f95762bd4fa8cc9de16f81e7b4e07ef..e5efefb0deb91da85261dcb287d8ca424fd1059f 100644 (file)
--- a/libitm/config/linux/alpha/futex_bits.h
+++ b/libitm/config/linux/alpha/futex_bits.h
@@ -29,7 +29,7 @@
 #endif
 
 static inline long
-sys_futex0 (std::atomic<int> *addr, long op, long val)
+sys_futex0 (std::atomic<int> *addr, int op, int val)
 {
   register long sc_0 __asm__("$0");
   register long sc_16 __asm__("$16");
diff --git a/libitm/config/linux/futex.cc b/libitm/config/linux/futex.cc
index d1a16f79747caa591258dedafeab594c2466cfbb..004fdbd45f82e7da96e7ad7b0ceeb8b5fa89e0a7 100644 (file)
--- a/libitm/config/linux/futex.cc
+++ b/libitm/config/linux/futex.cc
@@ -33,11 +33,11 @@ namespace GTM HIDDEN {
 
 #define FUTEX_WAIT             0
 #define FUTEX_WAKE             1
-#define FUTEX_PRIVATE_FLAG     128L
+#define FUTEX_PRIVATE_FLAG     128
 
 
-static long int gtm_futex_wait = FUTEX_WAIT | FUTEX_PRIVATE_FLAG;
-static long int gtm_futex_wake = FUTEX_WAKE | FUTEX_PRIVATE_FLAG;
+static int gtm_futex_wait = FUTEX_WAIT | FUTEX_PRIVATE_FLAG;
+static int gtm_futex_wake = FUTEX_WAKE | FUTEX_PRIVATE_FLAG;
 
 
 void
diff --git a/libitm/config/linux/futex_bits.h b/libitm/config/linux/futex_bits.h
index 4783afecd30e5cafc51a05b9c7205a5501324da9..4e1bae96c3fdba274c28a4bc22d177303482be47 100644 (file)
--- a/libitm/config/linux/futex_bits.h
+++ b/libitm/config/linux/futex_bits.h
@@ -34,7 +34,7 @@
 #include <errno.h>
 
 static inline long
-sys_futex0 (std::atomic<int> *addr, long op, long val)
+sys_futex0 (std::atomic<int> *addr, int op, int val)
 {
   long res = syscall (SYS_futex, (int*) addr, op, val, 0);
   if (__builtin_expect (res == -1, 0))
diff --git a/libitm/config/linux/sh/futex_bits.h b/libitm/config/linux/sh/futex_bits.h
index 4d8bf1e06d9d1011c2d6ede82c1f2483a5a6e856..4bbcd3fd16b299ead8192fadeaa15ea6a6dcecbc 100644 (file)
--- a/libitm/config/linux/sh/futex_bits.h
+++ b/libitm/config/linux/sh/futex_bits.h
@@ -32,7 +32,7 @@
        trapa #0x14; or r0,r0; or r0,r0; or r0,r0; or r0,r0; or r0,r0"
 
 static inline long
-sys_futex0 (std::atomic<int> *addr, long op, long val)
+sys_futex0 (std::atomic<int> *addr, int op, int val)
 {
   int __status;
   register long __r3 asm ("r3") = SYS_futex;
diff --git a/libitm/config/linux/x86/futex_bits.h b/libitm/config/linux/x86/futex_bits.h
index 7529fc4606f03affb2b2f7935ee470ba4051f09d..e4b70d6f0ecb6ea90b5ba4be4fc667c1e02449f2 100644 (file)
--- a/libitm/config/linux/x86/futex_bits.h
+++ b/libitm/config/linux/x86/futex_bits.h
@@ -28,7 +28,7 @@
 # endif
 
 static inline long
-sys_futex0 (std::atomic<int> *addr, long op, long val)
+sys_futex0 (std::atomic<int> *addr, int op, int val)
 {
   register long r10 __asm__("%r10") = 0;
   long res;
@@ -47,7 +47,7 @@ sys_futex0 (std::atomic<int> *addr, long op, long val)
 # endif
 
 static inline long
-sys_futex0 (std::atomic<int> *addr, long op, int val)
+sys_futex0 (std::atomic<int> *addr, int op, int val)
 {
   long res;