nagachika	2013-03-20 22:56:17 +0900 (Wed, 20 Mar 2013)

  New Revision: 39844

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=39844

  Log:
    merge revision(s) 39162,39163: [Backport #8080]
    
    * configure.in: change CFLAGS temporally to test
      ARCH_FLAG="-march=i486".

  Modified directories:
    branches/ruby_2_0_0/
  Modified files:
    branches/ruby_2_0_0/ChangeLog
    branches/ruby_2_0_0/configure.in
    branches/ruby_2_0_0/version.h

Index: ruby_2_0_0/configure.in
===================================================================
--- ruby_2_0_0/configure.in	(revision 39843)
+++ ruby_2_0_0/configure.in	(revision 39844)
@@ -1568,14 +1568,17 @@ AS_CASE(["$target_cpu-$target_os"], [[i[ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L1568
 				      [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,
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 39843)
+++ ruby_2_0_0/ChangeLog	(revision 39844)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Wed Mar 20 22:56:07 2013  Tanaka Akira  <akr@f...>
+
+	* configure.in: change CFLAGS temporally to test
+	  ARCH_FLAG="-march=i486".
+
 Wed Mar 20 22:54:33 2013  Tanaka Akira  <akr@f...>
 
 	* configure.in: don't define ARCH_FLAG="-march=i486" if it causes
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 39843)
+++ ruby_2_0_0/version.h	(revision 39844)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/version.h#L1
 #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

Property changes on: ruby_2_0_0
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r39162-39163


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/