diff --git a/compiler-rt/lib/i386/floatdidf.S b/compiler-rt/lib/i386/floatdidf.S
index 8bf9f0dfc50c..3a526eab9f96 100644
--- a/compiler-rt/lib/i386/floatdidf.S
+++ b/compiler-rt/lib/i386/floatdidf.S
@@ -7,7 +7,9 @@
 
 #ifdef __i386__
 
+#ifndef __ELF__
 .const
+#endif
 .align 4
 twop52: .quad 0x4330000000000000
 twop32: .quad 0x41f0000000000000
diff --git a/compiler-rt/lib/i386/floatdixf.S b/compiler-rt/lib/i386/floatdixf.S
index 10f900e289d9..f0271abcbdc2 100644
--- a/compiler-rt/lib/i386/floatdixf.S
+++ b/compiler-rt/lib/i386/floatdixf.S
@@ -26,4 +26,4 @@ DEFINE_COMPILERRT_FUNCTION(__floatdixf)
 	fildll		4(%esp)
 	ret
 
-#endif // __i386__
\ No newline at end of file
+#endif // __i386__
diff --git a/compiler-rt/lib/i386/floatundidf.S b/compiler-rt/lib/i386/floatundidf.S
index 6f2acdb3cd2d..7186a355d96c 100644
--- a/compiler-rt/lib/i386/floatundidf.S
+++ b/compiler-rt/lib/i386/floatundidf.S
@@ -17,7 +17,9 @@
 
 #ifdef __i386__
 
+#ifndef __ELF__
 .const
+#endif
 .align 4
 twop52: .quad 0x4330000000000000
 twop84_plus_twop52:
diff --git a/compiler-rt/lib/i386/floatundisf.S b/compiler-rt/lib/i386/floatundisf.S
index 497fa290dfc7..070820c9d4d2 100644
--- a/compiler-rt/lib/i386/floatundisf.S
+++ b/compiler-rt/lib/i386/floatundisf.S
@@ -51,8 +51,12 @@ DEFINE_COMPILERRT_FUNCTION(__floatundisf)
 
 #ifdef __i386__
 
+#ifndef __ELF__
 .const
 .align 3
+#else
+.align 8
+#endif
 twop52: .quad 0x4330000000000000
 		.quad 0x0000000000000fff
 sticky: .quad 0x0000000000000000
diff --git a/compiler-rt/lib/i386/floatundixf.S b/compiler-rt/lib/i386/floatundixf.S
index 7264f3f72ca3..2cf6d5c2a6ee 100644
--- a/compiler-rt/lib/i386/floatundixf.S
+++ b/compiler-rt/lib/i386/floatundixf.S
@@ -7,7 +7,9 @@
 
 #ifdef __i386__
 
+#ifndef __ELF__
 .const
+#endif
 .align 4
 twop52: .quad 0x4330000000000000
 twop84_plus_twop52_neg:
@@ -32,4 +34,4 @@ DEFINE_COMPILERRT_FUNCTION(__floatundixf)
 	faddl	4(%esp)
 	ret
 	
-#endif // __i386__
\ No newline at end of file
+#endif // __i386__
diff --git a/compiler-rt/lib/x86_64/floatundidf.S b/compiler-rt/lib/x86_64/floatundidf.S
index 419a6e1b06e7..6e684b2a4cab 100644
--- a/compiler-rt/lib/x86_64/floatundidf.S
+++ b/compiler-rt/lib/x86_64/floatundidf.S
@@ -17,7 +17,9 @@
 
 #ifdef __x86_64__
 
+#ifndef __ELF__
 .const
+#endif
 .align 4
 twop52: .quad 0x4330000000000000
 twop84_plus_twop52:
@@ -38,4 +40,4 @@ DEFINE_COMPILERRT_FUNCTION(__floatundidf)
 	addsd	%xmm1,							%xmm0 // a_hi + a_lo   (round happens here)
 	ret
 	
-#endif // __x86_64__
\ No newline at end of file
+#endif // __x86_64__
diff --git a/compiler-rt/lib/x86_64/floatundisf.S b/compiler-rt/lib/x86_64/floatundisf.S
index 76b54ebc00d1..fe209632a38e 100644
--- a/compiler-rt/lib/x86_64/floatundisf.S
+++ b/compiler-rt/lib/x86_64/floatundisf.S
@@ -7,7 +7,9 @@
 
 #ifdef __x86_64__
 
+#ifndef __ELF__
 .literal4
+#endif
 two: .single 2.0
 
 #define REL_ADDR(_a)	(_a)(%rip)
@@ -28,4 +30,4 @@ DEFINE_COMPILERRT_FUNCTION(__floatundisf)
 	mulss	REL_ADDR(two),	%xmm0
 	ret
 	
-#endif // __x86_64__
\ No newline at end of file
+#endif // __x86_64__
diff --git a/compiler-rt/lib/x86_64/floatundixf.S b/compiler-rt/lib/x86_64/floatundixf.S
index 5f484855a23c..246f0266c8a1 100644
--- a/compiler-rt/lib/x86_64/floatundixf.S
+++ b/compiler-rt/lib/x86_64/floatundixf.S
@@ -7,7 +7,9 @@
 
 #ifdef __x86_64__
 
+#ifndef __ELF__
 .const
+#endif
 .align 4
 twop64: .quad 0x43f0000000000000
 
@@ -57,4 +59,4 @@ DEFINE_COMPILERRT_FUNCTION(__floatundixf)
 
 #endif // __x86_64__
 
-*/
\ No newline at end of file
+*/