From 8452680d0a751fc390f77fcf309401a567f3ca0f Mon Sep 17 00:00:00 2001
From: Kenta Yoshimura <yottui@yahoo.co.jp>
Date: Mon, 6 May 2019 23:56:06 +0900
Subject: [PATCH] unix: Revert -Ofast to -O3.

---
 unix/configure    | 59 -----------------------------------------------
 unix/configure.ac |  7 +++---
 2 files changed, 3 insertions(+), 63 deletions(-)

diff --git a/unix/configure b/unix/configure
index a3ca1c93..1a7123b5 100755
--- a/unix/configure
+++ b/unix/configure
@@ -3564,63 +3564,6 @@ $as_echo "no" >&6; }
 
 else
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -Ofast" >&5
-$as_echo_n "checking whether g++ accepts -Ofast... " >&6; }
-
-	if ${snes9x_cv_option_ofast+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-
-		OLD_CXXFLAGS="$CXXFLAGS"
-		CXXFLAGS="$OLD_CXXFLAGS -Ofast"
-
-		if test "$cross_compiling" = yes; then :
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-as_fn_error $? "cannot run test program while cross compiling
-See \`config.log' for more details" "$LINENO" 5; }
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-			int	foo;
-
-			int	main (int argc, char **argv)
-			{
-				/* The following code triggs gcc:s generation of aline opcodes,
-				   which some versions of as does not support. */
-
-				if (argc > 0)
-					argc = 0;
-
-				return (argc);
-			}
-
-_ACEOF
-if ac_fn_cxx_try_run "$LINENO"; then :
-  snes9x_cv_option_ofast="yes"
-else
-  snes9x_cv_option_ofast="no"
-fi
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
-  conftest.$ac_objext conftest.beam conftest.$ac_ext
-fi
-
-
-fi
-
-
-	CXXFLAGS="$OLD_CXXFLAGS"
-
-	if test "x$snes9x_cv_option_ofast" = "xyes"; then
-		S9XFLGS="$S9XFLGS -Ofast"
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
-$as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-
-
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -O3" >&5
 $as_echo_n "checking whether g++ accepts -O3... " >&6; }
 
@@ -3797,8 +3740,6 @@ $as_echo "no" >&6; }
 
 	fi
 
-	fi
-
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether g++ accepts -fomit-frame-pointer" >&5
 $as_echo_n "checking whether g++ accepts -fomit-frame-pointer... " >&6; }
diff --git a/unix/configure.ac b/unix/configure.ac
index 8925cdf2..66639fb5 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -67,10 +67,9 @@ if test "x$enable_debug" = "xyes"; then
 	AC_S9X_COMPILER_FLAG([-g],  [g])
 	AC_S9X_COMPILER_FLAG([-O0], [o0])
 else
-	AC_S9X_COMPILER_FLAG([-Ofast], [ofast], [
-		AC_S9X_COMPILER_FLAG([-O3], [o3], [
-			AC_S9X_COMPILER_FLAG([-O2], [o2], [
-				AC_S9X_COMPILER_FLAG([-O1], [o1])])])])
+	AC_S9X_COMPILER_FLAG([-O3], [o3], [
+		AC_S9X_COMPILER_FLAG([-O2], [o2], [
+			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
 	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
 fi