merge revision(s) 39162,39163: [Backport #8080]

	* configure.in: change CFLAGS temporally to test
	  ARCH_FLAG="-march=i486".


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@39844 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 12 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index f84fe26039..355ba359fa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 20 22:56:07 2013  Tanaka Akira  <akr@fsij.org>
+
+	* configure.in: change CFLAGS temporally to test
+	  ARCH_FLAG="-march=i486".
+
 Wed Mar 20 22:54:33 2013  Tanaka Akira  <akr@fsij.org>
 
 	* configure.in: don't define ARCH_FLAG="-march=i486" if it causes
diff --git a/configure.in b/configure.in
index 7e8a506fa6..86f6ac8271 100644
--- a/configure.in
+++ b/configure.in
@@ -1568,14 +1568,17 @@ AS_CASE(["$target_cpu-$target_os"], [[i[3-6]86*]], [
 				      [rb_cv_gcc_compiler_cas=no])])
 	 if test "$rb_cv_gcc_compiler_cas" = no; then
 		 unset rb_cv_gcc_compiler_cas
-		 ARCH_FLAG="-march=i486"
+		 save_CFLAGS="$CFLAGS"
+		 CFLAGS="$CFLAGS -march=i486"
 		 AC_CACHE_CHECK([for __sync_val_compare_and_swap with -march=i486], [rb_cv_gcc_compiler_cas], [
 				 AC_TRY_LINK([unsigned long atomic_var;],
 					     [
 					      __sync_val_compare_and_swap(&atomic_var, 0, 1);
 					      ],
-					      [rb_cv_gcc_compiler_cas=yes],
-					      [rb_cv_gcc_compiler_cas=no; unset ARCH_FLAG])])
+					      [rb_cv_gcc_compiler_cas=yes
+					       ARCH_FLAG="-march=i486"],
+					      [rb_cv_gcc_compiler_cas=no])])
+		 CFLAGS="$save_CFLAGS"
 	 fi])
 
 AC_CACHE_CHECK(for signbit, rb_cv_have_signbit,
diff --git a/version.h b/version.h
index 7c5b80c3a2..2884c1653a 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.0.0"
 #define RUBY_RELEASE_DATE "2013-03-20"
-#define RUBY_PATCHLEVEL 77
+#define RUBY_PATCHLEVEL 78
 
 #define RUBY_RELEASE_YEAR 2013
 #define RUBY_RELEASE_MONTH 3