diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-07-19 21:58:09 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-07-19 22:01:31 +0200 |
commit | 85044358f63f0158fb83712f659f6db5b454a7aa (patch) | |
tree | a29d74d69c953be07f3049542afb5659c8e87775 /configure | |
parent | 55ed91c8565a3c562d2982e1cd5e66df06c6c190 (diff) | |
parent | 45870f8b6eb3529992a4315a6957150124d7ca03 (diff) | |
download | ffmpeg-streaming-85044358f63f0158fb83712f659f6db5b454a7aa.zip ffmpeg-streaming-85044358f63f0158fb83712f659f6db5b454a7aa.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
Print full compiler identification, not only version number
flacdec: reverse lpc coeff order, simplify filter
x86: dsputil: drop some unused CPU flag debug code
Conflicts:
cmdutils.c
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 17 |
1 files changed, 1 insertions, 16 deletions
@@ -1869,7 +1869,6 @@ postproc_version_default="current" ar_default="ar" cc_default="gcc" cxx_default="g++" -cc_version=\"unknown\" host_cc_default="gcc" install="install" ln_s="ln -sf" @@ -2225,7 +2224,6 @@ filter_cppflags=echo if $cc -v 2>&1 | grep -q '^gcc.*LLVM'; then cc_type=llvm_gcc - cc_version=__VERSION__ gcc_extra_ver=$(expr "$($cc --version | head -n1)" : '.*\((.*)\)') cc_ident="llvm-gcc $($cc -dumpversion) $gcc_extra_ver" CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' @@ -2234,7 +2232,6 @@ if $cc -v 2>&1 | grep -q '^gcc.*LLVM'; then size_cflags='-Os' elif $cc -v 2>&1 | grep -qi ^gcc; then cc_type=gcc - cc_version=__VERSION__ gcc_version=$($cc --version | head -n1) gcc_basever=$($cc -dumpversion) gcc_pkg_ver=$(expr "$gcc_version" : '[^ ]* \(([^)]*)\)') @@ -2248,7 +2245,6 @@ elif $cc -v 2>&1 | grep -qi ^gcc; then size_cflags='-Os' elif $cc --version 2>/dev/null | grep -q Intel; then cc_type=icc - cc_version="AV_STRINGIFY(__INTEL_COMPILER)" cc_ident=$($cc --version | head -n1) icc_version=$($cc -dumpversion) CC_DEPFLAGS='-MMD' @@ -2258,13 +2254,11 @@ elif $cc --version 2>/dev/null | grep -q Intel; then noopt_cflags='-O1' elif $cc -v 2>&1 | grep -q xlc; then cc_type=xlc - cc_version="AV_STRINGIFY(__IBMC__)" cc_ident=$($cc -qversion 2>/dev/null | head -n1) speed_cflags='-O5' size_cflags='-O5 -qcompact' elif $cc -V 2>/dev/null | grep -q Compaq; then cc_type=ccc - cc_version="AV_STRINGIFY(__DECC_VER)" cc_ident=$($cc -V | head -n1 | cut -d' ' -f1-3) DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -M' debuglevel=3 @@ -2274,7 +2268,6 @@ elif $cc -V 2>/dev/null | grep -q Compaq; then elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then test -d "$sysroot" || die "No valid sysroot specified." cc_type=armcc - cc_version="AV_STRINGIFY(__ARMCC_VERSION)" cc_ident=$($cc --vsn | head -n1) armcc_conf="$PWD/armcc.conf" $cc --arm_linux_configure \ @@ -2292,7 +2285,6 @@ elif $cc --vsn 2>/dev/null | grep -q "ARM C/C++ Compiler"; then filter_asflags="filter_out -W${armcc_opt}*" elif $cc -version 2>/dev/null | grep -q TMS470; then cc_type=tms470 - cc_version="AV_STRINGIFY(__TI_COMPILER_VERSION__)" cc_ident=$($cc -version | head -n1 | tr -s ' ') cc="$cc --gcc --abi=eabi -eo=.o -mc -me" CC_O='-fr=$(@D)' @@ -2332,8 +2324,6 @@ elif $cc -version 2>/dev/null | grep -q TMS470; then } elif $cc -v 2>&1 | grep -q clang; then cc_type=clang - $cc -dM -E $TMPC | grep -q __clang_version__ && - cc_version=__clang_version__ || cc_version=__VERSION__ cc_ident=$($cc --version | head -n1) CC_DEPFLAGS='-MMD' AS_DEPFLAGS='-MMD' @@ -2341,7 +2331,6 @@ elif $cc -v 2>&1 | grep -q clang; then size_cflags='-Os' elif $cc -V 2>&1 | grep -q Sun; then cc_type=suncc - cc_version="AV_STRINGIFY(__SUNPRO_C)" cc_ident=$($cc -V 2>&1 | head -n1 | cut -d' ' -f 2-) DEPEND_CMD='$(DEPCC) $(DEPFLAGS) $< | sed -e "1s,^.*: ,$@: ," -e "\$$!s,\$$, \\\," -e "1!s,^.*: , ," > $(@:.o=.d)' DEPFLAGS='$(CPPFLAGS) $(CFLAGS) -xM1' @@ -2384,7 +2373,6 @@ elif $cc -V 2>&1 | grep -q Sun; then } elif $cc -v 2>&1 | grep -q 'PathScale\|Path64'; then cc_type=pathscale - cc_version=__PATHSCALE__ cc_ident=$($cc -v 2>&1 | head -n1 | tr -d :) CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' @@ -2393,7 +2381,6 @@ elif $cc -v 2>&1 | grep -q 'PathScale\|Path64'; then filter_cflags='filter_out -Wdisabled-optimization' elif $cc -v 2>&1 | grep -q Open64; then cc_type=open64 - cc_version=__OPEN64__ cc_ident=$($cc -v 2>&1 | head -n1 | tr -d :) CC_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' AS_DEPFLAGS='-MMD -MF $(@:.o=.d) -MT $@' @@ -2402,7 +2389,6 @@ elif $cc -v 2>&1 | grep -q Open64; then filter_cflags='filter_out -Wdisabled-optimization|-Wtype-limits|-fno-signed-zeros' elif $cc -V 2>&1 | grep -q Portland; then cc_type=pgi - cc_version='AV_STRINGIFY(__PGIC__.__PGIC_MINOR__.__PGIC_PATCHLEVEL__)' cc_ident="PGI $($cc -V 2>&1 | awk '/^pgcc/ { print $2; exit }')" opt_common='-alias=ansi -Mlre -Mpre' speed_cflags="-O3 -Mautoinline -Munroll=c:4 $opt_common" @@ -3892,8 +3878,7 @@ cat > $TMPH <<EOF #define FFMPEG_LICENSE "$(c_escape $license)" #define FFMPEG_DATADIR "$(eval c_escape $datadir)" #define AVCONV_DATADIR "$(eval c_escape $datadir)" -#define CC_TYPE "$cc_type" -#define CC_VERSION $cc_version +#define CC_IDENT "$(c_escape ${cc_ident:-Unknown compiler})" #define av_restrict $_restrict #define EXTERN_PREFIX "${extern_prefix}" #define EXTERN_ASM ${extern_prefix} |