nagachika	2014-11-06 23:19:59 +0900 (Thu, 06 Nov 2014)

  New Revision: 48303

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

  Log:
    merge revision(s) r47860: [Backport #10350]
    
    * bignum.c (absint_numwords_generic): set an array element after
      definition of a variable to fix compile error with older version
      of fcc (Fujitsu C Compiler) 5.6 on Solaris 10 on Sparc.
      [Bug #10350] [ruby-dev:48608]

  Modified directories:
    branches/ruby_2_1/
  Modified files:
    branches/ruby_2_1/ChangeLog
    branches/ruby_2_1/bignum.c
    branches/ruby_2_1/version.h
Index: ruby_2_1/ChangeLog
===================================================================
--- ruby_2_1/ChangeLog	(revision 48302)
+++ ruby_2_1/ChangeLog	(revision 48303)
@@ -1,3 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1
+Thu Nov  6 22:57:43 2014  Naohisa Goto  <ngotogenome@g...>
+
+	* bignum.c (absint_numwords_generic): set an array element after
+	  definition of a variable to fix compile error with older version
+	  of fcc (Fujitsu C Compiler) 5.6 on Solaris 10 on Sparc.
+	  [Bug #10350] [ruby-dev:48608]
+
 Thu Nov  6 22:36:55 2014  Naohisa Goto  <ngotogenome@g...>
 
 	* compile.c (compile_data_alloc): add padding when strict alignment
Index: ruby_2_1/version.h
===================================================================
--- ruby_2_1/version.h	(revision 48302)
+++ ruby_2_1/version.h	(revision 48303)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1
 #define RUBY_VERSION "2.1.5"
 #define RUBY_RELEASE_DATE "2014-11-06"
-#define RUBY_PATCHLEVEL 271
+#define RUBY_PATCHLEVEL 272
 
 #define RUBY_RELEASE_YEAR 2014
 #define RUBY_RELEASE_MONTH 11
Index: ruby_2_1/bignum.c
===================================================================
--- ruby_2_1/bignum.c	(revision 48302)
+++ ruby_2_1/bignum.c	(revision 48303)
@@ -3294,7 +3294,7 @@ absint_numwords_generic(size_t numbytes, https://github.com/ruby/ruby/blob/trunk/ruby_2_1/bignum.c#L3294
     static const BDIGIT char_bit[1] = { CHAR_BIT };
     BDIGIT numbytes_bary[bdigit_roomof(sizeof(numbytes))];
     BDIGIT val_numbits_bary[bdigit_roomof(sizeof(numbytes) + 1)];
-    BDIGIT nlz_bits_in_msbyte_bary[1] = { nlz_bits_in_msbyte };
+    BDIGIT nlz_bits_in_msbyte_bary[1];
     BDIGIT word_numbits_bary[bdigit_roomof(sizeof(word_numbits))];
     BDIGIT div_bary[numberof(val_numbits_bary) + BIGDIVREM_EXTRA_WORDS];
     BDIGIT mod_bary[numberof(word_numbits_bary)];
@@ -3304,6 +3304,8 @@ absint_numwords_generic(size_t numbytes, https://github.com/ruby/ruby/blob/trunk/ruby_2_1/bignum.c#L3304
     int sign;
     size_t numwords;
 
+    nlz_bits_in_msbyte_bary[0] = nlz_bits_in_msbyte;
+
     /*
      * val_numbits = numbytes * CHAR_BIT - nlz_bits_in_msbyte
      * div, mod = val_numbits.divmod(word_numbits)

Property changes on: ruby_2_1
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r47860


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