From: Uros Bizjak <ubizjak@gmail.com>
Date: Wed, 27 May 2015 21:07:09 +0000 (+0200)
Subject: wait.h (gomp_futex_wait, [...]): Declare as int.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8ed501f167373f40d9a5187323b5771725550b69;p=gcc.git

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 0725c60f596..bfae17c88ee 100644
--- 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 b63cd206e1d..868059f5a01 100644
--- 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 7ab05a7b3e1..24261bff0d2 100644
--- 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 96d2fbe5f8c..7f57454a510 100644
--- 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 7ae36feac7f..2592217a890 100644
--- 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;