Skip to content

Commit

Permalink
Use LP_OP(op), LP_SIZE and ASM_ADDR in sem_wait.S
Browse files Browse the repository at this point in the history
  • Loading branch information
hjl-tools committed May 15, 2012
1 parent 9dba3b5 commit dde05f0
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 6 deletions.
7 changes: 7 additions & 0 deletions nptl/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
2012-05-15 H.J. Lu <[email protected]>

* sysdeps/unix/sysv/linux/x86_64/sem_wait.S: Use LP_OP(op)
on NWAITERS.
(__gcc_personality_v0): Replace 8-byte data alignment with
LP_SIZE alignment and .quad with ASM_ADDR.

2012-05-15 H.J. Lu <[email protected]>

* sysdeps/unix/sysv/linux/x86_64/sem_timedwait.S: Use LP_OP(op)
Expand Down
12 changes: 6 additions & 6 deletions nptl/sysdeps/unix/sysv/linux/x86_64/sem_wait.S
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ sem_wait:
cfi_adjust_cfa_offset(8)

LOCK
addq $1, NWAITERS(%rdi)
LP_OP(add) $1, NWAITERS(%rdi)

.LcleanupSTART:
6: call __pthread_enable_asynccancel
Expand Down Expand Up @@ -115,7 +115,7 @@ sem_wait:
xorl %eax, %eax

9: LOCK
subq $1, NWAITERS(%rdi)
LP_OP(sub) $1, NWAITERS(%rdi)

leaq 8(%rsp), %rsp
cfi_adjust_cfa_offset(-8)
Expand All @@ -136,7 +136,7 @@ sem_wait:
sem_wait_cleanup:
movq (%rsp), %rdi
LOCK
subq $1, NWAITERS(%rdi)
LP_OP(sub) $1, NWAITERS(%rdi)
movq %rax, %rdi
.LcallUR:
call _Unwind_Resume@PLT
Expand Down Expand Up @@ -168,9 +168,9 @@ sem_wait_cleanup:
.hidden DW.ref.__gcc_personality_v0
.weak DW.ref.__gcc_personality_v0
.section .gnu.linkonce.d.DW.ref.__gcc_personality_v0,"aw",@progbits
.align 8
.align LP_SIZE
.type DW.ref.__gcc_personality_v0, @object
.size DW.ref.__gcc_personality_v0, 8
.size DW.ref.__gcc_personality_v0, LP_SIZE
DW.ref.__gcc_personality_v0:
.quad __gcc_personality_v0
ASM_ADDR __gcc_personality_v0
#endif

0 comments on commit dde05f0

Please sign in to comment.