Ticket #514: wrapper_darwin.2.patch

wrapper.S

@@ -1 @@
-.section .data
+.data
 .globl caller_return
 caller_return:
         .long 0
-.globl report_entry
-report_entry:
+.globl _report_entry
+_report_entry:
         .long null_call
-.globl report_ret
-report_ret:     
+.globl _report_ret
+_report_ret:    
         .long null_call
-.global wrapper_target
-wrapper_target: 
+.globl _wrapper_target
+_wrapper_target:        
         .long null_call
 
-.section .text
+.text
 .globl null_call
-        .type null_call, @function
-        .balign 16,0x90
+#       .type null_call, @function
+        .p2align 4,0x90
 null_call:
         ret
-.globl wrapper
-        .type wrapper, @function
-        .balign 16,0x90
-wrapper:
+.globl _wrapper
+#       .type wrapper, @function
+        .p2align 4,0x90
+_wrapper:
         pusha                   # store registers (EAX, ECX, EDX, EBX, ESP, EBP, ESI, EDI) 
         pushf                   # store flags
         
@@ -39 +39 @@
         push %eax
         push %edx
         
-        call *report_entry      # report entry
+        call *_report_entry     # report entry
         
         test %eax, %eax
         jnz .Ldone
@@ -51 +51 @@
         popl caller_return      # switch return addresses
         pushl $.Lwrapper_return 
         
-        jmp *wrapper_target     # wrapper_target should return at .Lwrapper_return
+        jmp *_wrapper_target    # wrapper_target should return at .Lwrapper_return
 
-        .balign 16, 0x90
+        .p2align 4, 0x90
 .Lwrapper_return:       
         pushl caller_return     # restore the original return address
         pusha                   # more for reference sake here
@@ -73 +73 @@
         push %eax
         push %edx
 
-        call *report_ret        # report the return information (same args)
+        call *_report_ret       # report the return information (same args)
 .Ldone: 
 
         leave