diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2015-05-28 19:36:47 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2015-05-28 19:36:47 +0200 |
| commit | d778b5a09c816040de7f25f630056e56ec5d1c09 (patch) | |
| tree | 56e7a48916bf7ae3b2e8f20f130737c82752650a /libitm/config | |
| parent | ac3efa775fc0013da35f118852a9284d26076d19 (diff) | |
| download | gcc-d778b5a09c816040de7f25f630056e56ec5d1c09.zip gcc-d778b5a09c816040de7f25f630056e56ec5d1c09.tar.gz gcc-d778b5a09c816040de7f25f630056e56ec5d1c09.tar.bz2 | |
futex_bits.h (sys_futex0): Change operands "op" and "val" to int.
* 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
Diffstat (limited to 'libitm/config')
| -rw-r--r-- | libitm/config/linux/alpha/futex_bits.h | 2 | ||||
| -rw-r--r-- | libitm/config/linux/futex.cc | 6 | ||||
| -rw-r--r-- | libitm/config/linux/futex_bits.h | 2 | ||||
| -rw-r--r-- | libitm/config/linux/sh/futex_bits.h | 2 | ||||
| -rw-r--r-- | libitm/config/linux/x86/futex_bits.h | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/libitm/config/linux/alpha/futex_bits.h b/libitm/config/linux/alpha/futex_bits.h index 58ed1f7..e5efefb 100644 --- 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 d1a16f7..004fdbd 100644 --- 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 4783afe..4e1bae9 100644 --- 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 4d8bf1e..4bbcd3f 100644 --- 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 7529fc4..e4b70d6 100644 --- 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; |