From 1f319dbad617f941249fd9bed3f3d05a0f8c1b93 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Tue, 14 Feb 2012 19:38:38 +0100 Subject: [PATCH] target.h (GTM_longjmp): Correct .cfi directives. * config/x86/target.h (GTM_longjmp): Correct .cfi directives. From-SVN: r184220 --- libitm/ChangeLog | 4 ++++ libitm/config/x86/sjlj.S | 8 +++++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libitm/ChangeLog b/libitm/ChangeLog index 4dbb1e85ecd..23594d37498 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,7 @@ +2012-02-14 Uros Bizjak + + * config/x86/target.h (GTM_longjmp): Correct .cfi directives. + 2012-02-14 Torvald Riegel * libitm_i.h (GTM::gtm_rwlog_entry): New. diff --git a/libitm/config/x86/sjlj.S b/libitm/config/x86/sjlj.S index 9a74d97f76f..554ec984d46 100644 --- a/libitm/config/x86/sjlj.S +++ b/libitm/config/x86/sjlj.S @@ -112,6 +112,7 @@ SYM(_ITM_beginTransaction): SYM(GTM_longjmp): cfi_startproc #ifdef __x86_64__ + cfi_def_cfa(%rsi, 0) movq (%rsi), %rcx movq 8(%rsi), %rbx movq 16(%rsi), %rbp @@ -119,20 +120,21 @@ SYM(GTM_longjmp): movq 32(%rsi), %r13 movq 40(%rsi), %r14 movq 48(%rsi), %r15 - movl %edi, %eax cfi_offset(%rip, 56) - cfi_def_cfa(%rcx, 0) + movl %edi, %eax movq %rcx, %rsp + cfi_register(%rsp, %rcx) jmp *56(%rsi) #else + cfi_def_cfa(%edx, 0) movl (%edx), %ecx movl 4(%edx), %ebx movl 8(%edx), %esi movl 12(%edx), %edi movl 16(%edx), %ebp cfi_offset(%eip, 20) - cfi_def_cfa(%ecx, 0) movl %ecx, %esp + cfi_register(%esp, %ecx) jmp *20(%edx) #endif cfi_endproc -- 2.30.2