Skip to content

Commit 84fe2b2

Browse files
committed
merge revision(s) 44474,44538,44539,44890,44896: [Backport ruby#9495]
* configure.in: use SSE2 instructions for drop unexpected precisions. [ruby-core:54738] [Bug ruby#8358] * configure.in: use SSE2 instructions to drop unexpected precisions on other than mingw. [ruby-core:59472] [Bug ruby#8358] * configure.in: -mstackrealign is necessary for -msse2 working. [ruby-core:54716] [Bug ruby#8349] * configure.in: -mstackrealign is necessary for -msse2 working. [ruby-core:54716] [Bug ruby#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 ruby#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
1 parent aeb412e commit 84fe2b2

3 files changed

Lines changed: 48 additions & 3 deletions

File tree

ChangeLog

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,32 @@
1+
Sun Feb 16 07:13:36 2014 Tanaka Akira <akr@fsij.org>
2+
3+
* configure.in: Fix compilation error.
4+
https://bugs.ruby-lang.org/issues/8358#note-16
5+
6+
Sun Feb 16 07:13:36 2014 Vit Ondruch <vondruch@redhat.com>
7+
8+
* configure.in: add qouting brackets and append wildcard for the
9+
rest after target_cpu, to properly detect platform for SSE2
10+
instructions. [ruby-core:60576] [Bug #8358]
11+
12+
Sun Feb 16 07:13:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
13+
14+
* configure.in: -mstackrealign is necessary for -msse2 working.
15+
[ruby-core:54716] [Bug #8349]
16+
17+
Sun Feb 16 07:13:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
18+
19+
* configure.in: -mstackrealign is necessary for -msse2 working.
20+
[ruby-core:54716] [Bug #8349]
21+
22+
* configure.in: use SSE2 instructions to drop unexpected precisions on
23+
other than mingw. [ruby-core:59472] [Bug #8358]
24+
25+
Sun Feb 16 07:13:36 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
26+
27+
* configure.in: use SSE2 instructions for drop unexpected
28+
precisions. [ruby-core:54738] [Bug #8358]
29+
130
Fri Feb 7 04:19:19 2014 Koichi Sasada <ko1@atdot.net>
231

332
* gc.c (get_envparam_int): correct warning messsages.

configure.in

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -856,6 +856,22 @@ if test "$GCC" = yes; then
856856
for oflag in -fno-fast-math; do
857857
RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
858858
done
859+
AS_CASE(["$target"],
860+
[*-darwin*], [
861+
# doesn't seem necessary on Mac OS X
862+
],
863+
[[i[4-6]86*]], [
864+
RUBY_TRY_CFLAGS(-msse2 -mfpmath=sse, [
865+
RUBY_APPEND_OPTION(XCFLAGS, -msse2 -mfpmath=sse)
866+
])
867+
AS_CASE(["$XCFLAGS"],
868+
[[*-msse2*]], [
869+
RUBY_TRY_CFLAGS(-mstackrealign, [
870+
RUBY_APPEND_OPTION(XCFLAGS, -mstackrealign)
871+
])
872+
])
873+
]
874+
)
859875
fi
860876

861877
AC_ARG_WITH(opt-dir,

version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#define RUBY_VERSION "2.1.1"
2-
#define RUBY_RELEASE_DATE "2014-02-10"
3-
#define RUBY_PATCHLEVEL 30
2+
#define RUBY_RELEASE_DATE "2014-02-16"
3+
#define RUBY_PATCHLEVEL 31
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 2
7-
#define RUBY_RELEASE_DAY 10
7+
#define RUBY_RELEASE_DAY 16
88

99
#include "ruby/version.h"
1010

0 commit comments

Comments
 (0)