1*4882a593SmuzhiyunFrom ef4ba1da823e8366ea4f126f50885a44ebf4dcf0 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Giulio Benetti <giulio.benetti@benettiengineering.com> 3*4882a593SmuzhiyunDate: Wed, 9 Jun 2021 17:28:27 +0200 4*4882a593SmuzhiyunSubject: [PATCH] bfd/elf32-or1k: fix building with gcc version < 5 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunGcc version >= 5 has standard C mode not set to -std=gnu11, so if we use 7*4882a593Smuzhiyunan old compiler(i.e. gcc 4.9) build fails on: 8*4882a593Smuzhiyun``` 9*4882a593Smuzhiyunelf32-or1k.c:2251:3: error: 'for' loop initial declarations are only allowed in 10*4882a593SmuzhiyunC99 or C11 mode 11*4882a593Smuzhiyun for (size_t i = 0; i < insn_count; i++) 12*4882a593Smuzhiyun ^ 13*4882a593Smuzhiyun``` 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunSo let's declare `size_t i` at the top of the function instead of inside 16*4882a593Smuzhiyunfor loop. 17*4882a593Smuzhiyun 18*4882a593SmuzhiyunSigned-off-by: Giulio Benetti <giulio.benetti@benettiengineering.com> 19*4882a593Smuzhiyun--- 20*4882a593Smuzhiyun bfd/elf32-or1k.c | 5 +++-- 21*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 2 deletions(-) 22*4882a593Smuzhiyun 23*4882a593Smuzhiyundiff --git a/bfd/elf32-or1k.c b/bfd/elf32-or1k.c 24*4882a593Smuzhiyunindex 4ae7f324d33..32063ab0289 100644 25*4882a593Smuzhiyun--- a/bfd/elf32-or1k.c 26*4882a593Smuzhiyun+++ b/bfd/elf32-or1k.c 27*4882a593Smuzhiyun@@ -2244,9 +2244,10 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, 28*4882a593Smuzhiyun { 29*4882a593Smuzhiyun unsigned nodelay = elf_elfheader (output_bfd)->e_flags & EF_OR1K_NODELAY; 30*4882a593Smuzhiyun unsigned output_insns[PLT_MAX_INSN_COUNT]; 31*4882a593Smuzhiyun+ size_t i; 32*4882a593Smuzhiyun 33*4882a593Smuzhiyun /* Copy instructions into the output buffer. */ 34*4882a593Smuzhiyun- for (size_t i = 0; i < insn_count; i++) 35*4882a593Smuzhiyun+ for (i = 0; i < insn_count; i++) 36*4882a593Smuzhiyun output_insns[i] = insns[i]; 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun /* Honor the no-delay-slot setting. */ 39*4882a593Smuzhiyun@@ -2277,7 +2278,7 @@ or1k_write_plt_entry (bfd *output_bfd, bfd_byte *contents, unsigned insnj, 40*4882a593Smuzhiyun } 41*4882a593Smuzhiyun 42*4882a593Smuzhiyun /* Write out the output buffer. */ 43*4882a593Smuzhiyun- for (size_t i = 0; i < (insn_count+1); i++) 44*4882a593Smuzhiyun+ for (i = 0; i < (insn_count+1); i++) 45*4882a593Smuzhiyun bfd_put_32 (output_bfd, output_insns[i], contents + (i*4)); 46*4882a593Smuzhiyun } 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun-- 49*4882a593Smuzhiyun2.31.1 50*4882a593Smuzhiyun 51