usa	2014-06-23 18:20:15 +0900 (Mon, 23 Jun 2014)

  New Revision: 46514

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

  Log:
    merge revision(s) 44474,44538,44539,44890,44896,45954: [Backport #8358]
    
    * 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
    
    * configure.in: enable SSE2 on mingw. target='i386-pc-mingw32'.
      [ruby-core:62095] [Bug #8358]

  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 46513)
+++ ruby_2_0_0/configure.in	(revision 46514)
@@ -771,6 +771,22 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/configure.in#L771
     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
 
 test -z "${ac_env_CFLAGS_set}" -a -n "${cflags+set}" && eval CFLAGS="\"$cflags $ARCH_FLAG\""
Index: ruby_2_0_0/ChangeLog
===================================================================
--- ruby_2_0_0/ChangeLog	(revision 46513)
+++ ruby_2_0_0/ChangeLog	(revision 46514)
@@ -1,3 +1,29 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_0_0/ChangeLog#L1
+Mon Jun 23 18:16:07 2014  Hiroshi Shirosaki  <h.shirosaki@g...>
+
+	* configure.in: enable SSE2 on mingw. target='i386-pc-mingw32'.
+	  [ruby-core:62095] [Bug #8358]
+
+Mon Jun 23 18:16:07 2014  Tanaka Akira  <akr@f...>
+
+	* configure.in: Fix compilation error.
+	  https://bugs.ruby-lang.org/issues/8358#note-16
+
+Mon Jun 23 18:16:07 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]
+
+Mon Jun 23 18:16:07 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: use SSE2 instructions to drop unexpected precisions on
+	  other than mingw.  [ruby-core:59472] [Bug #8358]
+
+Mon Jun 23 18:16:07 2014  Nobuyoshi Nakada  <nobu@r...>
+
+	* configure.in: use SSE2 instructions for drop unexpected
+	  precisions.  [ruby-core:54738] [Bug #8358]
+
 Mon Jun 23 17:29:53 2014  Nobuyoshi Nakada  <nobu@r...>
 
 	* process.c (obj2uid, obj2gid): now getpwnam_r() and getgrnam_r()
Index: ruby_2_0_0/version.h
===================================================================
--- ruby_2_0_0/version.h	(revision 46513)
+++ ruby_2_0_0/version.h	(revision 46514)
@@ -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 "2014-06-23"
-#define RUBY_PATCHLEVEL 494
+#define RUBY_PATCHLEVEL 495
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 6

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


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