[FFmpeg-cvslog] Merge commit '0af8a72174108b9bb482f1073a1e9a3bc258af51'
James Almer
git at videolan.org
Sun Nov 12 04:50:06 EET 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 23:41:35 2017 -0300| [12f4e2ba023e4ac286f5b4e8d73de07ea749a888] | committer: James Almer
Merge commit '0af8a72174108b9bb482f1073a1e9a3bc258af51'
* commit '0af8a72174108b9bb482f1073a1e9a3bc258af51':
build: Drop support for legacy TI ARM compiler
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=12f4e2ba023e4ac286f5b4e8d73de07ea749a888
---
compat/tms470/math.h | 30 -------------------------
configure | 58 ------------------------------------------------
libavutil/intreadwrite.h | 2 +-
libavutil/mem.h | 7 ------
4 files changed, 1 insertion(+), 96 deletions(-)
diff --git a/compat/tms470/math.h b/compat/tms470/math.h
deleted file mode 100644
index 0a42743a0b..0000000000
--- a/compat/tms470/math.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of FFmpeg.
- *
- * FFmpeg is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * FFmpeg is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with FFmpeg; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- */
-
-#ifndef COMPAT_TMS470_MATH_H
-#define COMPAT_TMS470_MATH_H
-
-#include_next <math.h>
-
-#undef INFINITY
-#undef NAN
-
-#define INFINITY (*(const float*)((const unsigned []){ 0x7f800000 }))
-#define NAN (*(const float*)((const unsigned []){ 0x7fc00000 }))
-
-#endif /* COMPAT_TMS470_MATH_H */
diff --git a/configure b/configure
index 54237fa65a..a7bc69db03 100755
--- a/configure
+++ b/configure
@@ -4139,35 +4139,6 @@ suncc_flags(){
done
}
-tms470_flags(){
- for flag; do
- case $flag in
- -march=*|-mcpu=*)
- case "${flag#*=}" in
- armv7-a|cortex-a*) echo -mv=7a8 ;;
- armv7-r|cortex-r*) echo -mv=7r4 ;;
- armv7-m|cortex-m*) echo -mv=7m3 ;;
- armv6*|arm11*) echo -mv=6 ;;
- armv5*e|arm[79]*e*|arm9[24]6*|arm96*|arm102[26])
- echo -mv=5e ;;
- armv4*|arm7*|arm9[24]*) echo -mv=4 ;;
- esac
- ;;
- -mfpu=neon) echo --float_support=vfpv3 --neon ;;
- -mfpu=vfp) echo --float_support=vfpv2 ;;
- -mfpu=vfpv3) echo --float_support=vfpv3 ;;
- -mfpu=vfpv3-d16) echo --float_support=vfpv3d16 ;;
- -msoft-float) echo --float_support=vfplib ;;
- -O[0-3]|-mf=*) echo $flag ;;
- -g) echo -g -mn ;;
- -pds=*) echo $flag ;;
- -D*|-I*) echo $flag ;;
- --gcc|--abi=*) echo $flag ;;
- -me) echo $flag ;;
- esac
- done
-}
-
probe_cc(){
pfx=$1
_cc=$2
@@ -4236,16 +4207,6 @@ probe_cc(){
_depflags='-MMD'
_cflags_speed='-O3'
_cflags_size='-Os'
- elif $_cc -version 2>/dev/null | grep -Eq 'TMS470|TI ARM'; then
- _type=tms470
- _ident=$($_cc -version | head -n1 | tr -s ' ')
- _flags='--gcc --abi=eabi -me'
- _cc_e='-ppl -fe=$@'
- _cc_o='-fe=$@'
- _depflags='-ppa -ppd=$(@:.o=.d)'
- _cflags_speed='-O3 -mf=5'
- _cflags_size='-O3 -mf=2'
- _flags_filter=tms470_flags
elif $_cc -v 2>&1 | grep -q clang; then
_type=clang
_ident=$($_cc --version 2>/dev/null | head -n1)
@@ -4431,9 +4392,6 @@ fi
if $ar 2>&1 | grep -q Microsoft; then
arflags="-nologo"
ar_o='-out:$@'
-elif $ar 2>&1 | grep -q 'Texas Instruments'; then
- arflags="rq"
- ar_o='$@'
elif $ar 2>&1 | grep -q 'Usage: ar.*-X.*any'; then
arflags='-Xany -r -c'
ar_o='$@'
@@ -4456,10 +4414,6 @@ if test -n "$sysroot"; then
add_cppflags --sysroot="$sysroot"
add_ldflags --sysroot="$sysroot"
;;
- tms470)
- add_cppflags -I"$sysinclude"
- add_ldflags --sysroot="$sysroot"
- ;;
esac
fi
@@ -5297,15 +5251,6 @@ case $libc_type in
bionic)
add_compat strtod.o strtod=avpriv_strtod
;;
- glibc)
- if enabled tms470; then
- CPPFLAGS="-I${source_path}/compat/tms470 ${CPPFLAGS}"
- add_cppflags -D__USER_LABEL_PREFIX__=
- add_cppflags -D__builtin_memset=memset
- add_cppflags -D__gnuc_va_list=va_list -D_VA_LIST_DEFINED
- add_cflags -pds=48 # incompatible redefinition of macro
- fi
- ;;
esac
check_compile_assert flt_lim "float.h limits.h" "DBL_MAX == (double)DBL_MAX" ||
@@ -6488,9 +6433,6 @@ elif enabled armcc; then
add_cflags -W${armcc_opt},--diag_suppress=3343 # hardfp compat
add_cflags -W${armcc_opt},--diag_suppress=167 # pointer sign
add_cflags -W${armcc_opt},--diag_suppress=513 # pointer sign
-elif enabled tms470; then
- add_cflags -pds=824 -pds=837
- disable inline_asm
elif enabled pathscale; then
add_cflags -fstrict-overflow -OPT:wrap_around_unsafe_opt=OFF
disable inline_asm
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
======================================================================
diff --cc libavutil/mem.h
index 49d4b1f2db,0aee0e0d88..e5ca8299dc
--- a/libavutil/mem.h
+++ b/libavutil/mem.h
@@@ -55,51 -37,10 +55,44 @@@
* @{
*/
+/**
+ * @def DECLARE_ALIGNED(n,t,v)
+ * Declare a variable that is aligned in memory.
+ *
+ * @code{.c}
+ * DECLARE_ALIGNED(16, uint16_t, aligned_int) = 42;
+ * DECLARE_ALIGNED(32, uint8_t, aligned_array)[128];
+ *
+ * // The default-alignment equivalent would be
+ * uint16_t aligned_int = 42;
+ * uint8_t aligned_array[128];
+ * @endcode
+ *
+ * @param n Minimum alignment in bytes
+ * @param t Type of the variable (or array element)
+ * @param v Name of the variable
+ */
-#if defined(__ICC) && __ICC < 1200 || defined(__SUNPRO_C)
+/**
+ * @def DECLARE_ASM_CONST(n,t,v)
+ * Declare a static constant aligned variable appropriate for use in inline
+ * assembly code.
+ *
+ * @code{.c}
+ * DECLARE_ASM_CONST(16, uint64_t, pw_08) = UINT64_C(0x0008000800080008);
+ * @endcode
+ *
+ * @param n Minimum alignment in bytes
+ * @param t Type of the variable (or array element)
+ * @param v Name of the variable
+ */
+
+#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
#elif defined(__GNUC__) || defined(__clang__)
#define DECLARE_ALIGNED(n,t,v) t __attribute__ ((aligned (n))) v
#define DECLARE_ASM_CONST(n,t,v) static const t av_used __attribute__ ((aligned (n))) v
More information about the ffmpeg-cvslog
mailing list