10000 merge revision(s) r47860: [Backport #10350] · github/ruby@d4239a9 · GitHub
[go: up one dir, main page]
Skip to content

Commit d4239a9

Browse files
nagachikanagachika
committed
merge revision(s) r47860: [Backport ruby#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 ruby#10350] [ruby-dev:48608] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_1@48303 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent e5db49c commit d4239a9

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

‎ChangeLog

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Thu Nov 6 22:57:43 2014 Naohisa Goto <ngotogenome@gmail.com>
2+
3+
* bignum.c (absint_numwords_generic): set an array element after
4+
definition of a variable to fix compile error with older version
5+
of fcc (Fujitsu C Compiler) 5.6 on Solaris 10 on Sparc.
6+
[Bug #10350] [ruby-dev:48608]
7+
18
Thu Nov 6 22:36:55 2014 Naohisa Goto <ngotogenome@gmail.com>
29

310
* compile.c (compile_data_alloc): add padding when strict alignment

‎bignum.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3294,7 +3294,7 @@ absint_numwords_generic(size_t numbytes, int nlz_bits_in_msbyte, size_t word_num
32943294
static const BDIGIT char_bit[1] = { CHAR_BIT };
32953295
BDIGIT numbytes_bary[bdigit_roomof(sizeof(numbytes))];
32963296
BDIGIT val_numbits_bary[bdigit_roomof(sizeof(numbytes) + 1)];
3297-
BDIGIT nlz_bits_in_msbyte_bary[1] = { nlz_bits_in_msbyte };
3297+
BDIGIT nlz_bits_in_msbyte_bary[1];
32983298
BDIGIT word_numbits_bary[bdigit_roomof(sizeof(word_numbits))];
32993299
BDIGIT div_bary[numberof(val_numbits_bary) + BIGDIVREM_EXTRA_WORDS];
33003300
BDIGIT mod_bary[numberof(word_numbits_bary)];
@@ -3304,6 +3304,8 @@ absint_numwords_generic(size_t numbytes, int nlz_bits_in_msbyte, size_t word_num
33043304
int sign;
33053305
size_t numwords;
33063306

3307+
nlz_bits_in_msbyte_bary[0] = nlz_bits_in_msbyte;
3308+
33073309
/*
33083310
* val_numbits = numbytes * CHAR_BIT - nlz_bits_in_msbyte
33093311
* div, mod = val_numbits.divmod(word_numbits)

‎version.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#define RUBY_VERSION "2.1.5"
22
#define RUBY_RELEASE_DATE "2014-11-06"
3-
#define RUBY_PATCHLEVEL 271
3+
#define RUBY_PATCHLEVEL 272
44

55
#define RUBY_RELEASE_YEAR 2014
66
#define RUBY_RELEASE_MONTH 11

0 commit comments

Comments
 (0)
0