From 3db0ef9dc7793a6dc9c608b9c39dce37d634faf6 Mon Sep 17 00:00:00 2001
From: rofl0r <rofl0r@users.noreply.github.com>
Date: Sat, 28 Aug 2021 02:10:32 +0000
Subject: [PATCH] configure: default to --disable-arch, else use -march=native

---
 configure    | 56 ++------------------------------------------------------
 configure.ac | 53 ++---------------------------------------------------
 2 files changed, 4 insertions(+), 105 deletions(-)

diff --git a/configure b/configure
index d2ffb3a..7d533f7 100755
--- a/configure
+++ b/configure
@@ -4417,7 +4417,7 @@ fi
 if test "${enable_arch+set}" = set; then :
   enableval=$enable_arch;
 else
-  enable_arch=yes
+  enable_arch=no
 fi
 
 # Check whether --enable-optimize was given.
@@ -4460,53 +4460,8 @@ CFLAGS="$CFLAGS -pg"
 fi
 
 if test "$enable_arch" = yes ; then
-if test `uname -s` = Linux -a -f /proc/cpuinfo ; then
-case `grep "model name" /proc/cpuinfo` in
-*AMD-K6*) enable_arch=k6 ;;
-*Pentium*Pro*|*Pentium\ I*|*Klamath*) enable_arch=i686 ;;
-*Pentium*|*586*) enable_arch=i586 ;;
-*486*) enable_arch=i486 ;;
-*386*) enable_arch=i386 ;;
-*) enable_arch=no ;;
-esac
-else
-enable_arch=no
-#case `uname -m` in
-#i686) enable_arch=i686 ;;
-#i586) enable_arch=i586 ;;
-#i486) enable_arch=i486 ;;
-#i386) enable_arch=i386 ;;
-#*) enable_arch=no ;;
-#esac
+CFLAGS="$CFLAGS -march=native"
 fi
-fi
-
-
-case `$CC --version` in
-
-2.9*|3.*)
-
-case "$enable_arch" in
-k6|i686|i586|i486|i386) CFLAGS="$CFLAGS -march=$enable_arch" ;;
-no) ;;
-*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown architecture $enable_arch" >&5
-$as_echo "$as_me: WARNING: unknown architecture $enable_arch" >&2;} ;;
-esac ;;
-
-*)
-
-case "$enable_arch" in
-k6|i686|i586) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: your compiler is too old to support $enable_arch optimizations" >&5
-$as_echo "$as_me: WARNING: your compiler is too old to support $enable_arch optimizations" >&2;} ;;
-i486) CFLAGS="$CFLAGS -m486" ;;
-i386) CFLAGS="$CFLAGS -m386" ;;
-no) ;;
-*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unknown architecture $enable_arch" >&5
-$as_echo "$as_me: WARNING: unknown architecture $enable_arch" >&2;} ;;
-esac ;;
-
-esac
-
 
 case "$enable_optimize" in
 yes|full)
@@ -4519,16 +4474,9 @@ case `$CC -dumpmachine` in
 x86_64*|i?86*) CFLAGS="$CFLAGS -DALLOW_UNALIGNED_IO" ;;
 esac
 
-#case `$CC --version` in
-#2.9*|3.*)
 CFLAGS="$CFLAGS -fstrength-reduce -fthread-jumps \
  -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop \
  -fexpensive-optimizations -fforce-addr"
-#;;
-#*)
-#AC_MSG_WARN(your compiler is too old for fancy optimizations)
-#;;
-#esac
 
 if test "$enable_debug" != yes -a "$enable_profile" != yes ; then
 CFLAGS="$CFLAGS -fomit-frame-pointer"
diff --git a/configure.ac b/configure.ac
index 0b7f26e..04723ac 100644
--- a/configure.ac
+++ b/configure.ac
@@ -146,7 +146,7 @@ test "$with_sdl2" = "no" || TARGETS="$TARGETS sdl2gnuboy"
 AC_ARG_ENABLE(warnings, [  --enable-warnings       enable selected compiler warnings], [], [enable_warnings=yes])
 AC_ARG_ENABLE(debug,    [  --enable-debug          include debugging symbols], [])
 AC_ARG_ENABLE(profile,  [  --enable-profile        enable performance profiling], [])
-AC_ARG_ENABLE(arch,     [  --enable-arch           compile for specific host cpu architecture], [], [enable_arch=yes])
+AC_ARG_ENABLE(arch,     [  --enable-arch           compile for specific host cpu architecture], [], [enable_arch=no])
 AC_ARG_ENABLE(optimize, [  --enable-optimize=LEVEL select optimization level (full,low,none)], [], [enable_optimize=yes])
 AC_ARG_ENABLE(asm,      [  --enable-asm            use hand-optimized asm cores], [], [enable_asm=yes])
 
@@ -171,50 +171,8 @@ CFLAGS="$CFLAGS -pg"
 fi
 
 if test "$enable_arch" = yes ; then
-if test `uname -s` = Linux -a -f /proc/cpuinfo ; then
-case `grep "model name" /proc/cpuinfo` in
-*AMD-K6*) enable_arch=k6 ;;
-*Pentium*Pro*|*Pentium\ I*|*Klamath*) enable_arch=i686 ;;
-*Pentium*|*586*) enable_arch=i586 ;;
-*486*) enable_arch=i486 ;;
-*386*) enable_arch=i386 ;;
-*) enable_arch=no ;;
-esac
-else
-enable_arch=no
-#case `uname -m` in
-#i686) enable_arch=i686 ;;
-#i586) enable_arch=i586 ;;
-#i486) enable_arch=i486 ;;
-#i386) enable_arch=i386 ;;
-#*) enable_arch=no ;;
-#esac
+CFLAGS="$CFLAGS -march=native"
 fi
-fi
-
-
-case `$CC --version` in
-
-2.9*|3.*)
-
-case "$enable_arch" in
-k6|i686|i586|i486|i386) CFLAGS="$CFLAGS -march=$enable_arch" ;;
-no) ;;
-*) AC_MSG_WARN(unknown architecture $enable_arch) ;;
-esac ;;
-
-*)
-
-case "$enable_arch" in
-k6|i686|i586) AC_MSG_WARN(your compiler is too old to support $enable_arch optimizations) ;;
-i486) CFLAGS="$CFLAGS -m486" ;;
-i386) CFLAGS="$CFLAGS -m386" ;;
-no) ;;
-*) AC_MSG_WARN(unknown architecture $enable_arch) ;;
-esac ;;
-
-esac
-
 
 case "$enable_optimize" in
 yes|full)
@@ -226,16 +184,9 @@ case `$CC -dumpmachine` in
 x86_64*|i?86*) CFLAGS="$CFLAGS -DALLOW_UNALIGNED_IO" ;;
 esac
 
-#case `$CC --version` in
-#2.9*|3.*)
 CFLAGS="$CFLAGS -fstrength-reduce -fthread-jumps \
  -fcse-follow-jumps -fcse-skip-blocks -frerun-cse-after-loop \
  -fexpensive-optimizations -fforce-addr"
-#;;
-#*)
-#AC_MSG_WARN(your compiler is too old for fancy optimizations)
-#;;
-#esac
 
 if test "$enable_debug" != yes -a "$enable_profile" != yes ; then
 CFLAGS="$CFLAGS -fomit-frame-pointer"
-- 
2.11.4.GIT