c-common.c (combine_strings): Widen strings in a host-endian-independent way.

* c-common.c (combine_strings): Widen strings in a
host-endian-independent way.

From-SVN: r41941
This commit is contained in:
DJ Delorie 2001-05-10 13:39:19 -04:00 committed by DJ Delorie
parent 25d78ace72
commit b0089a92a3
2 changed files with 17 additions and 5 deletions

View File

@ -1,3 +1,8 @@
2001-05-10 DJ Delorie <dj@redhat.com>
* c-common.c (combine_strings): Widen strings in a
host-endian-independent way.
2001-05-10 Joseph S. Myers <jsm28@cam.ac.uk> 2001-05-10 Joseph S. Myers <jsm28@cam.ac.uk>
* c-parse.in: Remove many shift/reduce conflicts. Update * c-parse.in: Remove many shift/reduce conflicts. Update

View File

@ -583,15 +583,22 @@ combine_strings (strings)
} }
else else
{ {
int i; int i, j;
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
{ {
if (WCHAR_TYPE_SIZE == HOST_BITS_PER_SHORT) if (BYTES_BIG_ENDIAN)
((short *) q)[i] = TREE_STRING_POINTER (t)[i]; {
for (j=0; j<(WCHAR_TYPE_SIZE / BITS_PER_UNIT)-1; j++)
*q++ = 0;
*q++ = TREE_STRING_POINTER (t)[i];
}
else else
((int *) q)[i] = TREE_STRING_POINTER (t)[i]; {
*q++ = TREE_STRING_POINTER (t)[i];
for (j=0; j<(WCHAR_TYPE_SIZE / BITS_PER_UNIT)-1; j++)
*q++ = 0;
}
} }
q += len * wchar_bytes;
} }
} }
if (wide_flag) if (wide_flag)