[compiler-rt] r200396 - Move JMP/JMPc definition into assembly.h's ARM block.

[Joerg Sonnenberger]

Author: joerg
Date: Wed Jan 29 07:54:16 2014
New Revision: 200396

URL: http://llvm.org/viewvc/llvm-project?rev=200396&view=rev
Log:
Move JMP/JMPc definition into assembly.h's ARM block.

Modified:
    compiler-rt/trunk/lib/arm/clzdi2.S
    compiler-rt/trunk/lib/arm/clzsi2.S
    compiler-rt/trunk/lib/arm/udivmodsi4.S
    compiler-rt/trunk/lib/arm/udivsi3.S
    compiler-rt/trunk/lib/arm/umodsi3.S
    compiler-rt/trunk/lib/assembly.h

Modified: compiler-rt/trunk/lib/arm/clzdi2.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/clzdi2.S?rev=200396&r1=200395&r2=200396&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/clzdi2.S (original)
+++ compiler-rt/trunk/lib/arm/clzdi2.S Wed Jan 29 07:54:16 2014
@@ -13,12 +13,6 @@
  */
 #include "../assembly.h"
 
-#ifdef ARM_HAS_BX
-#define	JMP(r)	bx	r
-#else
-#define	JMP(r)	mov	pc, r
-#endif
-
 	.syntax unified
 
 	.text

Modified: compiler-rt/trunk/lib/arm/clzsi2.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/clzsi2.S?rev=200396&r1=200395&r2=200396&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/clzsi2.S (original)
+++ compiler-rt/trunk/lib/arm/clzsi2.S Wed Jan 29 07:54:16 2014
@@ -13,12 +13,6 @@
  */
 #include "../assembly.h"
 
-#ifdef ARM_HAS_BX
-#define	JMP(r)	bx	r
-#else
-#define	JMP(r)	mov	pc, r
-#endif
-
 	.syntax unified
 
 	.text

Modified: compiler-rt/trunk/lib/arm/udivmodsi4.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/udivmodsi4.S?rev=200396&r1=200395&r2=200396&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/udivmodsi4.S (original)
+++ compiler-rt/trunk/lib/arm/udivmodsi4.S Wed Jan 29 07:54:16 2014
@@ -16,12 +16,6 @@
 
 	.syntax unified
 
-#ifdef ARM_HAS_BX
-#define	JMP(r)	bx	r
-#else
-#define	JMP(r)	mov	pc, r
-#endif
-
 	.text
 	.p2align 2
 DEFINE_COMPILERRT_FUNCTION(__udivmodsi4)

Modified: compiler-rt/trunk/lib/arm/udivsi3.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/udivsi3.S?rev=200396&r1=200395&r2=200396&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/udivsi3.S (original)
+++ compiler-rt/trunk/lib/arm/udivsi3.S Wed Jan 29 07:54:16 2014
@@ -16,14 +16,6 @@
 
 	.syntax unified
 
-#ifdef ARM_HAS_BX
-#define	JMP(r)		bx	r
-#define	JMPc(r,c)	bx##c	r
-#else
-#define	JMP(r)		mov	pc, r
-#define	JMPc(r,c)	mov##c	pc, r
-#endif
-
 	.text
 	.p2align 2
 DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_uidiv, __udivsi3)

Modified: compiler-rt/trunk/lib/arm/umodsi3.S
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/arm/umodsi3.S?rev=200396&r1=200395&r2=200396&view=diff
==============================================================================
--- compiler-rt/trunk/lib/arm/umodsi3.S (original)
+++ compiler-rt/trunk/lib/arm/umodsi3.S Wed Jan 29 07:54:16 2014
@@ -16,14 +16,6 @@
 
 	.syntax unified
 
-#ifdef ARM_HAS_BX
-#define	JMP(r)		bx	r
-#define	JMPc(r,c)	bx##c	r
-#else
-#define	JMP(r)		mov	pc, r
-#define	JMPc(r,c)	mov##c	pc, r
-#endif
-
 	.text
 	.p2align 2
 DEFINE_COMPILERRT_FUNCTION(__umodsi3)

Modified: compiler-rt/trunk/lib/assembly.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/assembly.h?rev=200396&r1=200395&r2=200396&view=diff
==============================================================================
--- compiler-rt/trunk/lib/assembly.h (original)
+++ compiler-rt/trunk/lib/assembly.h Wed Jan 29 07:54:16 2014
@@ -74,6 +74,14 @@
      (__ARM_ARCH >= 6 || (__ARM_ARCH == 5 && !defined(__ARM_ARCH_5__)))
 # define __ARM_FEATURE_CLZ
 # endif
+
+# ifdef ARM_HAS_BX
+# define JMP(r)		bx	r
+# define JMPc(r,c)	bx##c	r
+# else
+# define JMP(r)		mov	pc, r
+# define JMPc(r,c)	mov##c	pc, r
+# endif
 #endif
 
 #define GLUE2(a, b) a ## b