diff options
| author | James Almer <jamrial@gmail.com> | 2017-11-11 23:41:35 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-11-11 23:41:35 -0300 |
| commit | 12f4e2ba023e4ac286f5b4e8d73de07ea749a888 (patch) | |
| tree | 871f9104eb1882bc98f3451c707a02458dd22938 /libavutil | |
| parent | 4a54ef7a0f4c7ebe3cb0d353bfaa515461846259 (diff) | |
| parent | 0af8a72174108b9bb482f1073a1e9a3bc258af51 (diff) | |
| download | ffmpeg-12f4e2ba023e4ac286f5b4e8d73de07ea749a888.tar.gz | |
Merge commit '0af8a72174108b9bb482f1073a1e9a3bc258af51'
* commit '0af8a72174108b9bb482f1073a1e9a3bc258af51':
build: Drop support for legacy TI ARM compiler
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/intreadwrite.h | 2 | ||||
| -rw-r--r-- | libavutil/mem.h | 7 |
2 files changed, 1 insertions, 8 deletions
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h index 5b4094e6bc..0c0309b4a7 100644 --- a/libavutil/intreadwrite.h +++ b/libavutil/intreadwrite.h @@ -215,7 +215,7 @@ typedef union { * by per-arch headers. */ -#if defined(__GNUC__) && !defined(__TI_COMPILER_VERSION__) +#if defined(__GNUC__) union unaligned_64 { uint64_t l; } __attribute__((packed)) av_alias; union unaligned_32 { uint32_t l; } __attribute__((packed)) av_alias; diff --git a/libavutil/mem.h b/libavutil/mem.h index 49d4b1f2db..e5ca8299dc 100644 --- a/libavutil/mem.h +++ b/libavutil/mem.h @@ -90,13 +90,6 @@ #if defined(__INTEL_COMPILER) && __INTEL_COMPILER < 1110 || defined(__SUNPRO_C) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v #define DECLARE_ASM_CONST(n,t,v) const t __attribute__ ((aligned (n))) v -#elif defined(__TI_COMPILER_VERSION__) - #define DECLARE_ALIGNED(n,t,v) \ - AV_PRAGMA(DATA_ALIGN(v,n)) \ - t __attribute__((aligned(n))) v - #define DECLARE_ASM_CONST(n,t,v) \ - AV_PRAGMA(DATA_ALIGN(v,n)) \ - static const t __attribute__((aligned(n))) v #elif defined(__DJGPP__) #define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (FFMIN(n, 16)))) v #define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (FFMIN(n, 16)))) v |