Merge branch 'sigsetjmp-asm-fix' into 'master'
Fix regression caused in e553e9e4
See merge request redox-os/relibc!1155
This commit is contained in:
@@ -9,7 +9,7 @@ __sigsetjmp:
|
||||
|
||||
mov eax, dword ptr [esp + 4]
|
||||
pop [eax + 24]
|
||||
mov dword ptr [eax * 8 + 28], ebx
|
||||
mov dword ptr [eax + 8 + 28], ebx
|
||||
mov ebx, eax
|
||||
|
||||
.hidden ___setjmp
|
||||
@@ -17,8 +17,8 @@ __sigsetjmp:
|
||||
|
||||
push [ebx + 24]
|
||||
mov dword ptr [esp + 4], ebx
|
||||
mov dword ptr [esp + 4], eax
|
||||
mov ebx, dword ptr [ebx * 8 + 28]
|
||||
mov dword ptr [esp + 8], eax
|
||||
mov ebx, dword ptr [ebx + 8 + 28]
|
||||
|
||||
.hidden __sigsetjmp_tail
|
||||
jmp __sigsetjmp_tail
|
||||
|
||||
@@ -8,7 +8,7 @@ __sigsetjmp:
|
||||
jz 1f
|
||||
|
||||
pop [rdi + 64]
|
||||
mov qword ptr [rdi * 8 + 72], rbx
|
||||
mov qword ptr [rdi + 8 + 72], rbx
|
||||
mov rbx, rdi
|
||||
|
||||
call setjmp
|
||||
@@ -16,7 +16,7 @@ __sigsetjmp:
|
||||
push [rbx + 64]
|
||||
mov rdi, rbx
|
||||
mov esi, eax
|
||||
mov rbx, qword ptr [rbx * 8 + 72]
|
||||
mov rbx, qword ptr [rbx + 8 + 72]
|
||||
|
||||
.hidden __sigsetjmp_tail
|
||||
jmp __sigsetjmp_tail
|
||||
|
||||
Reference in New Issue
Block a user