diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-01 20:15:43 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-01 20:16:33 -0300 |
| commit | 2eb20caccf0f030ddf8766850a177adf4c1d67fd (patch) | |
| tree | a6a41d74a416558ec6bb1197139f9b91473ca08e | |
| parent | e621b1ca646a2f268797adc3194b694a852548d2 (diff) | |
| parent | d76479c5020ca43e67d47ba3767146b192dc4782 (diff) | |
| download | ffmpeg-2eb20caccf0f030ddf8766850a177adf4c1d67fd.tar.gz | |
Merge commit 'd76479c5020ca43e67d47ba3767146b192dc4782'
* commit 'd76479c5020ca43e67d47ba3767146b192dc4782':
ppc: Drop support for Apple GCC
Merged-by: James Almer <jamrial@gmail.com>
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | libavutil/ppc/util_altivec.h | 5 |
2 files changed, 4 insertions, 11 deletions
@@ -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 |