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
This commit is contained in:
Uros Bizjak 2015-05-27 23:07:09 +02:00 committed by Uros Bizjak
parent cba16cca62
commit 8ed501f167
5 changed files with 20 additions and 9 deletions

View File

@ -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>

View File

@ -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;

View File

@ -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)

View File

@ -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>

View File

@ -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;