From c83ad9aaedf690bcae947e27a09a217c2948e75e Mon Sep 17 00:00:00 2001 From: naruse Date: Sun, 16 Feb 2014 00:13:51 +0000 Subject: [PATCH] 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 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@44993 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 29 +++++++++++++++++++++++++++++ configure.in | 16 ++++++++++++++++ version.h | 6 +++--- 3 files changed, 48 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f7d3e092c..cdc4eb6fc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,32 @@ +Sun Feb 16 07:13:36 2014 Tanaka Akira + + * configure.in: Fix compilation error. + https://bugs.ruby-lang.org/issues/8358#note-16 + +Sun Feb 16 07:13:36 2014 Vit Ondruch + + * 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 + + * configure.in: -mstackrealign is necessary for -msse2 working. + [ruby-core:54716] [Bug #8349] + +Sun Feb 16 07:13:36 2014 Nobuyoshi Nakada + + * 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 + + * configure.in: use SSE2 instructions for drop unexpected + precisions. [ruby-core:54738] [Bug #8358] + Fri Feb 7 04:19:19 2014 Koichi Sasada * gc.c (get_envparam_int): correct warning messsages. diff --git a/configure.in b/configure.in index 84f176dd94..95ab2723a4 100644 --- a/configure.in +++ b/configure.in @@ -856,6 +856,22 @@ if test "$GCC" = yes; then 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, diff --git a/version.h b/version.h index 1f1fb66024..183459c525 100644 --- a/version.h +++ b/version.h @@ -1,10 +1,10 @@ #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"