blob: 6ca2a5b9487a7db9856fdb66bbc0afc06213d4b1 (
plain) (
blame)
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
|
--- configure.orig 2015-06-29 20:45:09 UTC
+++ configure
@@ -677,12 +677,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
@@ -697,7 +691,7 @@ case $host_cpu in
ASFLAGS="$ASFLAGS -f elf32"
fi
;;
- x86_64)
+ x86_64|amd64)
ARCH="X86_64"
AS="${AS-yasm}"
AS_EXT=".asm"
@@ -761,7 +755,7 @@ case $host_cpu in
AS="${AS-${CC}}"
fi
;;
- aarch64)
+ aarch64|arm64)
ARCH="AARCH64"
stack_alignment=16
if [ "$SYS" = MACOSX ] ; then
@@ -1225,10 +1219,6 @@ if cc_check '' -Wshadow ; then
CFLAGS="-Wshadow $CFLAGS"
fi
-if cc_check '' -Wmaybe-uninitialized ; then
- CFLAGS="-Wno-maybe-uninitialized $CFLAGS"
-fi
-
if [ $compiler = ICC -o $compiler = ICL ] ; then
if cc_check 'extras/intel_dispatcher.h' '' 'x264_intel_dispatcher_override();' ; then
define HAVE_INTEL_DISPATCHER
@@ -1128,6 +1118,9 @@ if [ "$opencl" = "yes" ]; then
opencl="yes"
define HAVE_OPENCL
libdl="-ldl"
+ else
+ opencl="yes"
+ define HAVE_OPENCL
fi
LDFLAGS="$LDFLAGS $libdl"
fi
|
