diff options
| author | Uros Bizjak <ubizjak@gmail.com> | 2015-05-27 21:35:58 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2015-05-27 21:35:58 +0200 |
| commit | ea023bcfd8a6549df22232792038310fd4f2f967 (patch) | |
| tree | 6e06f073ef60126e056bb321e26c5377718325a1 /libitm | |
| parent | 8974754f6f12f2f032d4122b06d26319545ced00 (diff) | |
| download | gcc-ea023bcfd8a6549df22232792038310fd4f2f967.zip gcc-ea023bcfd8a6549df22232792038310fd4f2f967.tar.gz gcc-ea023bcfd8a6549df22232792038310fd4f2f967.tar.bz2 | |
futex.h (sys_futex0): Change operand "op" to long.
libgomp/ChangeLog:
* config/linux/x86/futex.h (sys_futex0) [!__x86_64__]:
Change operand "op" to long.
[__PIC__]: Remove sys_futex0 function.
libitm/ChangeLog:
* config/linux/x86/futex_bits.h (sys_futex0) [!__x86_64__]:
Change operand "op" to long.
[__PIC__]: Remove sys_futex0 function.
From-SVN: r223771
Diffstat (limited to 'libitm')
| -rw-r--r-- | libitm/ChangeLog | 6 | ||||
| -rw-r--r-- | libitm/config/linux/x86/futex_bits.h | 22 |
2 files changed, 7 insertions, 21 deletions
diff --git a/libitm/ChangeLog b/libitm/ChangeLog index a2b3a15..91f1dd0 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,9 @@ +2015-05-27 Uros Bizjak <ubizjak@gmail.com> + + * config/linux/x86/futex_bits.h (sys_futex0) [!__x86_64__]: + Change operand "op" to long. + [__PIC__]: Remove sys_futex0 function. + 2015-05-13 Michael Haubenwallner <michael.haubenwallner@ssi-schaefer.com> * Makefile.in: Regenerated with automake-1.11.6. diff --git a/libitm/config/linux/x86/futex_bits.h b/libitm/config/linux/x86/futex_bits.h index 235a053..7529fc4 100644 --- a/libitm/config/linux/x86/futex_bits.h +++ b/libitm/config/linux/x86/futex_bits.h @@ -46,27 +46,8 @@ sys_futex0 (std::atomic<int> *addr, long op, long val) # define SYS_futex 240 # endif -# ifdef __PIC__ - -static inline long -sys_futex0 (std::atomic<int> *addr, int op, int val) -{ - long res; - - __asm volatile ("xchgl\t%%ebx, %2\n\t" - "int\t$0x80\n\t" - "xchgl\t%%ebx, %2" - : "=a" (res) - : "0"(SYS_futex), "r" (addr), "c"(op), - "d"(val), "S"(0) - : "memory"); - return res; -} - -# else - static inline long -sys_futex0 (std::atomic<int> *addr, int op, int val) +sys_futex0 (std::atomic<int> *addr, long op, int val) { long res; @@ -78,5 +59,4 @@ sys_futex0 (std::atomic<int> *addr, int op, int val) return res; } -# endif /* __PIC__ */ #endif /* __x86_64__ */ |