diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2015-05-27 23:07:09 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2015-05-27 23:07:09 +0200 |
| commit | 8ed501f167373f40d9a5187323b5771725550b69 (patch) | |
| tree | 19bde88030265385624bcd14d9f336389c91735e /libgomp | |
| parent | cba16cca6232ab9295cfd4ac247b874163712099 (diff) | |
| download | gcc-8ed501f167373f40d9a5187323b5771725550b69.zip gcc-8ed501f167373f40d9a5187323b5771725550b69.tar.gz gcc-8ed501f167373f40d9a5187323b5771725550b69.tar.bz2 | |
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
Diffstat (limited to 'libgomp')
| -rw-r--r-- | libgomp/ChangeLog | 17 | ||||
| -rw-r--r-- | libgomp/config/linux/ia64/futex.h | 2 | ||||
| -rw-r--r-- | libgomp/config/linux/mutex.c | 4 | ||||
| -rw-r--r-- | libgomp/config/linux/wait.h | 4 | ||||
| -rw-r--r-- | libgomp/config/linux/x86/futex.h | 2 |
5 files changed, 20 insertions, 9 deletions
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 0725c60..bfae17c 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 b63cd20..868059f 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 7ab05a7..24261bf 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 96d2fbe..7f57454 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 7ae36fe..2592217 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; |