summaryrefslogtreecommitdiff
authorAlex Smith <alex.smith@warpsharp.info>2013-09-24 08:30:38 (GMT)
committer Diego Biurrun <diego@biurrun.de>2013-09-24 09:29:00 (GMT)
commitd6d27f3e58e6980bce4a490e7d8cc0f6a84521fe (patch)
treea954f69ee93e0e7d63aa179c1028aa6fc30878f0
parent8812a8057f539845f6801cafdf6c481a59e96b48 (diff)
downloadffmpeg-d6d27f3e58e6980bce4a490e7d8cc0f6a84521fe.zip
ffmpeg-d6d27f3e58e6980bce4a490e7d8cc0f6a84521fe.tar.gz
ffmpeg-d6d27f3e58e6980bce4a490e7d8cc0f6a84521fe.tar.bz2
configure: Enable -Qansi-alias for icl 14+
Qansi-alias worked on 12.x, then caused miscompilation on 13.x, but now works again passing all FATE tests for icl version 14. Signed-off-by: Diego Biurrun <diego@biurrun.de>
Diffstat
-rwxr-xr-xconfigure6
1 files changed, 4 insertions, 2 deletions
diff --git a/configure b/configure
index 928e5f4..2e2a151 100755
--- a/configure
+++ b/configure
@@ -4021,8 +4021,10 @@ elif enabled_any msvc icl; then
enabled debug && add_ldflags -debug
enable pragma_deprecated
if enabled icl; then
- # basically -fstrict-aliasing that does not work (correctly) on icl 13.x
- check_cpp_condition "windows.h" "__ICL < 1300" && add_cflags -Qansi-alias
+ # -Qansi-alias is basically -fstrict-aliasing, but does not work
+ # (correctly) on icl 13.x.
+ check_cpp_condition "windows.h" "__ICL < 1300 || __ICL >= 1400" &&
+ add_cflags -Qansi-alias
# icl will pass the inline asm tests but inline asm is currently
# not supported (build will fail)
disable inline_asm