naruse	2016-04-12 16:22:21 +0900 (Tue, 12 Apr 2016)

  New Revision: 54552

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

  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_3/
  Modified files:
    branches/ruby_2_3/ChangeLog
    branches/ruby_2_3/configure.in
    branches/ruby_2_3/lib/mkmf.rb
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 54551)
+++ ruby_2_3/version.h	(revision 54552)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.0"
 #define RUBY_RELEASE_DATE "2016-04-12"
-#define RUBY_PATCHLEVEL 77
+#define RUBY_PATCHLEVEL 78
 
 #define RUBY_RELEASE_YEAR 2016
 #define RUBY_RELEASE_MONTH 4
Index: ruby_2_3/lib/mkmf.rb
===================================================================
--- ruby_2_3/lib/mkmf.rb	(revision 54551)
+++ ruby_2_3/lib/mkmf.rb	(revision 54552)
@@ -2475,6 +2475,9 @@ site-install-rb: install-rb https://github.com/ruby/ruby/blob/trunk/ruby_2_3/lib/mkmf.rb#L2475
     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_3/ChangeLog
===================================================================
--- ruby_2_3/ChangeLog	(revision 54551)
+++ ruby_2_3/ChangeLog	(revision 54552)
@@ -1,3 +1,19 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/ChangeLog#L1
+Tue Apr 12 16:15:39 2016  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.
+
 Tue Apr 12 14:29:01 2016  Kazuki Yamaguchi  <k@r...>
 
 	* ext/openssl/extconf.rb: check SSL_CTX_set_next_proto_select_cb
Index: ruby_2_3/configure.in
===================================================================
--- ruby_2_3/configure.in	(revision 54551)
+++ ruby_2_3/configure.in	(revision 54552)
@@ -259,6 +259,7 @@ AS_CASE(["$build_os"], https://github.com/ruby/ruby/blob/trunk/ruby_2_3/configure.in#L259
       [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"
@@ -806,6 +807,7 @@ if test "$GCC:${warnflags+set}:no" = yes https://github.com/ruby/ruby/blob/trunk/ruby_2_3/configure.in#L807
 	extra_warning="$extra_warning -Wno-maybe-uninitialized"
     fi
     for wflag in -Wno-unused-parameter -Wno-parentheses -Wno-long-long \
+                 -diag-disable=2259 \
 		 -Wno-missing-field-initializers \
 		 -Wunused-variable \
 		 -Werror=pointer-arith \
@@ -946,7 +948,7 @@ if test "$GCC" = yes; then https://github.com/ruby/ruby/blob/trunk/ruby_2_3/configure.in#L948
     ])
 
     # 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

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


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