[x264-devel] arm: Check for __ELF__ instead of !__APPLE__, for using .arch/.fpu

Martin Storsjö git at videolan.org
Mon Dec 25 20:40:05 CET 2017


x264 | branch: master | Martin Storsjö <martin at martin.st> | Mon Oct 16 22:50:26 2017 +0300| [7b13b31be60ed65bee615bab28c422e2df027ee1] | committer: Anton Mitrofanov

arm: Check for __ELF__ instead of !__APPLE__, for using .arch/.fpu

For windows, when building with armasm, we already filtered these out
with gas-preprocessor.

By filtering them out already in the source, we can also build directly
with clang for windows (which also require wrapping the assembler in
gas-preprocessor for converting instructions to thumb form, but
gas-preprocessor doesn't and shouldn't filter out them in the clang
configuration).

> http://git.videolan.org/gitweb.cgi/x264.git/?a=commit;h=7b13b31be60ed65bee615bab28c422e2df027ee1
---

 common/arm/asm.S | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/arm/asm.S b/common/arm/asm.S
index 619a509d..37a4229e 100644
--- a/common/arm/asm.S
+++ b/common/arm/asm.S
@@ -28,7 +28,7 @@
 
 .syntax unified
 
-#ifndef __APPLE__
+#ifdef __ELF__
 .arch armv7-a
 .fpu neon
 #endif



More information about the x264-devel mailing list