Index: lib/builtins/CMakeLists.txt
===================================================================
--- lib/builtins/CMakeLists.txt
+++ lib/builtins/CMakeLists.txt
@@ -42,6 +42,8 @@
   ashlti3.c
   ashrdi3.c
   ashrti3.c
+  bswapdi2.c
+  bswapsi2.c
   clear_cache.c
   clzdi2.c
   clzsi2.c
Index: lib/builtins/README.txt
===================================================================
--- lib/builtins/README.txt
+++ lib/builtins/README.txt
@@ -57,8 +57,8 @@
 si_int __popcountdi2(di_int a);  // bit population
 si_int __popcountti2(ti_int a);  // bit population
 
-uint32_t __bswapsi2(uint32_t a);   // a byteswapped, arm only
-uint64_t __bswapdi2(uint64_t a);   // a byteswapped, arm only
+uint32_t __bswapsi2(uint32_t a);   // a byteswapped
+uint64_t __bswapdi2(uint64_t a);   // a byteswapped
 
 // Integral arithmetic
 
Index: lib/builtins/bswapdi2.c
===================================================================
--- /dev/null
+++ lib/builtins/bswapdi2.c
@@ -0,0 +1,28 @@
+/* ===-- bswapdi2.c - Implement __bswapdi2 ---------------------------------===
+ *
+ *               The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===----------------------------------------------------------------------===
+ *
+ * This file implements __bswapdi2 for the compiler_rt library.
+ *
+ * ===----------------------------------------------------------------------===
+ */
+
+#include "int_lib.h"
+
+COMPILER_RT_ABI uint64_t
+__bswapdi2 (uint64_t u)
+{
+	return ((((u) & 0xff00000000000000ULL) >> 56)
+	    | (((u) & 0x00ff000000000000ULL) >> 40)
+	    | (((u) & 0x0000ff0000000000ULL) >> 24)
+	    | (((u) & 0x000000ff00000000ULL) >>  8)
+	    | (((u) & 0x00000000ff000000ULL) <<  8)
+	    | (((u) & 0x0000000000ff0000ULL) << 24)
+	    | (((u) & 0x000000000000ff00ULL) << 40)
+	    | (((u) & 0x00000000000000ffULL) << 56));
+}
Index: lib/builtins/bswapsi2.c
===================================================================
--- /dev/null
+++ lib/builtins/bswapsi2.c
@@ -0,0 +1,25 @@
+/* ===-- bswapsi2.c - Implement __bswapsi2 ---------------------------------===
+ *
+ *               The LLVM Compiler Infrastructure
+ *
+ * This file is dual licensed under the MIT and the University of Illinois Open
+ * Source Licenses. See LICENSE.TXT for details.
+ *
+ * ===----------------------------------------------------------------------===
+ *
+ * This file implements __bswapsi2 for the compiler_rt library.
+ *
+ * ===----------------------------------------------------------------------===
+ */
+
+#include "int_lib.h"
+
+COMPILER_RT_ABI uint32_t
+__bswapsi2 (uint32_t u)
+{
+
+	return ((((u) & 0xff000000) >> 24)
+	    | (((u) & 0x00ff0000) >>  8)
+	    | (((u) & 0x0000ff00) <<  8)
+	    | (((u) & 0x000000ff) << 24));
+}
Index: test/builtins/Unit/bswapdi2_test.c
===================================================================
--- test/builtins/Unit/bswapdi2_test.c
+++ test/builtins/Unit/bswapdi2_test.c
@@ -21,7 +21,6 @@
 
 extern uint64_t __bswapdi2(uint64_t);
 
-#if __arm__
 int test__bswapdi2(uint64_t a, uint64_t expected)
 {
     uint64_t actual = __bswapdi2(a);
@@ -30,17 +29,12 @@
                a, actual, expected);
     return actual != expected;
 }
-#endif
 
 int main()
 {
-#if __arm__
     if (test__bswapdi2(0x123456789ABCDEF0LL, 0xF0DEBC9A78563412LL))
         return 1;
     if (test__bswapdi2(0x0000000100000002LL, 0x0200000001000000LL))
         return 1;
-#else
-    printf("skipped\n");
-#endif
     return 0;
 }
Index: test/builtins/Unit/bswapsi2_test.c
===================================================================
--- test/builtins/Unit/bswapsi2_test.c
+++ test/builtins/Unit/bswapsi2_test.c
@@ -21,7 +21,6 @@
 
 extern uint32_t __bswapsi2(uint32_t);
 
-#if __arm__
 int test__bswapsi2(uint32_t a, uint32_t expected)
 {
     uint32_t actual = __bswapsi2(a);
@@ -30,17 +29,12 @@
                a, actual, expected);
     return actual != expected;
 }
-#endif
 
 int main()
 {
-#if __arm__
     if (test__bswapsi2(0x12345678, 0x78563412))
         return 1;
     if (test__bswapsi2(0x00000001, 0x01000000))
         return 1;
-#else
-    printf("skipped\n");
-#endif
     return 0;
 }