nagachika	2015-03-24 05:11:27 +0900 (Tue, 24 Mar 2015)

  New Revision: 50067

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

  Log:
    merge revision(s) r47129,r48844: [Backport #10120]
    
    configure.in: remove SSE options

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/test/ruby/test_sprintf.rb
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 50066)
+++ ruby_2_1/configure.in	(revision 50067)
@@ -863,22 +863,6 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L863
     for oflag in -fno-fast-math; do
 	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
     done
-    AS_CASE(["$target"],
-	[*-darwin*], [
-	    # doesn't seem necessary on Mac OS X
-	],
-	[[i[4-6]86*|i386*mingw*]], [
-	    RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [
-		RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse)
-	    ])
-            AS_CASE(["$XCFLAGS"],
-                [[*-msse2*]], [
-                    RUBY_TRY_CFLAGS(-mstackrealign, [
-                        RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign)
-                    ])
-                ])
-	]
-    )
 fi
 
 AC_ARG_WITH(opt-dir,
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 50066)
+++ ruby_2_1/version.h	(revision 50067)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
-#define RUBY_RELEASE_DATE "2015-03-22"
-#define RUBY_PATCHLEVEL 320
+#define RUBY_RELEASE_DATE "2015-03-24"
+#define RUBY_PATCHLEVEL 321
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 22
+#define RUBY_RELEASE_DAY 24
 
 #include "ruby/version.h"
 
Index: ruby_2_1/test/ruby/test_sprintf.rb
===================================================================
--- ruby_2_1/test/ruby/test_sprintf.rb	(revision 50066)
+++ ruby_2_1/test/ruby/test_sprintf.rb	(revision 50067)
@@ -194,8 +194,9 @@ class TestSprintf < Test::Unit::TestCase https://github.com/ruby/ruby/blob/trunk/ruby_2_1/test/ruby/test_sprintf.rb#L194
                  sprintf("%20.0f", 36893488147419107329.0))
     assert_equal(" Inf", sprintf("% 0e", 1.0/0.0), "moved from btest/knownbug")
     assert_equal("       -0.", sprintf("%#10.0f", -0.5), "[ruby-dev:42552]")
-    assert_equal("0x1p+2",   sprintf('%.0a', Float('0x1.fp+1')),   "[ruby-dev:42551]")
-    assert_equal("-0x1.0p+2", sprintf('%.1a', Float('-0x1.ffp+1')), "[ruby-dev:42551]")
+    # out of spec
+    #assert_equal("0x1p+2",   sprintf('%.0a', Float('0x1.fp+1')),   "[ruby-dev:42551]")
+    #assert_equal("-0x1.0p+2", sprintf('%.1a', Float('-0x1.ffp+1')), "[ruby-dev:42551]")
   end
 
   def test_float_hex

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47129,48844


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