Changeset ff3a0f6c3f9c8f503812f28053672b34fbc730df

Show
Ignore:
Timestamp:
07/17/07 13:05:30 (1 year ago)
Author:
Damien Fouilleul <damienf@videolan.org>
git-committer:
Damien Fouilleul <damienf@videolan.org> 1184670330 +0000
git-parent:

[f0fd5fd5a358ec828aba76319f4f751fef75ead0]

git-author:
Damien Fouilleul <damienf@videolan.org> 1184670330 +0000
Message:

vlc-config: fixed optimizations by splitting CFLAGS_OPTIM into CFLAGS_OPTIM_SIZE and CFLAGS_OPTIM_SPEED, and only one of which is used depending on value --enable-optimize-memory, moreover CFLAGS_NOOPTIM is set to -O0 rather than -O2 whenever possible

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • configure.ac

    r230aaff rff3a0f6  
    10051005    [CFLAGS="${CFLAGS_save} -Os" 
    10061006     AC_TRY_COMPILE([],,ac_cv_c_os=yes, ac_cv_c_os=no)]) 
    1007 if test "${ac_cv_c_os}" != "no" -a "${host_cpu}" = "mipsel"; then 
    1008     CFLAGS_OPTIM="${CFLAGS_OPTIM} -Os" 
    1009 fi 
    1010  
    1011 AC_CACHE_CHECK([if \$CC accepts -O3], 
    1012     [ac_cv_c_o3], 
    1013     [CFLAGS="${CFLAGS_save} -O3" 
    1014      AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) 
    1015 if test "${ac_cv_c_o3}" != "no" -a "${host_cpu}" != "mipsel"; then 
    1016     CFLAGS_OPTIM="${CFLAGS_OPTIM} -O3" 
    1017 fi 
    1018  
    1019 AC_CACHE_CHECK([if \$CC accepts -O2], 
    1020     [ac_cv_c_o2], 
    1021     [CFLAGS="${CFLAGS_save} -O2" 
    1022      AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) 
    1023 if test "${ac_cv_c_o2}" != "no" -a "${host_cpu}" != "mipsel"; then 
    1024     if test "${ac_cv_c_o3}" = "no"; then 
    1025         CFLAGS_OPTIM="${CFLAGS_OPTIM} -O2" 
    1026     fi 
    1027     CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O2" 
     1007if test "${ac_cv_c_os}" != "no"; then 
     1008    CFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE} -Os" 
    10281009else  
    10291010    AC_CACHE_CHECK([if \$CC accepts -O], 
    …… 
    10311012        [CFLAGS="${CFLAGS_save} -O" 
    10321013         AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) 
    1033     if test "${ac_cv_c_o}" != "no" -a "${host_cpu}" != "mipsel"; then 
     1014    if test "${ac_cv_c_o}" != "no"; then 
    10341015        if test "${ac_cv_c_o3}" = "no"; then 
    1035             CFLAGS_OPTIM="${CFLAGS_OPTIM} -O" 
    1036     fi 
    1037         CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O" 
    1038     fi 
     1016            CFLAGS_OPTIM_SIZE="${CFLAGS_OPTIM_SIZE} -O" 
     1017        fi 
     1018    fi 
     1019fi 
     1020 
     1021AC_CACHE_CHECK([if \$CC accepts -O3], 
     1022    [ac_cv_c_o3], 
     1023    [CFLAGS="${CFLAGS_save} -O3" 
     1024     AC_TRY_COMPILE([],,ac_cv_c_o3=yes, ac_cv_c_o3=no)]) 
     1025if test "${ac_cv_c_o3}" != "no"; then 
     1026    CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O3" 
     1027else 
     1028    AC_CACHE_CHECK([if \$CC accepts -O2], 
     1029        [ac_cv_c_o2], 
     1030        [CFLAGS="${CFLAGS_save} -O2" 
     1031         AC_TRY_COMPILE([],,ac_cv_c_o2=yes, ac_cv_c_o2=no)]) 
     1032    if test "${ac_cv_c_o2}" != "no"; then 
     1033        CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O2" 
     1034    else 
     1035        AC_CACHE_CHECK([if \$CC accepts -O], 
     1036            [ac_cv_c_o], 
     1037            [CFLAGS="${CFLAGS_save} -O" 
     1038             AC_TRY_COMPILE([],,ac_cv_c_o=yes, ac_cv_c_o=no)]) 
     1039        if test "${ac_cv_c_o}" != "no"; then 
     1040            CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -O" 
     1041        fi 
     1042    fi 
     1043fi 
     1044 
     1045AC_CACHE_CHECK([if \$CC accepts -O0], 
     1046    [ac_cv_c_o0], 
     1047    [CFLAGS="${CFLAGS_save} -O0" 
     1048     AC_TRY_COMPILE([],,ac_cv_c_o0=yes, ac_cv_c_o0=no)]) 
     1049if test "${ac_cv_c_o0}" != "no"; then 
     1050    CFLAGS_NOOPTIM="${CFLAGS_NOOPTIM} -O0" 
    10391051fi 
    10401052 
    …… 
    10451057     AC_TRY_COMPILE([],,ac_cv_c_fast_math=yes, ac_cv_c_fast_math=no)]) 
    10461058if test "${ac_cv_c_fast_math}" != "no"; then 
    1047     CFLAGS_OPTIM="${CFLAGS_OPTIM} -ffast-math" 
     1059    CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -ffast-math" 
    10481060fi 
    10491061 
    …… 
    10571069       AC_TRY_COMPILE([],,ac_cv_c_unroll_loops=yes, ac_cv_c_unroll_loops=no)]) 
    10581070  if test "${ac_cv_c_unroll_loops}" != "no"; then 
    1059       CFLAGS_OPTIM="${CFLAGS_OPTIM} -funroll-loops" 
     1071      CFLAGS_OPTIM_SPEED="${CFLAGS_OPTIM_SPEED} -funroll-loops" 
    10601072  fi 
    10611073fi 
    …… 
    15561568AC_ARG_ENABLE(optimizations, 
    15571569[  --disable-optimizations disable compiler optimizations (default enabled)]) 
    1558 test "${enable_optimizations}" != "no" && enable_optimizations="yes" 
     1570if test "${enable_optimizations}" != "no"; then 
     1571   if test "${enable_optimize_memory}" = "yes"; then 
     1572      enable_optimizations="size" 
     1573   else 
     1574      enable_optimizations="speed" 
     1575   fi 
     1576fi 
    15591577 
    15601578dnl 

  • m4/vlc.m4

    r75413cd rff3a0f6  
    8989          -e "s/@BUILTINS@/${BUILTINS}/" \ 
    9090          -e "s/@CFLAGS_TUNING@/${CFLAGS_TUNING}/" \ 
    91           -e "s/@CFLAGS_OPTIM@/${CFLAGS_OPTIM}/" \ 
     91          -e "s/@CFLAGS_OPTIM_SIZE@/${CFLAGS_OPTIM_SIZE}/" \ 
     92          -e "s/@CFLAGS_OPTIM_SPEED@/${CFLAGS_OPTIM_SPEED}/" \ 
    9293          -e "s/@CFLAGS_OPTIM_NODEBUG@/${CFLAGS_OPTIM_NODEBUG}/" \ 
    9394          -e "s/@CFLAGS_NOOPTIM@/${CFLAGS_NOOPTIM}/" \ 

  • vlc-config.in.in

    rfbf4c80 rff3a0f6  
    2222 
    2323cflags_tuning="@CFLAGS_TUNING@" 
    24 cflags_optim="@CFLAGS_OPTIM@" 
     24cflags_optim_size="@CFLAGS_OPTIM_SIZE@" 
     25cflags_optim_speed="@CFLAGS_OPTIM_SPEED@" 
    2526cflags_optim_nodebug="@CFLAGS_OPTIM_NODEBUG@" 
    2627cflags_nooptim="@CFLAGS_NOOPTIM@" 
    …… 
    131132  cppflags="${cppflags} -DHAVE_RELEASE" 
    132133fi 
    133 if [ "${optim}" = yes ]; then 
    134   cppflags="${cppflags} ${cflags_optim} ${cflags_tuning}" 
     134if [ "${optim}" = size ]; then 
     135  cppflags="${cppflags} ${cflags_optim_size} ${cflags_tuning}" 
     136  if [ "${debug}" != yes -a "${gprof}" != yes -a "${cprof}" != yes ]; then 
     137    cppflags="${cppflags} ${cflags_optim_nodebug}" 
     138  fi 
     139elif [ "${optim}" = speed ]; then 
     140  cppflags="${cppflags} ${cflags_optim_speed} ${cflags_tuning}" 
    135141  if [ "${debug}" != yes -a "${gprof}" != yes -a "${cprof}" != yes ]; then 
    136142    cppflags="${cppflags} ${cflags_optim_nodebug}"