naruse	2014-02-16 09:13:51 +0900 (Sun, 16 Feb 2014)

  New Revision: 44993

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

  Log:
    merge revision(s) 44474,44538,44539,44890,44896: [Backport #9495]
    
    * configure.in: use SSE2 instructions for drop unexpected
      precisions.  [ruby-core:54738] [Bug #8358]
    
    * configure.in: use SSE2 instructions to drop unexpected precisions on
      other than mingw.  [ruby-core:59472] [Bug #8358]
    
    * configure.in: -mstackrealign is necessary for -msse2 working.
      [ruby-core:54716] [Bug #8349]
    
    * configure.in: -mstackrealign is necessary for -msse2 working.
      [ruby-core:54716] [Bug #8349]
    
    * configure.in: add qouting brackets and append wildcard for the
      rest after target_cpu, to properly detect platform for SSE2
      instructions.  [ruby-core:60576] [Bug #8358]
    
    * configure.in: Fix compilation error.
      https://bugs.ruby-lang.org/issues/8358#note-16

  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 44992)
+++ ruby_2_1/configure.in	(revision 44993)
@@ -856,6 +856,22 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_1/configure.in#L856
     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*]], [
+	    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/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 44992)
+++ ruby_2_1/ChangeLog	(revision 44993)
@@ -1,3 +1,32 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Sun Feb 16 07:13:36 2014  Tanaka Akira  <akr@f...>
+
+	* configure.in: Fix compilation error.
+	  https://bugs.ruby-lang.org/issues/8358#note-16
+
+Sun Feb 16 07:13:36 2014  Vit Ondruch  <vondruch@r...>
+
+	* configure.in: add qouting brackets and append wildcard for the
+	  rest after target_cpu, to properly detect platform for SSE2
+	  instructions.  [ruby-core:60576] [Bug #8358]
+
+Sun Feb 16 07:13:36 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: -mstackrealign is necessary for -msse2 working.
+	  [ruby-core:54716] [Bug #8349]
+
+Sun Feb 16 07:13:36 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: -mstackrealign is necessary for -msse2 working.
+	  [ruby-core:54716] [Bug #8349]
+
+	* configure.in: use SSE2 instructions to drop unexpected precisions on
+	  other than mingw.  [ruby-core:59472] [Bug #8358]
+
+Sun Feb 16 07:13:36 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: use SSE2 instructions for drop unexpected
+	  precisions.  [ruby-core:54738] [Bug #8358]
+
 Fri Feb  7 04:19:19 2014  Koichi Sasada  <ko1@a...>
 
 	* gc.c (get_envparam_int): correct warning messsages.
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 44992)
+++ ruby_2_1/version.h	(revision 44993)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.1"
-#define RUBY_RELEASE_DATE "2014-02-10"
-#define RUBY_PATCHLEVEL 30
+#define RUBY_RELEASE_DATE "2014-02-16"
+#define RUBY_PATCHLEVEL 31
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 2
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 16
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r44474,44538-44539,44890,44896


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