From: Rocky B. <ro...@us...> - 2002-07-29 13:14:35
|
Update of /cvsroot/xine/xine-vcdnav In directory usw-pr-cvs1:/tmp/cvs-serv25263 Modified Files: configure.in Log Message: Reduce some of the crap associated with setting compiler options. It is alas, sadly, inextricably mixed with compiler-option crap set in xine-lib and xine-ui though. Index: configure.in =================================================================== RCS file: /cvsroot/xine/xine-vcdnav/configure.in,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- configure.in 15 Jul 2002 10:45:49 -0000 1.8 +++ configure.in 29 Jul 2002 13:14:31 -0000 1.9 @@ -188,18 +188,29 @@ dnl AC_TRY_CFLAGS("-mpreferred-stack-boundary=2", m_psb="-mpreferred-stack-boundary=2", m_psb="") -AC_TRY_CFLAGS("-fno-strict-aliasing", f_nsa="-fno-strict-aliasing", f_nsa="") -AC_TRY_CFLAGS("-fschedule-insns2", f_si="-fschedule-insns2", f_si="") -AC_TRY_CFLAGS("-mwide-multiply", m_wm="-mwide-multiply", m_wm="") dnl Common cflags for all platforms COMMON_CFLAGS="-Wall -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -g -DINPUT_DEBUG" -dnl This magic is takes straight from the xine-ui configure.in. If that -dnl changes, change this. +dnl The notion that configure should customize compiler optimization +dnl options is utter crap. + +dnl Normally, a builder specifies optimization options, such as via $CFLAGS. +dnl For this code, the differences in speed using various compiler options is +dnl probably negligable. However, it appears that quite a +dnl bit of misguided customization has been put in xine-lib +dnl and xine-ui. No doubt, in some cases it is wrong for various compilers +dnl or versions of a given compiler. See the discussion about +dnl -funroll-all-loops in xine-devel on or about July 21, 2002; + +dnl Alas since we are a xine plugin, we have to be compatible +dnl with that other garbage. I believe the relevant dangerous +dnl and misguided option used is -fomit-frame-pointer, but there may be +dnl others lurking. + case $host in i386-*-freebsd*) - GLOBAL_CFLAGS="$GLOBAL_CFLAGS -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -finline-functions" + GLOBAL_CFLAGS="$GLOBAL_CFLAGS -fomit-frame-pointer $m_psb" GLOBAL_CFLAGS="$GLOBAL_CFLAGS $CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS -D_REENTRANT" DEBUG_CFLAGS="$X_CFLAGS $DEBUG_CFLAGS $CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS -D_REENTRANT -DDEBUG" AC_DEFINE(__i386__) @@ -225,24 +236,12 @@ AC_DEFINE([ARCH_X86],,[x86 architecture]) dnl add x86 specific CFLAGS - GLOBAL_CFLAGS="$GLOBAL_CFLAGS -fomit-frame-pointer $m_wm $m_psb $f_si $f_nsa" + GLOBAL_CFLAGS="$GLOBAL_CFLAGS -fomit-frame-pointer $m_psb" dnl enable x86 specific parts of the code if test x"$sarchopt" != "xno"; then [case "$host_alias" in - i386-*) # *BSD return this even on a P III #-)) - GLOBAL_CFLAGS="$GLOBAL_CFLAGS $sarchopt=i386" - DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=i386" - ;; - i486-*) # oh dear! - GLOBAL_CFLAGS="$GLOBAL_CFLAGS $sarchopt=i486" - DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=i486" - ;; - i586-*) - GLOBAL_CFLAGS="$GLOBAL_CFLAGS $sarchopt=pentium" - DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=pentium" - ;; i686-*) if test x"$check_athlon" = "xyes"; then if test -f /proc/cpuinfo; then @@ -263,32 +262,15 @@ DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=pentiumpro" fi ;; - k6-*) - GLOBAL_CFLAGS="$GLOBAL_CFLAGS $sarchopt=k6" - DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=k6" - ;; - k7-* | athlon-*) - GLOBAL_CFLAGS="$GLOBAL_CFLAGS $sarchopt=k7" - DEBUG_CFLAGS="$DEBUG_CFLAGS $sarchopt=k7" + k6-* | k7-* | athlon-*) + ;; + *) + ;; esac] fi ;; - alphaev56-*) - GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -mcpu=ev56 -mieee" - DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mcpu=ev56 -mieee" - ;; - alpha*) - GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -mieee" - DEBUG_CFLAGS="$DEBUG_CFLAGS -O3 -mieee" - ;; - powerpc-*) - GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -funroll-all-loops -finline-functions" - DEBUG_CFLAGS="$DEBUG_CFLAGS -O3" - ;; - sparc-*) - GLOBAL_CFLAGS="$GLOBAL_CFLAGS -O3" - DEBUG_CFLAGS="$DEBUG_CFLAGS -O" + alphaev56-* | alpha* | powerpc-* | sparc-*) ;; *) echo "$host is not currently supported by xine"; exit 1;; esac @@ -297,7 +279,6 @@ DEBUG_CFLAGS="$DEBUG_CFLAGS $COMMON_CFLAGS $ALSA_CFLAGS $ESD_CFLAGS -g -DDEBUG" ;; esac - dnl gcc __attribute__ ((aligned ())) AC_C_ATTRIBUTE_ALIGNED |