ffmpeg | branch: master | James Almer <jamr...@gmail.com> | Wed Nov 1 20:15:43 2017 -0300| [2eb20caccf0f030ddf8766850a177adf4c1d67fd] | committer: James Almer
Merge commit 'd76479c5020ca43e67d47ba3767146b192dc4782' * commit 'd76479c5020ca43e67d47ba3767146b192dc4782': ppc: Drop support for Apple GCC Merged-by: James Almer <jamr...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2eb20caccf0f030ddf8766850a177adf4c1d67fd --- configure | 10 +++------- libavutil/ppc/util_altivec.h | 5 +---- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/configure b/configure index 998ac74e9e..0593be28af 100755 --- a/configure +++ b/configure @@ -1908,7 +1908,6 @@ HAVE_LIST_PUB=" " HEADERS_LIST=" - altivec_h arpa_inet_h asm_types_h cdio_paranoia_h @@ -5579,15 +5578,12 @@ elif enabled ppc; then check_inline_asm ppc4xx '"maclhw r10, r11, r12"' check_inline_asm xform_asm '"lwzx %1, %y0" :: "Z"(*(int*)0), "r"(0)' - # AltiVec flags: The FSF version of GCC differs from the Apple version if enabled altivec; then - check_cflags -maltivec -mabi=altivec && - { check_header altivec.h && inc_altivec_h="#include <altivec.h>" ; } || - check_cflags -faltivec + check_cflags -maltivec -mabi=altivec # check if our compiler supports Motorola AltiVec C API check_cc <<EOF || disable altivec -$inc_altivec_h +#include <altivec.h> int main(void) { vector signed int v1 = (vector signed int) { 0 }; vector signed int v2 = (vector signed int) { 1 }; @@ -5602,7 +5598,7 @@ EOF if enabled vsx; then check_cflags -mvsx && check_cc <<EOF || disable vsx -$inc_altivec_h +#include <altivec.h> int main(void) { int v[4] = { 0 }; vector signed int v1 = vec_vsx_ld(0, v); diff --git a/libavutil/ppc/util_altivec.h b/libavutil/ppc/util_altivec.h index 6ab7e5083f..2548011be5 100644 --- a/libavutil/ppc/util_altivec.h +++ b/libavutil/ppc/util_altivec.h @@ -28,10 +28,6 @@ #include "config.h" -#if HAVE_ALTIVEC_H -#include <altivec.h> -#endif - /*********************************************************************** * Vector types **********************************************************************/ @@ -56,6 +52,7 @@ #define zero_s32v (vec_s32) zerov #if HAVE_ALTIVEC +#include <altivec.h> // used to build registers permutation vectors (vcprm) // the 's' are for words in the _s_econd vector ====================================================================== diff --cc configure index 998ac74e9e,b0be55a66e..0593be28af --- a/configure +++ b/configure @@@ -1908,12 -1545,11 +1908,11 @@@ HAVE_LIST_PUB= " HEADERS_LIST=" - altivec_h - AVFoundation_AVFoundation_h - alsa_asoundlib_h arpa_inet_h + asm_types_h cdio_paranoia_h cdio_paranoia_paranoia_h + cuda_h d3d11_h dispatch_dispatch_h dev_bktr_ioctl_bt848_h _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
