github/amigaos-binutils
2
0
Fork 0
mirror of https://frontier.innolan.net/github/amigaos-binutils.git synced 2025-11-22 18:16:23 +00:00
Code Releases Activity

Fix assembler output of the non-bfd version when running on a 64bit host.

Browse Source 
* gas/config/aout_gnu.h (BYTES_IN_WORD): New define.
  (struct exec_bytes): Use it.
  (EXEC_BYTES_SIZE): Likewise.
* gas/config/obj-aout.c (CROSS_COMPILE): Convert to a compile time constant
  of 0 or 1.
  (obj_header_append): Use "struct exec_bytes" when cross compiling.
  (obj_symbol_to_chars): Output symbol data with a local "struct nlist_bytes"
  utilizing BYTES_IN_WORD.
  (obj_crawl_symbol_chain): Ignore symbols without a valid name like BFD.
  (obj_emit_strings): Use BYTES_IN_WORD to output string table size when
  cross compiling.
  Suppress symbols without a valid name like BFD.
* gas/write.c (write_object_file): Replace "sizeof (string_byte_count)" with
  BYTES_IN_WORD.
This commit is contained in:
Gunther Nikl
2014-11-16 18:42:30 +00:00
parent 29a0d609c6
commit c796c52d23
3 changed files with 59 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gas/config/aout_gnu.h
View File

@ -72,20 +72,22 @@ enum reloc_type
"struct exec". Don't assume that on this machine, the "struct exec"
will lay out the same sizes or alignments. */
#define BYTES_IN_WORD 4
struct exec_bytes
{
unsigned char a_info[4];
unsigned char a_text[4];
unsigned char a_data[4];
unsigned char a_bss[4];
unsigned char a_syms[4];
unsigned char a_entry[4];
unsigned char a_trsize[4];
unsigned char a_drsize[4];
unsigned char a_text[BYTES_IN_WORD];
unsigned char a_data[BYTES_IN_WORD];
unsigned char a_bss[BYTES_IN_WORD];
unsigned char a_syms[BYTES_IN_WORD];
unsigned char a_entry[BYTES_IN_WORD];
unsigned char a_trsize[BYTES_IN_WORD];
unsigned char a_drsize[BYTES_IN_WORD];
};
/* How big the "struct exec" is on disk */
#define EXEC_BYTES_SIZE (8 * 4)
#define EXEC_BYTES_SIZE (4 + BYTES_IN_WORD * 7)
/* This is the layout in memory of a "struct exec" while we process it. */

81
gas/config/obj-aout.c
View File

@ -28,6 +28,13 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#endif
#include "obstack.h"
#ifdef CROSS_COMPILE
#undef CROSS_COMPILE
#define CROSS_COMPILE 1
#else
#define CROSS_COMPILE 0
#endif /* CROSS_COMPILE */
#ifndef BFD_ASSEMBLER
/* in: segT out: N_TYPE bits */
const short seg_N_TYPE[] =
@ -272,29 +279,23 @@ obj_header_append (where, headers)
{
tc_headers_hook (headers);
#ifdef CROSS_COMPILE
md_number_to_chars (*where, headers->header.a_info, sizeof (headers->header.a_info));
*where += sizeof (headers->header.a_info);
md_number_to_chars (*where, headers->header.a_text, sizeof (headers->header.a_text));
*where += sizeof (headers->header.a_text);
md_number_to_chars (*where, headers->header.a_data, sizeof (headers->header.a_data));
*where += sizeof (headers->header.a_data);
md_number_to_chars (*where, headers->header.a_bss, sizeof (headers->header.a_bss));
*where += sizeof (headers->header.a_bss);
md_number_to_chars (*where, headers->header.a_syms, sizeof (headers->header.a_syms));
*where += sizeof (headers->header.a_syms);
md_number_to_chars (*where, headers->header.a_entry, sizeof (headers->header.a_entry));
*where += sizeof (headers->header.a_entry);
md_number_to_chars (*where, headers->header.a_trsize, sizeof (headers->header.a_trsize));
*where += sizeof (headers->header.a_trsize);
md_number_to_chars (*where, headers->header.a_drsize, sizeof (headers->header.a_drsize));
*where += sizeof (headers->header.a_drsize);
if (CROSS_COMPILE)
{
struct exec_bytes *const e_b = (void *) *where;
#else /* CROSS_COMPILE */
append (where, (char *) &headers->header, sizeof (headers->header));
#endif /* CROSS_COMPILE */
md_number_to_chars ((char *) e_b->a_info, headers->header.a_info, sizeof (e_b->a_info));
md_number_to_chars ((char *) e_b->a_text, headers->header.a_text, sizeof (e_b->a_text));
md_number_to_chars ((char *) e_b->a_data, headers->header.a_data, sizeof (e_b->a_data));
md_number_to_chars ((char *) e_b->a_bss, headers->header.a_bss, sizeof (e_b->a_bss));
md_number_to_chars ((char *) e_b->a_syms, headers->header.a_syms, sizeof (e_b->a_syms));
md_number_to_chars ((char *) e_b->a_entry, headers->header.a_entry, sizeof (e_b->a_entry));
md_number_to_chars ((char *) e_b->a_trsize, headers->header.a_trsize, sizeof (e_b->a_trsize));
md_number_to_chars ((char *) e_b->a_drsize, headers->header.a_drsize, sizeof (e_b->a_drsize));
*where += sizeof (*e_b);
}
else
append (where, (char *) &headers->header, sizeof (headers->header));
}
#endif /* ! defined (obj_header_append) */
@ -303,11 +304,22 @@ obj_symbol_to_chars (where, symbolP)
char **where;
symbolS *symbolP;
{
md_number_to_chars ((char *) &(S_GET_OFFSET (symbolP)), S_GET_OFFSET (symbolP), sizeof (S_GET_OFFSET (symbolP)));
md_number_to_chars ((char *) &(S_GET_DESC (symbolP)), S_GET_DESC (symbolP), sizeof (S_GET_DESC (symbolP)));
md_number_to_chars ((char *) &(symbolP->sy_symbol.n_value), S_GET_VALUE (symbolP), sizeof (symbolP->sy_symbol.n_value));
struct /* nlist_bytes */
{
unsigned char n_strx[BYTES_IN_WORD];
unsigned char n_type;
unsigned char n_other;
unsigned char n_desc[2];
unsigned char n_value[BYTES_IN_WORD];
} *const sy_nlist = (void *) *where;
append (where, (char *) &symbolP->sy_symbol, sizeof (obj_symbol_type));
md_number_to_chars ((char *) sy_nlist->n_strx, S_GET_OFFSET (symbolP), sizeof (sy_nlist->n_strx));
sy_nlist->n_type = symbolP->sy_symbol.n_type;
sy_nlist->n_other = symbolP->sy_symbol.n_other;
md_number_to_chars ((char *) sy_nlist->n_desc, S_GET_DESC (symbolP), sizeof (sy_nlist->n_desc));
md_number_to_chars ((char *) sy_nlist->n_value, S_GET_VALUE (symbolP), sizeof (sy_nlist->n_value));
*where += sizeof (*sy_nlist);
}
void
@ -504,7 +516,7 @@ obj_crawl_symbol_chain (headers)
/* The + 1 after strlen account for the \0 at the
end of each string */
if (!S_IS_STABD (symbolP))
if (!S_IS_STABD (symbolP) && S_GET_NAME (symbolP)[0])
{
/* Ordinary case. */
symbolP->sy_name_offset = string_byte_count;
@ -542,17 +554,18 @@ obj_emit_strings (where)
{
symbolS *symbolP;
#ifdef CROSS_COMPILE
/* Gotta do md_ byte-ordering stuff for string_byte_count first - KWK */
md_number_to_chars (*where, string_byte_count, sizeof (string_byte_count));
*where += sizeof (string_byte_count);
#else /* CROSS_COMPILE */
append (where, (char *) &string_byte_count, (unsigned long) sizeof (string_byte_count));
#endif /* CROSS_COMPILE */
if (CROSS_COMPILE)
{
/* Gotta do md_ byte-ordering stuff for string_byte_count first - KWK */
md_number_to_chars (*where, string_byte_count, BYTES_IN_WORD);
*where += BYTES_IN_WORD;
}
else
append (where, (char *) &string_byte_count, sizeof (string_byte_count));
for (symbolP = symbol_rootP; symbolP; symbolP = symbol_next (symbolP))
{
if (S_GET_NAME (symbolP))
if (S_GET_NAME (symbolP) && symbolP->sy_name_offset)
append (&next_object_file_charP, S_GET_NAME (symbolP),
(unsigned long) (strlen (S_GET_NAME (symbolP)) + 1));
} /* walk symbol chain */

4
gas/write.c
View File

@ -1611,11 +1611,11 @@ write_object_file ()
Count the number of string-table chars we will emit.
Put this info into the headers as appropriate. */
know (zero_address_frag.fr_address == 0);
string_byte_count = sizeof (string_byte_count);
string_byte_count = BYTES_IN_WORD;
obj_crawl_symbol_chain (&headers);
if (string_byte_count == sizeof (string_byte_count))
if (string_byte_count == BYTES_IN_WORD)
string_byte_count = 0;
H_SET_STRING_SIZE (&headers, string_byte_count);