Add assembly.h for use in .S files.

llvm-svn: 85263

compiler-rt/lib/arm/Makefile.mk

@@ -17,6 +17,6 @@ ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
 Target := Optimized
 
 # FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies := $(wildcard lib/*.h $(Dir)/*.h)
 
 include make/subdir.mk

compiler-rt/lib/arm/adddf3vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // double __adddf3vfp(double a, double b) { return a + b; }

compiler-rt/lib/arm/addsf3vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern float __addsf3vfp(float a, float b);

compiler-rt/lib/arm/bswapdi2.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern uint64_t __bswapdi2(uint64_t);

compiler-rt/lib/arm/bswapsi2.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern uint32_t __bswapsi2(uint32_t);

compiler-rt/lib/arm/divdf3vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __divdf3vfp(double a, double b);

compiler-rt/lib/arm/divsf3vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern float __divsf3vfp(float a, float b);

compiler-rt/lib/arm/eqdf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __eqdf2vfp(double a, double b);

compiler-rt/lib/arm/eqsf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __eqsf2vfp(float a, float b);

compiler-rt/lib/arm/extendsfdf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __extendsfdf2vfp(float a);

compiler-rt/lib/arm/fixdfsivfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __fixdfsivfp(double a);

compiler-rt/lib/arm/fixsfsivfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __fixsfsivfp(float a);

compiler-rt/lib/arm/fixunsdfsivfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern unsigned int __fixunsdfsivfp(double a);

compiler-rt/lib/arm/fixunssfsivfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern unsigned int __fixunssfsivfp(float a);

compiler-rt/lib/arm/floatsidfvfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __floatsidfvfp(int a);

compiler-rt/lib/arm/floatsisfvfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern float __floatsisfvfp(int a);

compiler-rt/lib/arm/floatunssidfvfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __floatunssidfvfp(unsigned int a);

compiler-rt/lib/arm/floatunssisfvfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern float __floatunssisfvfp(unsigned int a);

compiler-rt/lib/arm/gedf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __gedf2vfp(double a, double b);

compiler-rt/lib/arm/gesf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __gesf2vfp(float a, float b);

compiler-rt/lib/arm/gtdf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __gtdf2vfp(double a, double b);

compiler-rt/lib/arm/gtsf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __gtsf2vfp(float a, float b);

compiler-rt/lib/arm/ledf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __ledf2vfp(double a, double b);

compiler-rt/lib/arm/lesf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __lesf2vfp(float a, float b);

compiler-rt/lib/arm/ltdf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __ltdf2vfp(double a, double b);

compiler-rt/lib/arm/ltsf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __ltsf2vfp(float a, float b);

compiler-rt/lib/arm/muldf3vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __muldf3vfp(double a, double b);

compiler-rt/lib/arm/mulsf3vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern float __mulsf3vfp(float a, float b);

compiler-rt/lib/arm/nedf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __nedf2vfp(double a, double b);

compiler-rt/lib/arm/negdf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __negdf2vfp(double a, double b);

compiler-rt/lib/arm/negsf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern float __negsf2vfp(float a);

compiler-rt/lib/arm/nesf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __nesf2vfp(float a, float b);

compiler-rt/lib/arm/subdf3vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern double __subdf3vfp(double a, double b);

compiler-rt/lib/arm/subsf3vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern float __subsf3vfp(float a, float b);

compiler-rt/lib/arm/switch.S

@@ -7,6 +7,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
+
 //
 // When compiling switch statements in thumb mode, the compiler 
 // can use these __switch* helper functions  The compiler emits a blx to 

compiler-rt/lib/arm/truncdfsf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern float __truncdfsf2vfp(double a);

compiler-rt/lib/arm/unorddf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __unorddf2vfp(double a, double b);

compiler-rt/lib/arm/unordsf2vfp.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // extern int __unordsf2vfp(float a, float b);

compiler-rt/lib/assembly.h

@@ -0,0 +1,42 @@
+/* ===-- assembly.h - compiler-rt assembler support macros -----------------===
+ *
+ *                     The LLVM Compiler Infrastructure
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ * ===----------------------------------------------------------------------===
+ *
+ * This file defines macros for use in compiler-rt assembler source.
+ * This file is not part of the interface of this library.
+ *
+ * ===----------------------------------------------------------------------===
+ */
+
+#ifndef COMPILERRT_ASSEMBLY_H
+#define COMPILERRT_ASSEMBLY_H
+
+// Define SYMBOL_NAME to add the appropriate symbol prefix; we can't use
+// USER_LABEL_PREFIX directly because of cpp brokenness.
+#if defined(__POWERPC__) || defined(__powerpc__) || defined(__ppc__)
+
+#define SYMBOL_NAME(name) name
+#define SEPARATOR @
+
+#else
+
+#define SYMBOL_NAME(name) _##name
+#define SEPARATOR ;
+
+#endif
+
+#define DEFINE_COMPILERRT_FUNCTION(name) \
+  .globl SYMBOL_NAME(name) SEPARATOR     \
+  SYMBOL_NAME(name):
+
+#define DEFINE_COMPILERRT_PRIVATE_FUNCTION(name) \
+  .globl SYMBOL_NAME(name) SEPARATOR             \
+  .private_extern SYMBOL_NAME(name) SEPARATOR    \
+  SYMBOL_NAME(name):
+
+#endif /* COMPILERRT_ASSEMBLY_H */

compiler-rt/lib/i386/Makefile.mk

@@ -17,6 +17,6 @@ ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
 Target := Optimized
 
 # FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies := $(wildcard lib/*.h $(Dir)/*.h)
 
 include make/subdir.mk

compiler-rt/lib/i386/ashldi3.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // di_int __ashldi3(di_int input, int count);
 
 // This routine has some extra memory traffic, loading the 64-bit input via two

compiler-rt/lib/i386/ashrdi3.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // di_int __ashrdi3(di_int input, int count);
 
 #ifdef __i386__

compiler-rt/lib/i386/divdi3.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // di_int __divdi3(di_int a, di_int b);
 
 // result = a / b.

compiler-rt/lib/i386/floatdidf.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // double __floatundidf(du_int a);
 
 #ifdef __i386__

compiler-rt/lib/i386/floatdisf.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // float __floatdisf(di_int a);
 
 // This routine has some extra memory traffic, loading the 64-bit input via two

compiler-rt/lib/i386/floatdixf.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // float __floatdixf(di_int a);
 
 #ifdef __i386__

compiler-rt/lib/i386/floatundidf.S

@@ -11,6 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
+
 // double __floatundidf(du_int a);
 
 #ifdef __i386__

compiler-rt/lib/i386/floatundisf.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // float __floatundisf(du_int a);
 
 // Note that there is a hardware instruction, fildll, that does most of what

compiler-rt/lib/i386/floatundixf.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // long double __floatundixf(du_int a);16
 
 #ifdef __i386__

compiler-rt/lib/i386/lshrdi3.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // di_int __lshrdi3(di_int input, int count);
 
 // This routine has some extra memory traffic, loading the 64-bit input via two

compiler-rt/lib/i386/moddi3.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // di_int __moddi3(di_int a, di_int b);
 
 // result = remainder of a / b.

compiler-rt/lib/i386/muldi3.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // di_int __muldi3(di_int a, di_int b);
 
 #ifdef __i386__

compiler-rt/lib/i386/udivdi3.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // du_int __udivdi3(du_int a, du_int b);
 
 // result = a / b.

compiler-rt/lib/i386/umoddi3.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // du_int __umoddi3(du_int a, du_int b);
 
 // result = remainder of a / b.

compiler-rt/lib/ppc/Makefile.mk

@@ -17,6 +17,6 @@ ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
 Target := Optimized
 
 # FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies := $(wildcard lib/*.h $(Dir)/*.h)
 
 include make/subdir.mk

compiler-rt/lib/ppc/restFP.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // Helper function used by compiler to restore ppc floating point registers at

compiler-rt/lib/ppc/saveFP.S

@@ -7,6 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
 
 //
 // Helper function used by compiler to save ppc floating point registers in

compiler-rt/lib/x86_64/Makefile.mk

@@ -17,6 +17,6 @@ ObjNames := $(Sources:%.c=%.o) $(AsmSources:%.S=%.o)
 Target := Optimized
 
 # FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies := $(wildcard lib/*.h $(Dir)/*.h)
 
 include make/subdir.mk

compiler-rt/lib/x86_64/floatundidf.S

@@ -11,6 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "../assembly.h"
+
 // double __floatundidf(du_int a);
 
 #ifdef __x86_64__

compiler-rt/lib/x86_64/floatundisf.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // float __floatundisf(du_int a);
 
 #ifdef __x86_64__

compiler-rt/lib/x86_64/floatundixf.S

@@ -1,6 +1,8 @@
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 
+#include "../assembly.h"
+
 // long double __floatundixf(du_int a);
 
 #ifdef __x86_64__