$NetBSD: patch-bx,v 1.1 2010/12/19 08:27:17 is Exp $

--- asmcomp/arm/emit.mlp.orig	2010-04-22 09:33:18.000000000 +0000
+++ asmcomp/arm/emit.mlp
@@ -285,7 +285,7 @@ let emit_instr i =
         `	ldr	{emit_reg i.res.(0)}, {emit_label lbl} @ {emit_symbol s}\n`; 1
     | Lop(Icall_ind) ->
         `	mov	lr, pc\n`;
-        `{record_frame i.live}  bx	{emit_reg i.arg.(0)}\n`; 2
+        `{record_frame i.live}  mov	pc, {emit_reg i.arg.(0)}\n`; 2
     | Lop(Icall_imm s) ->
         `{record_frame i.live}  bl      {emit_symbol s}\n`; 1
     | Lop(Itailcall_ind) ->
@@ -293,7 +293,7 @@ let emit_instr i =
         if !contains_calls then
           `	ldr	lr, [sp, #{emit_int (n-4)}]\n`;
         let ninstr = emit_stack_adjustment "add" n in
-        `	bx	{emit_reg i.arg.(0)}\n`;
+        `	mov	pc, {emit_reg i.arg.(0)}\n`;
         2 + ninstr
     | Lop(Itailcall_imm s) ->
         if s = !function_name then begin
@@ -448,7 +448,7 @@ let emit_instr i =
         `	ldr	lr, [sp, #{emit_int(n-4)}]\n`; 1
     | Lreturn ->
         let ninstr = emit_stack_adjustment "add" (frame_size()) in
-        `	bx	lr\n`;
+        `	mov	pc, lr\n`;
         ninstr + 1
     | Llabel lbl ->
         `{emit_label lbl}:\n`; 0

$NetBSD: patch-bw,v 1.1 2010/12/19 08:27:17 is Exp $

--- asmrun/arm.S.orig	2009-05-04 13:46:46.000000000 +0000
+++ asmrun/arm.S
@@ -38,7 +38,7 @@ caml_call_gc:
 	ldr	r12, .Lcaml_requested_size
 	ldr	r12, [r12, #0]
 	sub	alloc_ptr, alloc_ptr, r12
-        bx      lr
+        mov	pc,lr
 
         .globl caml_alloc1
 caml_alloc1:
@@ -128,7 +128,7 @@ caml_allocN:
         ldr     alloc_limit, [r12, #0]
     /* Return to caller */
         ldr     r12, [sp], #4
-        bx      r12
+        mov     pc,r12		/* optimize! */
 
 /* Call a C function from Caml */
 /* Function to call is in r12 */
@@ -149,13 +149,13 @@ caml_c_call:
         str     trap_ptr, [r7, #0]
     /* Call the function */
         mov     lr, pc
-        bx      r12
+        mov	pc,r12
     /* Reload alloc ptr and alloc limit */
         ldr     r5, .Lcaml_young_limit
         ldr     alloc_ptr, [r6, #0]    /* r6 still points to caml_young_ptr */
         ldr     alloc_limit, [r5, #0]
     /* Return */
-        bx      r4
+        mov	pc,r4
 
 /* Start the Caml program */
 
@@ -196,7 +196,7 @@ caml_start_program:
         ldr     alloc_limit, [r4, #0]
     /* Call the Caml code */
         mov     lr, pc
-        bx      r12
+        mov	pc,r12
 .Lcaml_retaddr:
     /* Pop the trap frame, restoring caml_exception_pointer */
         ldr     r4, .Lcaml_exception_pointer
@@ -220,7 +220,7 @@ caml_start_program:
         str     alloc_ptr, [r4, #0]
     /* Reload callee-save registers and return */
         ldmfd   sp!, {r4,r5,r6,r7,r8,r10,r11,lr}
-	bx	lr
+	mov	pc,lr
 
     /* The trap handler */
 .Ltrap_handler: