summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaleem Abdulrasool <compnerd@compnerd.org>2014-07-27 02:01:20 +0000
committerSaleem Abdulrasool <compnerd@compnerd.org>2014-07-27 02:01:20 +0000
commitb6690c34cfff7ee27acb157c9d7afa3c165baf24 (patch)
treeaa96788470446032c9170b21853d3668d0086993
parent31306b15713a32d56278520d242fb8e4a557bd49 (diff)
downloadbcm5719-llvm-b6690c34cfff7ee27acb157c9d7afa3c165baf24.tar.gz
bcm5719-llvm-b6690c34cfff7ee27acb157c9d7afa3c165baf24.zip
builtins: move macro definitions into assembly.h
The macro definitions are shared across multiple files. Define them once in the assembly.h header rather than redefining it in each file. llvm-svn: 214045
-rw-r--r--compiler-rt/lib/builtins/arm/udivmodsi4.S8
-rw-r--r--compiler-rt/lib/builtins/arm/udivsi3.S8
-rw-r--r--compiler-rt/lib/builtins/arm/umodsi3.S8
-rw-r--r--compiler-rt/lib/builtins/assembly.h8
4 files changed, 8 insertions, 24 deletions
diff --git a/compiler-rt/lib/builtins/arm/udivmodsi4.S b/compiler-rt/lib/builtins/arm/udivmodsi4.S
index dd73c2763f2..441f48dbe39 100644
--- a/compiler-rt/lib/builtins/arm/udivmodsi4.S
+++ b/compiler-rt/lib/builtins/arm/udivmodsi4.S
@@ -21,14 +21,6 @@
.thumb
#endif
-#if __ARM_ARCH_ISA_THUMB == 2
-#define IT(cond) it cond
-#define ITT(cond) itt cond
-#else
-#define IT(cond)
-#define ITT(cond)
-#endif
-
.p2align 2
DEFINE_COMPILERRT_FUNCTION(__udivmodsi4)
#if __ARM_ARCH_EXT_IDIV__
diff --git a/compiler-rt/lib/builtins/arm/udivsi3.S b/compiler-rt/lib/builtins/arm/udivsi3.S
index e6ce817f7f2..7086a44e185 100644
--- a/compiler-rt/lib/builtins/arm/udivsi3.S
+++ b/compiler-rt/lib/builtins/arm/udivsi3.S
@@ -21,14 +21,6 @@
.thumb
#endif
-#if __ARM_ARCH_ISA_THUMB == 2
-#define IT(cond) it cond
-#define ITT(cond) itt cond
-#else
-#define IT(cond)
-#define ITT(cond)
-#endif
-
.p2align 2
DEFINE_AEABI_FUNCTION_ALIAS(__aeabi_uidiv, __udivsi3)
DEFINE_COMPILERRT_FUNCTION(__udivsi3)
diff --git a/compiler-rt/lib/builtins/arm/umodsi3.S b/compiler-rt/lib/builtins/arm/umodsi3.S
index e81af0c142b..93614a01cba 100644
--- a/compiler-rt/lib/builtins/arm/umodsi3.S
+++ b/compiler-rt/lib/builtins/arm/umodsi3.S
@@ -20,14 +20,6 @@
.thumb
#endif
-#if __ARM_ARCH_ISA_THUMB == 2
-#define IT(cond) it cond
-#define ITT(cond) itt cond
-#else
-#define IT(cond)
-#define ITT(cond)
-#endif
-
.p2align 2
DEFINE_COMPILERRT_FUNCTION(__umodsi3)
#if __ARM_ARCH_EXT_IDIV__
diff --git a/compiler-rt/lib/builtins/assembly.h b/compiler-rt/lib/builtins/assembly.h
index d415a5f8d65..8cbd3853011 100644
--- a/compiler-rt/lib/builtins/assembly.h
+++ b/compiler-rt/lib/builtins/assembly.h
@@ -91,6 +91,14 @@
#define JMP(r) mov pc, r
#define JMPc(r, c) mov##c pc, r
#endif
+
+#if __ARM_ARCH_ISA_THUMB == 2
+#define IT(cond) it cond
+#define ITT(cond) itt cond
+#else
+#define IT(cond)
+#define ITT(cond)
+#endif
#endif
#define GLUE2(a, b) a##b
OpenPOWER on IntegriCloud