* config/tc-m68k.c (md_estimate_size_before_relax): Correct check

for byte jump to next instruction to skip empty frags.
PR 7044.
This commit is contained in:
Ian Lance Taylor
1996-04-11 16:41:48 +00:00
parent aa59d90e55
commit 65feb78d13
2 changed files with 25 additions and 7 deletions

View File

@ -1,3 +1,8 @@
Thu Apr 11 12:39:02 1996 Ian Lance Taylor <ian@cygnus.com>
* config/tc-m68k.c (md_estimate_size_before_relax): Correct check
for byte jump to next instruction to skip empty frags.
Wed Apr 10 16:48:12 1996 Ian Lance Taylor <ian@cygnus.com> Wed Apr 10 16:48:12 1996 Ian Lance Taylor <ian@cygnus.com>
* config/tc-alpha.c (alpha_ip): If we are going to call emit_add64 * config/tc-alpha.c (alpha_ip): If we are going to call emit_add64

View File

@ -28,7 +28,7 @@
/* This array holds the chars that always start a comment. If the /* This array holds the chars that always start a comment. If the
pre-processor is disabled, these aren't very useful */ pre-processor is disabled, these aren't very useful */
#if (defined (OBJ_ELF) && ! defined (TE_PSOS)) || defined (TE_DELTA) #if (defined (OBJ_ELF) && ! defined (TE_PSOS) && ! defined (TE_LINUX)) || defined (TE_DELTA)
const char comment_chars[] = "|#"; const char comment_chars[] = "|#";
#else #else
const char comment_chars[] = "|"; const char comment_chars[] = "|";
@ -4159,14 +4159,27 @@ md_estimate_size_before_relax (fragP, segment)
{ {
case TAB (BCC68000, BYTE): case TAB (BCC68000, BYTE):
case TAB (ABRANCH, BYTE): case TAB (ABRANCH, BYTE):
/* We can't do a short jump to the next instruction, /* We can't do a short jump to the next instruction, so we force
so we force word mode. */ word mode. At this point S_GET_VALUE should return the
if (fragP->fr_symbol && S_GET_VALUE (fragP->fr_symbol) == 0 && offset of the symbol within its frag. If the symbol is at
fragP->fr_symbol->sy_frag == fragP->fr_next) the start of a frag, and it is the next frag with any data in
it (usually this just the next frag, but assembler listings
may introduce empty frags), we must use word mode. */
if (fragP->fr_symbol && S_GET_VALUE (fragP->fr_symbol) == 0)
{
fragS *l;
for (l = fragP->fr_next;
l != fragP->fr_symbol->sy_frag;
l = l->fr_next)
if (l->fr_fix + l->fr_var != 0)
break;
if (l == fragP->fr_symbol->sy_frag)
{ {
fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), SHORT); fragP->fr_subtype = TAB (TABTYPE (fragP->fr_subtype), SHORT);
fragP->fr_var += 2; fragP->fr_var += 2;
} }
}
break; break;
default: default:
break; break;