diff mbox

[RFA,libitm] Deal with __USER_LABEL_PREFIX__ in the asm

Message ID 4A345D44-6007-423E-AF85-42F7DF71D9F0@sandoe-acoustics.co.uk
State New
Headers show

Commit Message

Iain Sandoe Nov. 22, 2011, 10:01 a.m. UTC 
On 18 Nov 2011, at 17:36, Richard Henderson wrote:

> On 11/18/2011 04:00 AM, Iain Sandoe wrote:
>> libitm:
>>
>>    * config/x86/sjlj.S (CONCAT1, CONCAT2, SYM): Respond to
>>    __USER_LABEL_PREFIX__ for targets that use it.
>>    TYPE, SIZE, HIDDEN): New macros to assist on non-elf targets.
>>    (_ITM_beginTransaction): Use SYM, TYPE, SIZE macros to assist
>>    in portability to non-elf targets.
>>    (GTM_longjmp): LIkewise.
>>    * libitm_i.h (begin_transaction): Apply __USER_LABEL_PREFIX__
>>    where required.
>
> Ok modulo the conflict you're going to have with RO's patch.
> Adjust for his use of .hidden, of course, and the extra symbol ref.

This is what I applied (r181611) after checking I could build the lib  
on a cross to x86_64-unknown-linux and that the sjlj.S file assembled  
for the case where __USER_LABEL_PREFIX__ is not defined.
Iain
diff mbox

Patch

Index: libitm/libitm_i.h
===================================================================
--- libitm/libitm_i.h	(revision 181610)
+++ libitm/libitm_i.h	(working copy)
@@ -240,9 +240,15 @@ 
 
   // Invoked from assembly language, thus the "asm" specifier on
   // the name, avoiding complex name mangling.
+#ifdef __USER_LABEL_PREFIX__
+#define UPFX1(t) UPFX(t)
+#define UPFX(t) #t
   static uint32_t begin_transaction(uint32_t, const gtm_jmpbuf *)
+	__asm__(UPFX1(__USER_LABEL_PREFIX__) "GTM_begin_transaction") ITM_REGPARM;
+#else
+  static uint32_t begin_transaction(uint32_t, const gtm_jmpbuf *)
 	__asm__("GTM_begin_transaction") ITM_REGPARM;
-
+#endif
   // In eh_cpp.cc
   void revert_cpp_exceptions (gtm_transaction_cp *cp = 0);
 
Index: libitm/config/x86/sjlj.S
===================================================================
--- libitm/config/x86/sjlj.S	(revision 181610)
+++ libitm/config/x86/sjlj.S	(working copy)
@@ -25,12 +25,39 @@ 
 
 #include "asmcfi.h"
 
+#define CONCAT1(a, b) CONCAT2(a, b)
+#define CONCAT2(a, b) a ## b
+
+#ifdef __USER_LABEL_PREFIX__
+#  define SYM(x) CONCAT1 (__USER_LABEL_PREFIX__, x)
+#else
+#  define SYM(x) x
+#endif
+
+#ifdef __ELF__
+#  define TYPE(x) .type SYM(x), @function
+#  define SIZE(x) .size SYM(x), . - SYM(x)
+#  ifdef HAVE_ATTRIBUTE_VISIBILITY
+#    define HIDDEN(x) .hidden SYM(x)
+#  else
+#    define HIDDEN(x)
+#  endif
+#else
+#  define TYPE(x)
+#  define SIZE(x)
+#  ifdef __MACH__
+#    define HIDDEN(x) .private_extern SYM(x)
+#  else
+#    define HIDDEN(x)
+#  endif
+#endif
+
 	.text
 
 	.align 4
-	.globl	_ITM_beginTransaction
+	.globl	SYM(_ITM_beginTransaction)
 
-_ITM_beginTransaction:
+SYM(_ITM_beginTransaction):
 	cfi_startproc
 #ifdef __x86_64__
 	leaq	8(%rsp), %rax
@@ -46,7 +73,7 @@ 
 	movq	%r14, 48(%rsp)
 	movq	%r15, 56(%rsp)
 	movq	%rsp, %rsi
-	call	GTM_begin_transaction
+	call	SYM(GTM_begin_transaction)
 	addq	$72, %rsp
 	cfi_def_cfa_offset(8)
 	ret
@@ -61,12 +88,12 @@ 
 	movl	%ebp, 24(%esp)
 	leal	8(%esp), %edx
 #if defined HAVE_ATTRIBUTE_VISIBILITY || !defined __PIC__
-	call	GTM_begin_transaction
+	call	SYM(GTM_begin_transaction)
 #elif defined __ELF__
 	call	1f
 1:	popl	%ebx
 	addl	$_GLOBAL_OFFSET_TABLE_+[.-1b], %ebx
-	call	GTM_begin_transaction@PLT
+	call	SYM(GTM_begin_transaction)@PLT
 	movl	12(%esp), %ebx
 #else
 # error "Unsupported PIC sequence"
@@ -77,15 +104,13 @@ 
 #endif
 	cfi_endproc
 
-#ifdef __ELF__
-	.type	_ITM_beginTransaction, @function
-	.size	_ITM_beginTransaction, .-_ITM_beginTransaction
-#endif
+	TYPE(_ITM_beginTransaction)
+	SIZE(_ITM_beginTransaction)
 
 	.align 4
-	.globl	GTM_longjmp
+	.globl	SYM(GTM_longjmp)
 
-GTM_longjmp:
+SYM(GTM_longjmp):
 	cfi_startproc
 #ifdef __x86_64__
 	movq	(%rdi), %rcx
@@ -116,13 +141,9 @@ 
 #endif
 	cfi_endproc
 
-#ifdef __ELF__
-	.type	GTM_longjmp, @function
-#ifdef HAVE_ATTRIBUTE_VISIBILITY
-	.hidden	GTM_longjmp
-#endif
-	.size	GTM_longjmp, .-GTM_longjmp
-#endif
+	TYPE(GTM_longjmp)
+	HIDDEN(GTM_longjmp)
+	SIZE(GTM_longjmp)
 
 #ifdef __linux__
 .section .note.GNU-stack, "", @progbits