wait.h (gomp_futex_wait, [...]): Declare as int.

2015-05-27  Uros Bizjak  <ubizjak@gmail.com>

	* config/linux/wait.h (gomp_futex_wait, gomp_futex_wake):
	Declare as int.
	(FUTEX_PRIVATE_FLAG): Remove L suffix.
	* config/linux/mutex.c (gomp_futex_wait, gomp_futex_wake):
	Declare as int.

2015-05-27  Uros Bizjak  <ubizjak@gmail.com>

	* config/linux/ia64/futex.h (sys_futex0) Change operand "op" to int.

2015-05-27  Uros Bizjak  <ubizjak@gmail.com>

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

From-SVN: r223780

diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 0725c60f596930e4dc2bd872444e3f320243c159..bfae17c88ee62a1ad588cbe3186a05be6fb0eb67 100644 (file)
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,8 +1,19 @@
 2015-05-27  Uros Bizjak  <ubizjak@gmail.com>
 
-       * config/linux/x86/futex.h (sys_futex0) [!__x86_64__]:
-       Change operand "op" to long.
-       [__PIC__]: Remove sys_futex0 function.
+       * config/linux/ia64/futex.h (sys_futex0) Change operand "op" to int.
+
+2015-05-27  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/linux/wait.h (gomp_futex_wait, gomp_futex_wake):
+       Declare as int.
+       (FUTEX_PRIVATE_FLAG): Remove L suffix.
+       * config/linux/mutex.c (gomp_futex_wait, gomp_futex_wake):
+       Declare as int.
+
+2015-05-27  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/linux/x86/futex.h (sys_futex0) [__PIC__]: Remove
+       sys_futex0 function.
 
 2015-05-27  Chung-Lin Tang  <cltang@codesourcery.com>
 

diff --git a/libgomp/config/linux/ia64/futex.h b/libgomp/config/linux/ia64/futex.h
index b63cd206e1d657bb419446d814948d583a9596c4..868059f5a01a6f0c894a58a63355688af6d13b06 100644 (file)
--- a/libgomp/config/linux/ia64/futex.h
+++ b/libgomp/config/linux/ia64/futex.h
@@ -30,7 +30,7 @@
 
 
 static inline long
-sys_futex0(int *addr, long op, int val)
+sys_futex0(int *addr, int op, int val)
 {
   register long out0 asm ("out0") = (long) addr;
   register long out1 asm ("out1") = op;

diff --git a/libgomp/config/linux/mutex.c b/libgomp/config/linux/mutex.c
index 7ab05a7b3e1810d0ed22a1b5dcf4f89be0463df3..24261bff0d270b095375d1375d019a9d046fa338 100644 (file)
--- a/libgomp/config/linux/mutex.c
+++ b/libgomp/config/linux/mutex.c
@@ -29,8 +29,8 @@
 
 #include "wait.h"
 
-long int gomp_futex_wake = FUTEX_WAKE | FUTEX_PRIVATE_FLAG;
-long int gomp_futex_wait = FUTEX_WAIT | FUTEX_PRIVATE_FLAG;
+int gomp_futex_wake = FUTEX_WAKE | FUTEX_PRIVATE_FLAG;
+int gomp_futex_wait = FUTEX_WAIT | FUTEX_PRIVATE_FLAG;
 
 void
 gomp_mutex_lock_slow (gomp_mutex_t *mutex, int oldval)

diff --git a/libgomp/config/linux/wait.h b/libgomp/config/linux/wait.h
index 96d2fbe5f8c3f3eadf2eefbfccca90301b41dc0d..7f57454a510fab834e210b0e4a8e91da07e3bf2e 100644 (file)
--- a/libgomp/config/linux/wait.h
+++ b/libgomp/config/linux/wait.h
@@ -35,13 +35,13 @@
 
 #define FUTEX_WAIT     0
 #define FUTEX_WAKE     1
-#define FUTEX_PRIVATE_FLAG     128L
+#define FUTEX_PRIVATE_FLAG     128
 
 #ifdef HAVE_ATTRIBUTE_VISIBILITY
 # pragma GCC visibility push(hidden)
 #endif
 
-extern long int gomp_futex_wait, gomp_futex_wake;
+extern int gomp_futex_wait, gomp_futex_wake;
 
 #include <futex.h>
 

diff --git a/libgomp/config/linux/x86/futex.h b/libgomp/config/linux/x86/futex.h
index 7ae36feac7f6117228cbf76c0c515d38ef7166c1..2592217a89033115215375c95b2e4022e6dfbae6 100644 (file)
--- a/libgomp/config/linux/x86/futex.h
+++ b/libgomp/config/linux/x86/futex.h
@@ -82,7 +82,7 @@ futex_wake (int *addr, int count)
 # endif
 
 static inline long
-sys_futex0 (int *addr, long op, int val)
+sys_futex0 (int *addr, int op, int val)
 {
   long res;