[vlc-commits] Remove --with-tuning

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon May 21 22:13:02 2012 +0300| [6a49e292e66c9d29badb7518de437c05f0810453] | committer: Rémi Denis-Courmont

Remove --with-tuning

With the wide range of deployed 686 processors, -mtune=generic is saner
and it is the default anyway. The VLC defaults did not even make sense
anymore (Pentium 2, seriously?).

You might need to set -march explicitly as with other build systems,
e.g.: -march=i686

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6a49e292e66c9d29badb7518de437c05f0810453
---

 NEWS         |    4 ++++
 configure.ac |   38 --------------------------------------
 2 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/NEWS b/NEWS
index 677e1cc..27eb933 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 Changes between 2.0.x and 2.1.0-git:
 --------------------------------
 
+Important changes for packagers:
+ * The --with-tuning and --without-tuning options are removed. To tune
+   compilation for a specific processor type, set CFLAGS manually.
+
 3rd party libraries (contrib):
  * /extras/contrib has been replaced by a better system in /contrib
 
diff --git a/configure.ac b/configure.ac
index fb83def..8765b14 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1482,44 +1482,6 @@ dnl - Others: test should fail
 AM_CONDITIONAL([HAVE_ALTIVEC], [test "$have_altivec" = "yes"])
 
 dnl
-dnl  Special arch tuning
-dnl
-AC_ARG_WITH(tuning,
-  [AS_HELP_STRING([--with-tuning=ARCH],
-    [tune compilation for an architecture (default varies)])])
-if test -n "${with_tuning}"; then
-    if test "${with_tuning}" != "no"; then
-        CFLAGS_TUNING="-mtune=${with_tuning}"
-    fi
-else
-    if test "${SYS}" = "darwin" -a "${host_cpu}" = "i686"; then
-        CFLAGS_TUNING="-march=prescott -mtune=generic"
-    elif test "${SYS}" = "darwin" -a "${host_cpu}" = "x86_64"; then
-        CFLAGS_TUNING="-march=core2 -mtune=core2"
-    elif test "${host_cpu}" = "i686" -o "${host_cpu}" = "i586" -o "${host_cpu}" = "i486" -o "${host_cpu}" = "i386"; then
-        CFLAGS_TUNING="-mtune=pentium2"
-    elif test "${host_cpu}" = "x86_64"; then
-        CFLAGS_TUNING="-mtune=athlon64"
-    elif test "${host_cpu}" = "powerpc"; then
-        CFLAGS_TUNING="-mtune=G4";
-    fi
-fi
-
-dnl NOTE: this can't be cached cleanly
-AS_IF([test -n "${CFLAGS_TUNING}"], [
-  VLC_SAVE_FLAGS
-  CFLAGS="${CFLAGS} ${CFLAGS_TUNING}"
-  AC_MSG_CHECKING([whether $CC accepts ${CFLAGS_TUNING}])
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([])], [
-    AC_MSG_RESULT([yes])
-  ], [
-    VLC_RESTORE_FLAGS
-    AC_MSG_RESULT([no])
-    AS_IF([test "${with_tuning}"], [AC_MSG_ERROR([requested tuning not supported])])
-  ])
-])
-
-dnl
 dnl  Memory usage
 dnl
 AC_ARG_ENABLE(optimize-memory,