[FFmpeg-cvslog] Merge commit '09c98327b9f25c6c1716c0ee82ce09d8b484887a'

James Almer git at videolan.org
Sat Nov 11 20:58:03 EET 2017


ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Nov 11 15:56:27 2017 -0300| [c58436881798de119f5a7fa424206e6af53feeca] | committer: James Almer

Merge commit '09c98327b9f25c6c1716c0ee82ce09d8b484887a'

* commit '09c98327b9f25c6c1716c0ee82ce09d8b484887a':
  build: Drop support for Tru64 Unix (OSF/1)

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c58436881798de119f5a7fa424206e6af53feeca
---

 configure                | 42 ------------------------------------------
 libavcodec/alpha/asm.h   | 33 ---------------------------------
 libavutil/intreadwrite.h |  5 -----
 3 files changed, 80 deletions(-)

diff --git a/configure b/configure
index f73f7850c0..c5c89aa6cf 100755
--- a/configure
+++ b/configure
@@ -4000,24 +4000,6 @@ armasm_flags(){
    done
 }
 
-ccc_flags(){
-    for flag; do
-        case $flag in
-            -std=c99)           echo -c99                       ;;
-            -mcpu=*)            echo -arch ${flag#*=}           ;;
-            -mieee)             echo -ieee                      ;;
-            -O*|-fast)          echo $flag                      ;;
-            -fno-math-errno)    echo -assume nomath_errno       ;;
-            -g)                 echo -g3                        ;;
-            -Wall)              echo -msg_enable level2         ;;
-            -Wno-pointer-sign)  echo -msg_disable ptrmismatch1  ;;
-            -Wl,*)              echo $flag                      ;;
-            -f*|-W*)                                            ;;
-            *)                  echo $flag                      ;;
-        esac
-   done
-}
-
 cparser_flags(){
     for flag; do
         case $flag in
@@ -4232,13 +4214,6 @@ probe_cc(){
         _ident=$($_cc -qversion 2>/dev/null | head -n1)
         _cflags_speed='-O5'
         _cflags_size='-O5 -qcompact'
-    elif $_cc -V 2>/dev/null | grep -q Compaq; then
-        _type=ccc
-        _ident=$($_cc -V | head -n1 | cut -d' ' -f1-3)
-        _DEPFLAGS='-M'
-        _cflags_speed='-fast'
-        _cflags_size='-O1'
-        _flags_filter=ccc_flags
     elif $_cc --vsn 2>/dev/null | grep -Eq "ARM (C/C\+\+ )?Compiler"; then
         test -d "$sysroot" || die "No valid sysroot specified."
         _type=armcc
@@ -5183,9 +5158,6 @@ case $target_os in
                       -l:drtaeabi.dso -l:scppnwdl.dso -lsupc++ -lgcc \
                       -l:libc.dso -l:libm.dso -l:euser.dso -l:libcrt0.lib
         ;;
-    osf1)
-        add_cppflags -D_OSF_SOURCE -D_POSIX_PII -D_REENTRANT
-        ;;
     minix)
         ;;
     none)
@@ -5327,8 +5299,6 @@ case $libc_type in
             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
-        elif enabled ccc; then
-            add_ldflags -Wl,-z,now  # calls to libots crash without this
         fi
         ;;
 esac
@@ -6507,12 +6477,6 @@ if enabled icc; then
             check_cflags -falign-stack=maintain-16-byte ||
             disable aligned_stack
     fi
-elif enabled ccc; then
-    # disable some annoying warnings
-    add_cflags -msg_disable bitnotint
-    add_cflags -msg_disable mixfuncvoid
-    add_cflags -msg_disable nonstandcast
-    add_cflags -msg_disable unsupieee
 elif enabled gcc; then
     check_optflags -fno-tree-vectorize
     check_cflags -Werror=format-security
@@ -6611,12 +6575,6 @@ case $ld_type in
     ;;
 esac
 
-case $target_os in
-    osf1)
-        enabled ccc && add_ldflags '-Wl,-expect_unresolved,*'
-    ;;
-esac
-
 enable frame_thread_encoder
 
 enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
diff --git a/libavcodec/alpha/asm.h b/libavcodec/alpha/asm.h
index 827721e777..6d850cecc6 100644
--- a/libavcodec/alpha/asm.h
+++ b/libavcodec/alpha/asm.h
@@ -146,39 +146,6 @@ struct unaligned_long { uint64_t l; } __attribute__((packed));
 #define unpkbw(a)    ({ uint64_t __r; __asm__ (".arch ev6; unpkbw  %r1,%0"     : "=r" (__r) : "rJ"  (a));           __r; })
 #endif
 
-#elif defined(__DECC)           /* Digital/Compaq/hp "ccc" compiler */
-
-#include <c_asm.h>
-#define ldq(p) (*(const uint64_t *) (p))
-#define ldl(p) (*(const int32_t *)  (p))
-#define stq(l, p) do { *(uint64_t *) (p) = (l); } while (0)
-#define stl(l, p) do { *(int32_t *)  (p) = (l); } while (0)
-#define ldq_u(a)     asm ("ldq_u   %v0,0(%a0)", a)
-#define uldq(a)      (*(const __unaligned uint64_t *) (a))
-#define cmpbge(a, b) asm ("cmpbge  %a0,%a1,%v0", a, b)
-#define extql(a, b)  asm ("extql   %a0,%a1,%v0", a, b)
-#define extwl(a, b)  asm ("extwl   %a0,%a1,%v0", a, b)
-#define extqh(a, b)  asm ("extqh   %a0,%a1,%v0", a, b)
-#define zap(a, b)    asm ("zap     %a0,%a1,%v0", a, b)
-#define zapnot(a, b) asm ("zapnot  %a0,%a1,%v0", a, b)
-#define amask(a)     asm ("amask   %a0,%v0", a)
-#define implver()    asm ("implver %v0")
-#define rpcc()       asm ("rpcc           %v0")
-#define minub8(a, b) asm ("minub8  %a0,%a1,%v0", a, b)
-#define minsb8(a, b) asm ("minsb8  %a0,%a1,%v0", a, b)
-#define minuw4(a, b) asm ("minuw4  %a0,%a1,%v0", a, b)
-#define minsw4(a, b) asm ("minsw4  %a0,%a1,%v0", a, b)
-#define maxub8(a, b) asm ("maxub8  %a0,%a1,%v0", a, b)
-#define maxsb8(a, b) asm ("maxsb8  %a0,%a1,%v0", a, b)
-#define maxuw4(a, b) asm ("maxuw4  %a0,%a1,%v0", a, b)
-#define maxsw4(a, b) asm ("maxsw4  %a0,%a1,%v0", a, b)
-#define perr(a, b)   asm ("perr    %a0,%a1,%v0", a, b)
-#define pklb(a)      asm ("pklb    %a0,%v0", a)
-#define pkwb(a)      asm ("pkwb    %a0,%v0", a)
-#define unpkbl(a)    asm ("unpkbl  %a0,%v0", a)
-#define unpkbw(a)    asm ("unpkbw  %a0,%v0", a)
-#define wh64(a)      asm ("wh64    %a0", a)
-
 #else
 #error "Unknown compiler!"
 #endif
diff --git a/libavutil/intreadwrite.h b/libavutil/intreadwrite.h
index d54d4b91d6..5b4094e6bc 100644
--- a/libavutil/intreadwrite.h
+++ b/libavutil/intreadwrite.h
@@ -224,11 +224,6 @@ union unaligned_16 { uint16_t l; } __attribute__((packed)) av_alias;
 #   define AV_RN(s, p) (((const union unaligned_##s *) (p))->l)
 #   define AV_WN(s, p, v) ((((union unaligned_##s *) (p))->l) = (v))
 
-#elif defined(__DECC)
-
-#   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))
-#   define AV_WN(s, p, v) (*((__unaligned uint##s##_t*)(p)) = (v))
-
 #elif defined(_MSC_VER) && (defined(_M_ARM) || defined(_M_X64)) && AV_HAVE_FAST_UNALIGNED
 
 #   define AV_RN(s, p) (*((const __unaligned uint##s##_t*)(p)))


======================================================================

diff --cc configure
index f73f7850c0,ea303a0496..c5c89aa6cf
--- a/configure
+++ b/configure
@@@ -6507,15 -5084,8 +6477,9 @@@ if enabled icc; the
              check_cflags -falign-stack=maintain-16-byte ||
              disable aligned_stack
      fi
- elif enabled ccc; then
-     # disable some annoying warnings
-     add_cflags -msg_disable bitnotint
-     add_cflags -msg_disable mixfuncvoid
-     add_cflags -msg_disable nonstandcast
-     add_cflags -msg_disable unsupieee
  elif enabled gcc; then
      check_optflags -fno-tree-vectorize
 +    check_cflags -Werror=format-security
      check_cflags -Werror=implicit-function-declaration
      check_cflags -Werror=missing-prototypes
      check_cflags -Werror=return-type
@@@ -6611,14 -5172,6 +6575,8 @@@ case $ld_type i
      ;;
  esac
  
- case $target_os in
-     osf1)
-         enabled ccc && add_ldflags '-Wl,-expect_unresolved,*'
-     ;;
- esac
- 
 +enable frame_thread_encoder
 +
  enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
  
  check_deps $CONFIG_LIST       \
diff --cc libavcodec/alpha/asm.h
index 827721e777,0000000000..6d850cecc6
mode 100644,000000..100644
--- a/libavcodec/alpha/asm.h
+++ b/libavcodec/alpha/asm.h
@@@ -1,186 -1,0 +1,153 @@@
 +/*
 + * Alpha optimized DSP utils
 + * Copyright (c) 2002 Falk Hueffner <falk at debian.org>
 + *
 + * 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 AVCODEC_ALPHA_ASM_H
 +#define AVCODEC_ALPHA_ASM_H
 +
 +#include <inttypes.h>
 +
 +#include "libavutil/common.h"
 +
 +#if AV_GCC_VERSION_AT_LEAST(2,96)
 +# define likely(x)      __builtin_expect((x) != 0, 1)
 +# define unlikely(x)    __builtin_expect((x) != 0, 0)
 +#else
 +# define likely(x)      (x)
 +# define unlikely(x)    (x)
 +#endif
 +
 +#define AMASK_BWX (1 << 0)
 +#define AMASK_FIX (1 << 1)
 +#define AMASK_CIX (1 << 2)
 +#define AMASK_MVI (1 << 8)
 +
 +static inline uint64_t BYTE_VEC(uint64_t x)
 +{
 +    x |= x <<  8;
 +    x |= x << 16;
 +    x |= x << 32;
 +    return x;
 +}
 +static inline uint64_t WORD_VEC(uint64_t x)
 +{
 +    x |= x << 16;
 +    x |= x << 32;
 +    return x;
 +}
 +
 +#define sextw(x) ((int16_t) (x))
 +
 +#ifdef __GNUC__
 +#define ldq(p)                                                  \
 +    (((const union {                                            \
 +        uint64_t __l;                                           \
 +        __typeof__(*(p)) __s[sizeof (uint64_t) / sizeof *(p)];  \
 +    } *) (p))->__l)
 +#define ldl(p)                                                  \
 +    (((const union {                                            \
 +        int32_t __l;                                            \
 +        __typeof__(*(p)) __s[sizeof (int32_t) / sizeof *(p)];   \
 +    } *) (p))->__l)
 +#define stq(l, p)                                                       \
 +    do {                                                                \
 +        (((union {                                                      \
 +            uint64_t __l;                                               \
 +            __typeof__(*(p)) __s[sizeof (uint64_t) / sizeof *(p)];      \
 +        } *) (p))->__l) = l;                                            \
 +    } while (0)
 +#define stl(l, p)                                                       \
 +    do {                                                                \
 +        (((union {                                                      \
 +            int32_t __l;                                                \
 +            __typeof__(*(p)) __s[sizeof (int32_t) / sizeof *(p)];       \
 +        } *) (p))->__l) = l;                                            \
 +    } while (0)
 +struct unaligned_long { uint64_t l; } __attribute__((packed));
 +#define ldq_u(p)        (*(const uint64_t *) (((uint64_t) (p)) & ~7ul))
 +#define uldq(a)         (((const struct unaligned_long *) (a))->l)
 +
 +#if AV_GCC_VERSION_AT_LEAST(3,3)
 +#define prefetch(p)     __builtin_prefetch((p), 0, 1)
 +#define prefetch_en(p)  __builtin_prefetch((p), 0, 0)
 +#define prefetch_m(p)   __builtin_prefetch((p), 1, 1)
 +#define prefetch_men(p) __builtin_prefetch((p), 1, 0)
 +#define cmpbge          __builtin_alpha_cmpbge
 +/* Avoid warnings.  */
 +#define extql(a, b)     __builtin_alpha_extql(a, (uint64_t) (b))
 +#define extwl(a, b)     __builtin_alpha_extwl(a, (uint64_t) (b))
 +#define extqh(a, b)     __builtin_alpha_extqh(a, (uint64_t) (b))
 +#define zap             __builtin_alpha_zap
 +#define zapnot          __builtin_alpha_zapnot
 +#define amask           __builtin_alpha_amask
 +#define implver         __builtin_alpha_implver
 +#define rpcc            __builtin_alpha_rpcc
 +#else
 +#define prefetch(p)     __asm__ volatile("ldl $31,%0"  : : "m"(*(const char *) (p)) : "memory")
 +#define prefetch_en(p)  __asm__ volatile("ldq $31,%0"  : : "m"(*(const char *) (p)) : "memory")
 +#define prefetch_m(p)   __asm__ volatile("lds $f31,%0" : : "m"(*(const char *) (p)) : "memory")
 +#define prefetch_men(p) __asm__ volatile("ldt $f31,%0" : : "m"(*(const char *) (p)) : "memory")
 +#define cmpbge(a, b) ({ uint64_t __r; __asm__ ("cmpbge  %r1,%2,%0"  : "=r" (__r) : "rJ"  (a), "rI" (b)); __r; })
 +#define extql(a, b)  ({ uint64_t __r; __asm__ ("extql   %r1,%2,%0"  : "=r" (__r) : "rJ"  (a), "rI" (b)); __r; })
 +#define extwl(a, b)  ({ uint64_t __r; __asm__ ("extwl   %r1,%2,%0"  : "=r" (__r) : "rJ"  (a), "rI" (b)); __r; })
 +#define extqh(a, b)  ({ uint64_t __r; __asm__ ("extqh   %r1,%2,%0"  : "=r" (__r) : "rJ"  (a), "rI" (b)); __r; })
 +#define zap(a, b)    ({ uint64_t __r; __asm__ ("zap     %r1,%2,%0"  : "=r" (__r) : "rJ"  (a), "rI" (b)); __r; })
 +#define zapnot(a, b) ({ uint64_t __r; __asm__ ("zapnot  %r1,%2,%0"  : "=r" (__r) : "rJ"  (a), "rI" (b)); __r; })
 +#define amask(a)     ({ uint64_t __r; __asm__ ("amask   %1,%0"      : "=r" (__r) : "rI"  (a));           __r; })
 +#define implver()    ({ uint64_t __r; __asm__ ("implver %0"         : "=r" (__r));                       __r; })
 +#define rpcc()       ({ uint64_t __r; __asm__ volatile ("rpcc %0"   : "=r" (__r));                       __r; })
 +#endif
 +#define wh64(p) __asm__ volatile("wh64 (%0)" : : "r"(p) : "memory")
 +
 +#if AV_GCC_VERSION_AT_LEAST(3,3) && defined(__alpha_max__)
 +#define minub8  __builtin_alpha_minub8
 +#define minsb8  __builtin_alpha_minsb8
 +#define minuw4  __builtin_alpha_minuw4
 +#define minsw4  __builtin_alpha_minsw4
 +#define maxub8  __builtin_alpha_maxub8
 +#define maxsb8  __builtin_alpha_maxsb8
 +#define maxuw4  __builtin_alpha_maxuw4
 +#define maxsw4  __builtin_alpha_maxsw4
 +#define perr    __builtin_alpha_perr
 +#define pklb    __builtin_alpha_pklb
 +#define pkwb    __builtin_alpha_pkwb
 +#define unpkbl  __builtin_alpha_unpkbl
 +#define unpkbw  __builtin_alpha_unpkbw
 +#else
 +#define minub8(a, b) ({ uint64_t __r; __asm__ (".arch ev6; minub8  %r1,%2,%0"  : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
 +#define minsb8(a, b) ({ uint64_t __r; __asm__ (".arch ev6; minsb8  %r1,%2,%0"  : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
 +#define minuw4(a, b) ({ uint64_t __r; __asm__ (".arch ev6; minuw4  %r1,%2,%0"  : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
 +#define minsw4(a, b) ({ uint64_t __r; __asm__ (".arch ev6; minsw4  %r1,%2,%0"  : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
 +#define maxub8(a, b) ({ uint64_t __r; __asm__ (".arch ev6; maxub8  %r1,%2,%0"  : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
 +#define maxsb8(a, b) ({ uint64_t __r; __asm__ (".arch ev6; maxsb8  %r1,%2,%0"  : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
 +#define maxuw4(a, b) ({ uint64_t __r; __asm__ (".arch ev6; maxuw4  %r1,%2,%0"  : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
 +#define maxsw4(a, b) ({ uint64_t __r; __asm__ (".arch ev6; maxsw4  %r1,%2,%0"  : "=r" (__r) : "%rJ" (a), "rI" (b)); __r; })
 +#define perr(a, b)   ({ uint64_t __r; __asm__ (".arch ev6; perr    %r1,%r2,%0" : "=r" (__r) : "%rJ" (a), "rJ" (b)); __r; })
 +#define pklb(a)      ({ uint64_t __r; __asm__ (".arch ev6; pklb    %r1,%0"     : "=r" (__r) : "rJ"  (a));           __r; })
 +#define pkwb(a)      ({ uint64_t __r; __asm__ (".arch ev6; pkwb    %r1,%0"     : "=r" (__r) : "rJ"  (a));           __r; })
 +#define unpkbl(a)    ({ uint64_t __r; __asm__ (".arch ev6; unpkbl  %r1,%0"     : "=r" (__r) : "rJ"  (a));           __r; })
 +#define unpkbw(a)    ({ uint64_t __r; __asm__ (".arch ev6; unpkbw  %r1,%0"     : "=r" (__r) : "rJ"  (a));           __r; })
 +#endif
 +
- #elif defined(__DECC)           /* Digital/Compaq/hp "ccc" compiler */
- 
- #include <c_asm.h>
- #define ldq(p) (*(const uint64_t *) (p))
- #define ldl(p) (*(const int32_t *)  (p))
- #define stq(l, p) do { *(uint64_t *) (p) = (l); } while (0)
- #define stl(l, p) do { *(int32_t *)  (p) = (l); } while (0)
- #define ldq_u(a)     asm ("ldq_u   %v0,0(%a0)", a)
- #define uldq(a)      (*(const __unaligned uint64_t *) (a))
- #define cmpbge(a, b) asm ("cmpbge  %a0,%a1,%v0", a, b)
- #define extql(a, b)  asm ("extql   %a0,%a1,%v0", a, b)
- #define extwl(a, b)  asm ("extwl   %a0,%a1,%v0", a, b)
- #define extqh(a, b)  asm ("extqh   %a0,%a1,%v0", a, b)
- #define zap(a, b)    asm ("zap     %a0,%a1,%v0", a, b)
- #define zapnot(a, b) asm ("zapnot  %a0,%a1,%v0", a, b)
- #define amask(a)     asm ("amask   %a0,%v0", a)
- #define implver()    asm ("implver %v0")
- #define rpcc()       asm ("rpcc           %v0")
- #define minub8(a, b) asm ("minub8  %a0,%a1,%v0", a, b)
- #define minsb8(a, b) asm ("minsb8  %a0,%a1,%v0", a, b)
- #define minuw4(a, b) asm ("minuw4  %a0,%a1,%v0", a, b)
- #define minsw4(a, b) asm ("minsw4  %a0,%a1,%v0", a, b)
- #define maxub8(a, b) asm ("maxub8  %a0,%a1,%v0", a, b)
- #define maxsb8(a, b) asm ("maxsb8  %a0,%a1,%v0", a, b)
- #define maxuw4(a, b) asm ("maxuw4  %a0,%a1,%v0", a, b)
- #define maxsw4(a, b) asm ("maxsw4  %a0,%a1,%v0", a, b)
- #define perr(a, b)   asm ("perr    %a0,%a1,%v0", a, b)
- #define pklb(a)      asm ("pklb    %a0,%v0", a)
- #define pkwb(a)      asm ("pkwb    %a0,%v0", a)
- #define unpkbl(a)    asm ("unpkbl  %a0,%v0", a)
- #define unpkbw(a)    asm ("unpkbw  %a0,%v0", a)
- #define wh64(a)      asm ("wh64    %a0", a)
- 
 +#else
 +#error "Unknown compiler!"
 +#endif
 +
 +#endif /* AVCODEC_ALPHA_ASM_H */



More information about the ffmpeg-cvslog mailing list