diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-23 20:11:27 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-03-23 20:11:27 +0000 |
| commit | 5727caf689097592fedf0a33420e1b8136c50c1a (patch) | |
| tree | da1dbce17324e9933e77853fbeb7061901c3a5cc | |
| parent | 410699b90e2bb1d2ac2c0d49c204d2576d8335a1 (diff) | |
merge revision(s) r47129,r48844: [Backport #10120]
configure.in: remove SSE options
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@50067 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | configure.in | 16 | ||||
| -rw-r--r-- | test/ruby/test_sprintf.rb | 5 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 6 insertions, 21 deletions
diff --git a/configure.in b/configure.in index cc8849eb45..96331a808a 100644 --- a/configure.in +++ b/configure.in @@ -863,22 +863,6 @@ 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*|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 AC_ARG_WITH(opt-dir, diff --git a/test/ruby/test_sprintf.rb b/test/ruby/test_sprintf.rb index eff35c18da..9fc3fd059f 100644 --- a/test/ruby/test_sprintf.rb +++ b/test/ruby/test_sprintf.rb @@ -194,8 +194,9 @@ class TestSprintf < Test::Unit::TestCase sprintf("%20.0f", 36893488147419107329.0)) assert_equal(" Inf", sprintf("% 0e", 1.0/0.0), "moved from btest/knownbug") assert_equal(" -0.", sprintf("%#10.0f", -0.5), "[ruby-dev:42552]") - assert_equal("0x1p+2", sprintf('%.0a', Float('0x1.fp+1')), "[ruby-dev:42551]") - assert_equal("-0x1.0p+2", sprintf('%.1a', Float('-0x1.ffp+1')), "[ruby-dev:42551]") + # out of spec + #assert_equal("0x1p+2", sprintf('%.0a', Float('0x1.fp+1')), "[ruby-dev:42551]") + #assert_equal("-0x1.0p+2", sprintf('%.1a', Float('-0x1.ffp+1')), "[ruby-dev:42551]") end def test_float_hex @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.1.5" -#define RUBY_RELEASE_DATE "2015-03-22" -#define RUBY_PATCHLEVEL 320 +#define RUBY_RELEASE_DATE "2015-03-24" +#define RUBY_PATCHLEVEL 321 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 22 +#define RUBY_RELEASE_DAY 24 #include "ruby/version.h" |