1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
|
--- configure.orig 2019-11-26 23:50:00 UTC
+++ configure
@@ -728,12 +728,6 @@ case $host_cpu in
AS_EXT=".asm"
ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -I\$(SRCPATH)/common/x86/"
if [ $compiler = GNU ]; then
- if [[ "$asm" == auto && "$CFLAGS" != *-march* ]]; then
- CFLAGS="$CFLAGS -march=i686"
- fi
- if [[ "$asm" == auto && "$CFLAGS" != *-mfpmath* ]]; then
- CFLAGS="$CFLAGS -mfpmath=sse -msse -msse2"
- fi
CFLAGS="-m32 $CFLAGS"
LDFLAGS="-m32 $LDFLAGS"
fi
@@ -748,7 +742,7 @@ case $host_cpu in
ASFLAGS="$ASFLAGS -f elf32"
fi
;;
- x86_64)
+ amd64|x86_64)
ARCH="X86_64"
AS="${AS-nasm}"
AS_EXT=".asm"
@@ -824,7 +818,7 @@ case $host_cpu in
AS="${AS-${CC}}"
fi
;;
- aarch64)
+ aarch64|arm64)
ARCH="AARCH64"
stack_alignment=16
if [ "$SYS" = MACOSX ] ; then
@@ -937,7 +931,7 @@ if cc_check '' '' '' '__attribute__((force_align_arg_p
fi
fi
-if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
+if [ $cli_libx264 != system -a $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \) ] ; then
if ! as_check "vmovdqa32 [eax]{k1}{z}, zmm0" ; then
VER="$( ($AS --version || echo no assembler) 2>/dev/null | head -n 1 )"
echo "Found $VER"
@@ -950,9 +944,6 @@ if [ $asm = auto -a \( $ARCH = X86 -o $ARCH = X86_64 \
fi
if [ $asm = auto -a $ARCH = ARM ] ; then
- # set flags so neon is built by default
- [ $compiler == CL ] || echo $CFLAGS | grep -Eq '(-mcpu|-march|-mfpu)' || CFLAGS="$CFLAGS -mcpu=cortex-a8 -mfpu=neon"
-
cc_check '' '' '__asm__("add r0, r1, r2");' && define HAVE_ARM_INLINE_ASM
if [ $compiler = CL ] && cpp_check '' '' 'defined(_M_ARM) && _M_ARM >= 7' ; then
define HAVE_ARMV6
@@ -963,9 +954,8 @@ if [ $asm = auto -a $ARCH = ARM ] ; then
cc_check '' '' '__asm__("vadd.i16 q0, q0, q0");' && define HAVE_NEON
ASFLAGS="$ASFLAGS -c"
else
- echo "You specified a pre-ARMv6 or Thumb-1 CPU in your CFLAGS."
- echo "If you really want to run on such a CPU, configure with --disable-asm."
- exit 1
+ echo "No usable SIMD found, assuming --disable-asm."
+ asm="no"
fi
fi
@@ -997,9 +987,8 @@ if [ $asm = auto -a $ARCH = MIPS ] ; then
if cc_check '' '' '__asm__("addvi.b $w0, $w1, 1");' ; then
define HAVE_MSA
else
- echo "You specified a pre-MSA CPU in your CFLAGS."
- echo "If you really want to run on such a CPU, configure with --disable-asm."
- exit 1
+ echo "No usable SIMD found, assuming --disable-asm."
+ asm="no"
fi
fi
@@ -1327,10 +1316,6 @@ if cc_check '' -Wshadow ; then
CFLAGS="-Wshadow $CFLAGS"
fi
-if cc_check '' -Wmaybe-uninitialized ; then
- CFLAGS="-Wno-maybe-uninitialized $CFLAGS"
-fi
-
if [ $compiler = GNU ] && cc_check '' -fvisibility=hidden ; then
CFLAGS="$CFLAGS -fvisibility=hidden"
fi
@@ -1370,6 +1355,9 @@ if [ "$opencl" = "yes" ]; then
opencl="yes"
define HAVE_OPENCL "(BIT_DEPTH==8)"
libdl="-ldl"
+ else
+ opencl="yes"
+ define HAVE_OPENCL "(BIT_DEPTH==8)"
fi
LDFLAGS="$LDFLAGS $libdl"
fi
|
