nagachika	2014-06-20 00:22:15 +0900 (Fri, 20 Jun 2014)

  New Revision: 46467

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

  Log:
    merge revision(s) r45954: [Backport #8358]
    
    * configure.in: enable SSE2 on mingw. target='i386-pc-mingw32'.
      [ruby-core:62095] [Bug #8358]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/configure.in
    branches/ruby_2_1/version.h
Index: ruby_2_1/configure.in
===================================================================
--- ruby_2_1/configure.in	(revision 46466)
+++ ruby_2_1/configure.in	(revision 46467)
@@ -862,7 +862,7 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L862
 	[*-darwin*], [
 	    # doesn't seem necessary on Mac OS X
 	],
-	[[i[4-6]86*]], [
+	[[i[4-6]86*|i386*mingw*]], [
 	    RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [
 		RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse)
 	    ])
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 46466)
+++ ruby_2_1/ChangeLog	(revision 46467)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Fri Jun 20 00:20:02 2014  Hiroshi Shirosaki  <h.shirosaki@g...>
+
+	* configure.in: enable SSE2 on mingw. target='i386-pc-mingw32'.
+	  [ruby-core:62095] [Bug #8358]
+
 Tue Jun 17 00:45:44 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* compile.c (compile_array_): make copy a first hash not to modify
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 46466)
+++ ruby_2_1/version.h	(revision 46467)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.2"
-#define RUBY_RELEASE_DATE "2014-06-17"
-#define RUBY_PATCHLEVEL 132
+#define RUBY_RELEASE_DATE "2014-06-20"
+#define RUBY_PATCHLEVEL 133
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 17
+#define RUBY_RELEASE_DAY 20
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r45954


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