usa	2017-03-27 01:42:03 +0900 (Mon, 27 Mar 2017)

  New Revision: 58143

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

  Log:
    merge revision(s) 53566:
    
    * configure.in: improve ICC (Intel C Compiler) support.
    
    * configure.in (CXX): The name of icc's c++ compiler is `icpc`.
    
    * configure.in (warnings): Add `-diag-disable=2259` to suppress
      noisy warnings: "non-pointer conversion from "..." to "..." may
      lose significant bits".
    
    * configure.in (optflags): Add `-fp-model precise` like -fno-fast-math.
    
    * lib/mkmf.rb: icc supports -Werror=division-by-zero
      and -Werror=deprecated-declarations, but doesn't support
      -Wdivision-by-zero and -Wdeprecated-declarations.

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/configure.in
    branches/ruby_2_2/lib/mkmf.rb
    branches/ruby_2_2/version.h
Index: ruby_2_2/configure.in
===================================================================
--- ruby_2_2/configure.in	(revision 58142)
+++ ruby_2_2/configure.in	(revision 58143)
@@ -255,6 +255,7 @@ AS_CASE(["$build_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L255
       [xgcc-4.2|x/usr/bin/gcc-4.2], [: ${CXX=g++-4.2}],
       [xgcc|x/usr/bin/gcc],         [: ${CXX=g++}],
       [xcc|x/usr/bin/cc],           [: ${CXX=c++}],
+      [xicc],                       [: ${CXX=icpc}],
       [xclang|x/usr/bin/clang],     [: ${CXX=clang++}])
   ])
 test -z "$CC" || ac_cv_prog_CC="$CC"
@@ -794,6 +795,7 @@ if test "$GCC:${warnflags+set}:no" = yes https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L795
 	extra_warning=
     fi
     for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
+                 -diag-disable=2259 \
 		 -Wno-missing-field-initializers \
 		 -Wunused-variable \
 		 -Werror=pointer-arith \
@@ -948,7 +950,7 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_2/configure.in#L950
     ])
 
     # disable fast-math
-    for oflag in -fno-fast-math; do
+    for oflag in -fno-fast-math -fp-model\ precise; do
 	RUBY_TRY_CFLAGS($oflag, [RUBY_APPEND_OPTION(optflags, $oflag)])
     done
 fi
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 58142)
+++ ruby_2_2/ChangeLog	(revision 58143)
@@ -1,3 +1,19 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Mon Mar 27 01:41:37 2017  NARUSE, Yui  <naruse@r...>
+
+	* configure.in: improve ICC (Intel C Compiler) support.
+
+	* configure.in (CXX): The name of icc's c++ compiler is `icpc`.
+
+	* configure.in (warnings): Add `-diag-disable=2259` to suppress
+	  noisy warnings: "non-pointer conversion from "..." to "..." may
+	  lose significant bits".
+
+	* configure.in (optflags): Add `-fp-model precise` like -fno-fast-math.
+
+	* lib/mkmf.rb: icc supports -Werror=division-by-zero
+	  and -Werror=deprecated-declarations, but doesn't support
+	  -Wdivision-by-zero and -Wdeprecated-declarations.
+
 Sun Mar 26 17:24:02 2017  NAKAMURA Usaku  <usa@r...>
 
 	* thread.c (rb_thread_fd_close): unintentionally removed at r58094.
Index: ruby_2_2/lib/mkmf.rb
===================================================================
--- ruby_2_2/lib/mkmf.rb	(revision 58142)
+++ ruby_2_2/lib/mkmf.rb	(revision 58143)
@@ -2438,6 +2438,9 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/ruby_2_2/lib/mkmf.rb#L2438
     if $warnflags = CONFIG['warnflags'] and CONFIG['GCC'] == 'yes'
       # turn warnings into errors only for bundled extensions.
       config['warnflags'] = $warnflags.gsub(/(\A|\s)-Werror[-=]/, '\1-W')
+      if /icc\z/ =~ config['CC']
+        config['warnflags'].gsub!(/(\A|\s)-W(?:division-by-zero|deprecated-declarations)/, '\1')
+      end
       RbConfig.expand(rbconfig['warnflags'] = config['warnflags'].dup)
       config.each do |key, val|
         RbConfig.expand(rbconfig[key] = val.dup) if /warnflags/ =~ val
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 58142)
+++ ruby_2_2/version.h	(revision 58143)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.7"
-#define RUBY_RELEASE_DATE "2017-03-26"
-#define RUBY_PATCHLEVEL 468
+#define RUBY_RELEASE_DATE "2017-03-27"
+#define RUBY_PATCHLEVEL 469
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 26
+#define RUBY_RELEASE_DAY 27
 
 #include "ruby/version.h"
 

Property changes on: ruby_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r53566


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