ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Sun Feb 11 23:18:25 2018 -0300| [4961ddfd3563a075bdea7d729361adc95370d967] | committer: James Almer
Merge commit 'fd36cf6bf6524247a8ff6788c028836fe7d9fd20' * commit 'fd36cf6bf6524247a8ff6788c028836fe7d9fd20': configure: Factorize check_64_bit() Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4961ddfd3563a075bdea7d729361adc95370d967 --- configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 760aae59f0..99c53d482a 100755 --- a/configure +++ b/configure @@ -4864,7 +4864,7 @@ check_host_cflags $host_cflags_speed check_64bit(){ arch32=$1 arch64=$2 - expr=$3 + expr=${3:-'sizeof(void *) > 4'} check_code cc "" "int test[2*($expr) - 1]" && subarch=$arch64 || subarch=$arch32 enable $subarch @@ -4879,23 +4879,23 @@ case "$arch" in enabled shared && enable_weak pic ;; parisc) - check_64bit parisc parisc64 'sizeof(void *) > 4' + check_64bit parisc parisc64 enabled shared && enable_weak pic ;; ppc) - check_64bit ppc ppc64 'sizeof(void *) > 4' + check_64bit ppc ppc64 enabled shared && enable_weak pic ;; s390) - check_64bit s390 s390x 'sizeof(void *) > 4' + check_64bit s390 s390x enabled shared && enable_weak pic ;; sparc) - check_64bit sparc sparc64 'sizeof(void *) > 4' + check_64bit sparc sparc64 enabled shared && enable_weak pic ;; x86) - check_64bit x86_32 x86_64 'sizeof(void *) > 4' + check_64bit x86_32 x86_64 # Treat x32 as x64 for now. Note it also needs pic if shared test "$subarch" = "x86_32" && check_cpp_condition stddef.h 'defined(__x86_64__)' && subarch=x86_64 && enable x86_64 && disable x86_32 ====================================================================== diff --cc configure index 760aae59f0,ed930e6cd4..99c53d482a --- a/configure +++ b/configure @@@ -4895,10 -3804,7 +4895,10 @@@ case "$arch" i enabled shared && enable_weak pic ;; x86) - check_64bit x86_32 x86_64 'sizeof(void *) > 4' + check_64bit x86_32 x86_64 + # Treat x32 as x64 for now. Note it also needs pic if shared + test "$subarch" = "x86_32" && check_cpp_condition stddef.h 'defined(__x86_64__)' && + subarch=x86_64 && enable x86_64 && disable x86_32 if enabled x86_64; then enabled shared && enable_weak pic objformat=elf64 _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
