From a39d29cda15d4f303c989eb0ac644a3144827881 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Mon, 25 May 2020 04:50:56 -0700 Subject: [PATCH] gas: Update fr_literal access in frag for GCC 10 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When access fr_literal in struct frag { ... /* Data begins here. */ char fr_literal[1]; }; with char *buf = fragp->fr_fix + fragp->fr_literal; GCC 10 gave gas/config/tc-csky.c: In function ‘md_convert_frag’: gas/config/tc-csky.c:4507:9: error: writing 1 byte into a region of size 0 [-Werror=stringop-overflow=] 4507 | buf[1] = BYTE_1 (CSKYV1_INST_SUBI | (7 << 4)); | ^ Change char *buf = fragp->fr_fix + fragp->fr_literal; to char *buf = fragp->fr_fix + &fragp->fr_literal[0]; to silence GCC 10 warning. * config/tc-csky.c (md_convert_frag): Replace fragp->fr_literal with &fragp->fr_literal[0]. * config/tc-microblaze.c (md_apply_fix): Likewise. * config/tc-sh.c (md_convert_frag): Likewise. --- gas/ChangeLog | 7 +++++++ gas/config/tc-csky.c | 2 +- gas/config/tc-microblaze.c | 2 +- gas/config/tc-sh.c | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index e3da87381ea..1b0ec36dec2 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,10 @@ +2020-05-25 H.J. Lu + + * config/tc-csky.c (md_convert_frag): Replace fragp->fr_literal + with &fragp->fr_literal[0]. + * config/tc-microblaze.c (md_apply_fix): Likewise. + * config/tc-sh.c (md_convert_frag): Likewise. + 2020-05-24 Jim Wilson PR 26025 diff --git a/gas/config/tc-csky.c b/gas/config/tc-csky.c index 83fca2af73d..be54afbd679 100644 --- a/gas/config/tc-csky.c +++ b/gas/config/tc-csky.c @@ -4196,7 +4196,7 @@ void md_convert_frag (bfd *abfd ATTRIBUTE_UNUSED, segT asec, fragS *fragp) { offsetT disp; - char *buf = fragp->fr_fix + fragp->fr_literal; + char *buf = fragp->fr_fix + &fragp->fr_literal[0]; gas_assert (fragp->fr_symbol); if (IS_EXTERNAL_SYM (fragp->fr_symbol, asec)) diff --git a/gas/config/tc-microblaze.c b/gas/config/tc-microblaze.c index 24ea3582447..ae5d36dc9c3 100644 --- a/gas/config/tc-microblaze.c +++ b/gas/config/tc-microblaze.c @@ -1983,7 +1983,7 @@ md_apply_fix (fixS * fixP, valueT * valp, segT segment) { - char * buf = fixP->fx_where + fixP->fx_frag->fr_literal; + char * buf = fixP->fx_where + &fixP->fx_frag->fr_literal[0]; const char * file = fixP->fx_file ? fixP->fx_file : _("unknown"); const char * symname; /* Note: use offsetT because it is signed, valueT is unsigned. */ diff --git a/gas/config/tc-sh.c b/gas/config/tc-sh.c index d06cc5e9b8b..42f7417c6e3 100644 --- a/gas/config/tc-sh.c +++ b/gas/config/tc-sh.c @@ -3081,7 +3081,7 @@ md_convert_frag (bfd *headers ATTRIBUTE_UNUSED, segT seg, fragS *fragP) differently from ones without delay slots. */ { unsigned char *buffer = - (unsigned char *) (fragP->fr_fix + fragP->fr_literal); + (unsigned char *) (fragP->fr_fix + &fragP->fr_literal[0]); int highbyte = target_big_endian ? 0 : 1; int lowbyte = target_big_endian ? 1 : 0; int delay = fragP->fr_subtype == C (COND_JUMP_DELAY, COND12); -- 2.30.2