mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2024-12-07 09:20:11 +00:00
Code Issues Releases Activity

Backport fix for binutils 11867: .quad directive not assembled correctly

Browse Source 
Alan Modra (and Alan's employer) graciously permitted use of his patch
under GPLv2.

Obtained from:	OpenBSD
MFC after:	5 days
This commit is contained in:
Pedro F. Giffuni 2014-12-26 04:33:53 +00:00
parent 32d0bb7e1b
commit e63365a089
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=276229
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
contrib/binutils/gas/expr.c
View File

@ -1040,6 +1040,15 @@ operand (expressionS *expressionP, enum expr_mode mode)
{
for (i = 0; i < expressionP->X_add_number; ++i)
generic_bignum[i] = ~generic_bignum[i];
/* Extend the bignum to at least the size of .octa. */
if (expressionP->X_add_number < SIZE_OF_LARGE_NUMBER)
{
expressionP->X_add_number = SIZE_OF_LARGE_NUMBER;
for (; i < expressionP->X_add_number; ++i)
generic_bignum[i] = ~(LITTLENUM_TYPE) 0;
}
if (c == '-')
for (i = 0; i < expressionP->X_add_number; ++i)
{
@ -1050,14 +1059,12 @@ operand (expressionS *expressionP, enum expr_mode mode)
}
else if (c == '!')
{
int nonzero = 0;
for (i = 0; i < expressionP->X_add_number; ++i)
{
if (generic_bignum[i])
nonzero = 1;
generic_bignum[i] = 0;
}
generic_bignum[0] = nonzero;
if (generic_bignum[i] != 0)
break;
expressionP->X_add_number = i >= expressionP->X_add_number;
expressionP->X_op = O_constant;
expressionP->X_unsigned = 1;
}
}
else if (expressionP->X_op != O_illegal

23
contrib/binutils/gas/read.c
View File

@ -4117,15 +4117,32 @@ emit_expr (expressionS *exp, unsigned int nbytes)
unsigned int size;
LITTLENUM_TYPE *nums;
know (nbytes % CHARS_PER_LITTLENUM == 0);
size = exp->X_add_number * CHARS_PER_LITTLENUM;
if (nbytes < size)
{
as_warn (_("bignum truncated to %d bytes"), nbytes);
int i = nbytes / CHARS_PER_LITTLENUM;
if (i != 0)
{
LITTLENUM_TYPE sign = 0;
if ((generic_bignum[--i]
& (1 << (LITTLENUM_NUMBER_OF_BITS - 1))) != 0)
sign = ~(LITTLENUM_TYPE) 0;
while (++i < exp->X_add_number)
if (generic_bignum[i] != sign)
break;
}
if (i < exp->X_add_number)
as_warn (_("bignum truncated to %d bytes"), nbytes);
size = nbytes;
}
if (nbytes == 1)
{
md_number_to_chars (p, (valueT) generic_bignum[0], 1);
return;
}
know (nbytes % CHARS_PER_LITTLENUM == 0);
if (target_big_endian)
{
while (nbytes > size)