From 673251fe69099294bc42c89e968181d3bc2c9b97 Mon Sep 17 00:00:00 2001
From: Leif Lindholm <leif.lindholm@linaro.org>
Date: Mon, 20 Jan 2014 17:18:16 +0000
Subject: Merging linaro-edk2-2014.01-rc1 into linaro-tracking.

---
 .../Library/CompilerIntrinsicsLib/Arm/memcpy.asm   | 23 +++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm')

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm
index e01b80d4b..f81db28fb 100644
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.asm
@@ -1,4 +1,4 @@
-//------------------------------------------------------------------------------ 
+//------------------------------------------------------------------------------
 //
 // Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>
 //
@@ -27,14 +27,15 @@
 ; );
 ;
 __aeabi_memcpy
-    CMP     r2, #0
-    BXEQ    r14
-loop
-    LDRB    r3, [r1], #1
-    STRB    r3, [r0], #1
-    SUBS    r2, r2, #1
-    BXEQ    r14
-    B       loop
-        
-    END
+  cmp     r2, #0
+  bxeq    lr
+  push    {lr}
+  mov     lr, r0
+L5
+  ldrb  r3, [r1], #1
+  strb  r3, [lr], #1
+  subs r2, r2, #1
+  bne  L5
+  pop  {pc}
 
+  END
\ No newline at end of file
-- 
cgit v1.2.3