Add assembly.h for use in .S files.
llvm-svn: 85263
diff --git a/compiler-rt/lib/arm/Makefile.mk b/compiler-rt/lib/arm/Makefile.mk
index 7f9a982..ac08a61 100644
--- a/compiler-rt/lib/arm/Makefile.mk
+++ b/compiler-rt/lib/arm/Makefile.mk
@@ -17,6 +17,6 @@
Target := Optimized
# FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies := $(wildcard lib/*.h $(Dir)/*.h)
include make/subdir.mk
diff --git a/compiler-rt/lib/arm/adddf3vfp.S b/compiler-rt/lib/arm/adddf3vfp.S
index f4bb1ce..b1f7077 100644
--- a/compiler-rt/lib/arm/adddf3vfp.S
+++ b/compiler-rt/lib/arm/adddf3vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// double __adddf3vfp(double a, double b) { return a + b; }
diff --git a/compiler-rt/lib/arm/addsf3vfp.S b/compiler-rt/lib/arm/addsf3vfp.S
index 81b114f..4a4a041 100644
--- a/compiler-rt/lib/arm/addsf3vfp.S
+++ b/compiler-rt/lib/arm/addsf3vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern float __addsf3vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/bswapdi2.S b/compiler-rt/lib/arm/bswapdi2.S
index 7e1aeb1..70c13e6 100644
--- a/compiler-rt/lib/arm/bswapdi2.S
+++ b/compiler-rt/lib/arm/bswapdi2.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern uint64_t __bswapdi2(uint64_t);
diff --git a/compiler-rt/lib/arm/bswapsi2.S b/compiler-rt/lib/arm/bswapsi2.S
index d7f977e..8f0e1d3 100644
--- a/compiler-rt/lib/arm/bswapsi2.S
+++ b/compiler-rt/lib/arm/bswapsi2.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern uint32_t __bswapsi2(uint32_t);
diff --git a/compiler-rt/lib/arm/divdf3vfp.S b/compiler-rt/lib/arm/divdf3vfp.S
index 59421ef..c62c61e 100644
--- a/compiler-rt/lib/arm/divdf3vfp.S
+++ b/compiler-rt/lib/arm/divdf3vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __divdf3vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/divsf3vfp.S b/compiler-rt/lib/arm/divsf3vfp.S
index 62c79ea..4bf7463 100644
--- a/compiler-rt/lib/arm/divsf3vfp.S
+++ b/compiler-rt/lib/arm/divsf3vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern float __divsf3vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/eqdf2vfp.S b/compiler-rt/lib/arm/eqdf2vfp.S
index 8111a0d5..25cc959 100644
--- a/compiler-rt/lib/arm/eqdf2vfp.S
+++ b/compiler-rt/lib/arm/eqdf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __eqdf2vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/eqsf2vfp.S b/compiler-rt/lib/arm/eqsf2vfp.S
index 7d995b5..a87b767 100644
--- a/compiler-rt/lib/arm/eqsf2vfp.S
+++ b/compiler-rt/lib/arm/eqsf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __eqsf2vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/extendsfdf2vfp.S b/compiler-rt/lib/arm/extendsfdf2vfp.S
index 024bbf0..ea251e2 100644
--- a/compiler-rt/lib/arm/extendsfdf2vfp.S
+++ b/compiler-rt/lib/arm/extendsfdf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __extendsfdf2vfp(float a);
diff --git a/compiler-rt/lib/arm/fixdfsivfp.S b/compiler-rt/lib/arm/fixdfsivfp.S
index 75c322d..4178859 100644
--- a/compiler-rt/lib/arm/fixdfsivfp.S
+++ b/compiler-rt/lib/arm/fixdfsivfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __fixdfsivfp(double a);
diff --git a/compiler-rt/lib/arm/fixsfsivfp.S b/compiler-rt/lib/arm/fixsfsivfp.S
index cd2fbe8..d480390 100644
--- a/compiler-rt/lib/arm/fixsfsivfp.S
+++ b/compiler-rt/lib/arm/fixsfsivfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __fixsfsivfp(float a);
diff --git a/compiler-rt/lib/arm/fixunsdfsivfp.S b/compiler-rt/lib/arm/fixunsdfsivfp.S
index ab6c4df..bd9c1b8 100644
--- a/compiler-rt/lib/arm/fixunsdfsivfp.S
+++ b/compiler-rt/lib/arm/fixunsdfsivfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern unsigned int __fixunsdfsivfp(double a);
diff --git a/compiler-rt/lib/arm/fixunssfsivfp.S b/compiler-rt/lib/arm/fixunssfsivfp.S
index c39c698..c8ce25f 100644
--- a/compiler-rt/lib/arm/fixunssfsivfp.S
+++ b/compiler-rt/lib/arm/fixunssfsivfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern unsigned int __fixunssfsivfp(float a);
diff --git a/compiler-rt/lib/arm/floatsidfvfp.S b/compiler-rt/lib/arm/floatsidfvfp.S
index d402924..b268d04 100644
--- a/compiler-rt/lib/arm/floatsidfvfp.S
+++ b/compiler-rt/lib/arm/floatsidfvfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __floatsidfvfp(int a);
diff --git a/compiler-rt/lib/arm/floatsisfvfp.S b/compiler-rt/lib/arm/floatsisfvfp.S
index 29e7e0d..dea5a4e 100644
--- a/compiler-rt/lib/arm/floatsisfvfp.S
+++ b/compiler-rt/lib/arm/floatsisfvfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern float __floatsisfvfp(int a);
diff --git a/compiler-rt/lib/arm/floatunssidfvfp.S b/compiler-rt/lib/arm/floatunssidfvfp.S
index 148945f..077385e 100644
--- a/compiler-rt/lib/arm/floatunssidfvfp.S
+++ b/compiler-rt/lib/arm/floatunssidfvfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __floatunssidfvfp(unsigned int a);
diff --git a/compiler-rt/lib/arm/floatunssisfvfp.S b/compiler-rt/lib/arm/floatunssisfvfp.S
index c832278..3ad7194 100644
--- a/compiler-rt/lib/arm/floatunssisfvfp.S
+++ b/compiler-rt/lib/arm/floatunssisfvfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern float __floatunssisfvfp(unsigned int a);
diff --git a/compiler-rt/lib/arm/gedf2vfp.S b/compiler-rt/lib/arm/gedf2vfp.S
index 77d07bd..3f2f6c1 100644
--- a/compiler-rt/lib/arm/gedf2vfp.S
+++ b/compiler-rt/lib/arm/gedf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __gedf2vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/gesf2vfp.S b/compiler-rt/lib/arm/gesf2vfp.S
index 205c365..83b2f09 100644
--- a/compiler-rt/lib/arm/gesf2vfp.S
+++ b/compiler-rt/lib/arm/gesf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __gesf2vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/gtdf2vfp.S b/compiler-rt/lib/arm/gtdf2vfp.S
index 8d6ebcf..2daa7c4 100644
--- a/compiler-rt/lib/arm/gtdf2vfp.S
+++ b/compiler-rt/lib/arm/gtdf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __gtdf2vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/gtsf2vfp.S b/compiler-rt/lib/arm/gtsf2vfp.S
index 745a7c6..c388865 100644
--- a/compiler-rt/lib/arm/gtsf2vfp.S
+++ b/compiler-rt/lib/arm/gtsf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __gtsf2vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/ledf2vfp.S b/compiler-rt/lib/arm/ledf2vfp.S
index 4dc9f47..1ab250d 100644
--- a/compiler-rt/lib/arm/ledf2vfp.S
+++ b/compiler-rt/lib/arm/ledf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __ledf2vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/lesf2vfp.S b/compiler-rt/lib/arm/lesf2vfp.S
index b0a17af..8166d4b 100644
--- a/compiler-rt/lib/arm/lesf2vfp.S
+++ b/compiler-rt/lib/arm/lesf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __lesf2vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/ltdf2vfp.S b/compiler-rt/lib/arm/ltdf2vfp.S
index 315bb6f..e17406b 100644
--- a/compiler-rt/lib/arm/ltdf2vfp.S
+++ b/compiler-rt/lib/arm/ltdf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __ltdf2vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/ltsf2vfp.S b/compiler-rt/lib/arm/ltsf2vfp.S
index 18a1cc5..f281a71 100644
--- a/compiler-rt/lib/arm/ltsf2vfp.S
+++ b/compiler-rt/lib/arm/ltsf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __ltsf2vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/muldf3vfp.S b/compiler-rt/lib/arm/muldf3vfp.S
index 5292b8e..7ae256a 100644
--- a/compiler-rt/lib/arm/muldf3vfp.S
+++ b/compiler-rt/lib/arm/muldf3vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __muldf3vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/mulsf3vfp.S b/compiler-rt/lib/arm/mulsf3vfp.S
index e6cdca3..16dbdb2 100644
--- a/compiler-rt/lib/arm/mulsf3vfp.S
+++ b/compiler-rt/lib/arm/mulsf3vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern float __mulsf3vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/nedf2vfp.S b/compiler-rt/lib/arm/nedf2vfp.S
index 8cf4dc2..a7541de 100644
--- a/compiler-rt/lib/arm/nedf2vfp.S
+++ b/compiler-rt/lib/arm/nedf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __nedf2vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/negdf2vfp.S b/compiler-rt/lib/arm/negdf2vfp.S
index b047ccc..bff2767 100644
--- a/compiler-rt/lib/arm/negdf2vfp.S
+++ b/compiler-rt/lib/arm/negdf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __negdf2vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/negsf2vfp.S b/compiler-rt/lib/arm/negsf2vfp.S
index 1b0f3d6..9b0ce28 100644
--- a/compiler-rt/lib/arm/negsf2vfp.S
+++ b/compiler-rt/lib/arm/negsf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern float __negsf2vfp(float a);
diff --git a/compiler-rt/lib/arm/nesf2vfp.S b/compiler-rt/lib/arm/nesf2vfp.S
index da0eef6..ee37c1d 100644
--- a/compiler-rt/lib/arm/nesf2vfp.S
+++ b/compiler-rt/lib/arm/nesf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __nesf2vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/subdf3vfp.S b/compiler-rt/lib/arm/subdf3vfp.S
index c138c3a..ebeca2f 100644
--- a/compiler-rt/lib/arm/subdf3vfp.S
+++ b/compiler-rt/lib/arm/subdf3vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern double __subdf3vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/subsf3vfp.S b/compiler-rt/lib/arm/subsf3vfp.S
index 493a850..3e9d602 100644
--- a/compiler-rt/lib/arm/subsf3vfp.S
+++ b/compiler-rt/lib/arm/subsf3vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern float __subsf3vfp(float a, float b);
diff --git a/compiler-rt/lib/arm/switch.S b/compiler-rt/lib/arm/switch.S
index bfde0da..7b11c4f 100644
--- a/compiler-rt/lib/arm/switch.S
+++ 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
diff --git a/compiler-rt/lib/arm/truncdfsf2vfp.S b/compiler-rt/lib/arm/truncdfsf2vfp.S
index 2e26fdc..0d635be 100644
--- a/compiler-rt/lib/arm/truncdfsf2vfp.S
+++ b/compiler-rt/lib/arm/truncdfsf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern float __truncdfsf2vfp(double a);
diff --git a/compiler-rt/lib/arm/unorddf2vfp.S b/compiler-rt/lib/arm/unorddf2vfp.S
index e458eb8..85968b4 100644
--- a/compiler-rt/lib/arm/unorddf2vfp.S
+++ b/compiler-rt/lib/arm/unorddf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __unorddf2vfp(double a, double b);
diff --git a/compiler-rt/lib/arm/unordsf2vfp.S b/compiler-rt/lib/arm/unordsf2vfp.S
index 6b69080..852d4eb 100644
--- a/compiler-rt/lib/arm/unordsf2vfp.S
+++ b/compiler-rt/lib/arm/unordsf2vfp.S
@@ -7,6 +7,7 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
//
// extern int __unordsf2vfp(float a, float b);
diff --git a/compiler-rt/lib/assembly.h b/compiler-rt/lib/assembly.h
new file mode 100644
index 0000000..808f7e4
--- /dev/null
+++ 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 */
diff --git a/compiler-rt/lib/i386/Makefile.mk b/compiler-rt/lib/i386/Makefile.mk
index 4453e03..3ed4dc8 100644
--- a/compiler-rt/lib/i386/Makefile.mk
+++ b/compiler-rt/lib/i386/Makefile.mk
@@ -17,6 +17,6 @@
Target := Optimized
# FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies := $(wildcard lib/*.h $(Dir)/*.h)
include make/subdir.mk
diff --git a/compiler-rt/lib/i386/ashldi3.S b/compiler-rt/lib/i386/ashldi3.S
index 0d9aba4..7a7906b 100644
--- a/compiler-rt/lib/i386/ashldi3.S
+++ b/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
diff --git a/compiler-rt/lib/i386/ashrdi3.S b/compiler-rt/lib/i386/ashrdi3.S
index 2168014..d0a4c42 100644
--- a/compiler-rt/lib/i386/ashrdi3.S
+++ b/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__
diff --git a/compiler-rt/lib/i386/divdi3.S b/compiler-rt/lib/i386/divdi3.S
index 3b50266..1ce22da 100644
--- a/compiler-rt/lib/i386/divdi3.S
+++ b/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.
diff --git a/compiler-rt/lib/i386/floatdidf.S b/compiler-rt/lib/i386/floatdidf.S
index 34736ac..012697b 100644
--- a/compiler-rt/lib/i386/floatdidf.S
+++ 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__
diff --git a/compiler-rt/lib/i386/floatdisf.S b/compiler-rt/lib/i386/floatdisf.S
index 20b80d1..152a93d 100644
--- a/compiler-rt/lib/i386/floatdisf.S
+++ b/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
diff --git a/compiler-rt/lib/i386/floatdixf.S b/compiler-rt/lib/i386/floatdixf.S
index 71e2d2a..cd85c09 100644
--- a/compiler-rt/lib/i386/floatdixf.S
+++ b/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__
diff --git a/compiler-rt/lib/i386/floatundidf.S b/compiler-rt/lib/i386/floatundidf.S
index 943ec38..e38e455 100644
--- a/compiler-rt/lib/i386/floatundidf.S
+++ b/compiler-rt/lib/i386/floatundidf.S
@@ -11,6 +11,8 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
+
// double __floatundidf(du_int a);
#ifdef __i386__
diff --git a/compiler-rt/lib/i386/floatundisf.S b/compiler-rt/lib/i386/floatundisf.S
index a1b2966..39f9dcf 100644
--- a/compiler-rt/lib/i386/floatundisf.S
+++ b/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
diff --git a/compiler-rt/lib/i386/floatundixf.S b/compiler-rt/lib/i386/floatundixf.S
index c24689a..b858662 100644
--- a/compiler-rt/lib/i386/floatundixf.S
+++ b/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__
diff --git a/compiler-rt/lib/i386/lshrdi3.S b/compiler-rt/lib/i386/lshrdi3.S
index a70113f..fd1fae0 100644
--- a/compiler-rt/lib/i386/lshrdi3.S
+++ b/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
diff --git a/compiler-rt/lib/i386/moddi3.S b/compiler-rt/lib/i386/moddi3.S
index af1f38a..bfc9651 100644
--- a/compiler-rt/lib/i386/moddi3.S
+++ b/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.
diff --git a/compiler-rt/lib/i386/muldi3.S b/compiler-rt/lib/i386/muldi3.S
index 9f29c3c..262556a 100644
--- a/compiler-rt/lib/i386/muldi3.S
+++ 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__
diff --git a/compiler-rt/lib/i386/udivdi3.S b/compiler-rt/lib/i386/udivdi3.S
index 977cee3..c1626ab 100644
--- a/compiler-rt/lib/i386/udivdi3.S
+++ b/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.
diff --git a/compiler-rt/lib/i386/umoddi3.S b/compiler-rt/lib/i386/umoddi3.S
index 2ddd710..7e4f84a 100644
--- a/compiler-rt/lib/i386/umoddi3.S
+++ 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.
diff --git a/compiler-rt/lib/ppc/Makefile.mk b/compiler-rt/lib/ppc/Makefile.mk
index 8065472..34c9372 100644
--- a/compiler-rt/lib/ppc/Makefile.mk
+++ b/compiler-rt/lib/ppc/Makefile.mk
@@ -17,6 +17,6 @@
Target := Optimized
# FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies := $(wildcard lib/*.h $(Dir)/*.h)
include make/subdir.mk
diff --git a/compiler-rt/lib/ppc/restFP.S b/compiler-rt/lib/ppc/restFP.S
index 8fd8fa1..8d27d04 100644
--- a/compiler-rt/lib/ppc/restFP.S
+++ b/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
diff --git a/compiler-rt/lib/ppc/saveFP.S b/compiler-rt/lib/ppc/saveFP.S
index ef0590f..ad9b187 100644
--- a/compiler-rt/lib/ppc/saveFP.S
+++ b/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
diff --git a/compiler-rt/lib/x86_64/Makefile.mk b/compiler-rt/lib/x86_64/Makefile.mk
index d6a2ac7..950f2fc 100644
--- a/compiler-rt/lib/x86_64/Makefile.mk
+++ b/compiler-rt/lib/x86_64/Makefile.mk
@@ -17,6 +17,6 @@
Target := Optimized
# FIXME: use automatic dependencies?
-Dependencies := $(wildcard $(Dir)/*.h)
+Dependencies := $(wildcard lib/*.h $(Dir)/*.h)
include make/subdir.mk
diff --git a/compiler-rt/lib/x86_64/floatundidf.S b/compiler-rt/lib/x86_64/floatundidf.S
index 4ccaac2..fea46af 100644
--- a/compiler-rt/lib/x86_64/floatundidf.S
+++ b/compiler-rt/lib/x86_64/floatundidf.S
@@ -11,6 +11,8 @@
//
//===----------------------------------------------------------------------===//
+#include "../assembly.h"
+
// double __floatundidf(du_int a);
#ifdef __x86_64__
diff --git a/compiler-rt/lib/x86_64/floatundisf.S b/compiler-rt/lib/x86_64/floatundisf.S
index b408687..4cbbf20 100644
--- a/compiler-rt/lib/x86_64/floatundisf.S
+++ b/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__
diff --git a/compiler-rt/lib/x86_64/floatundixf.S b/compiler-rt/lib/x86_64/floatundixf.S
index 0764da4..47a0ff4 100644
--- a/compiler-rt/lib/x86_64/floatundixf.S
+++ b/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__
