X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=bfd%2Fi386linux.c;h=5df2a11c50f6eef1a4cc9f6e4b2a2d917ae0d7ae;hb=f6af82bd4470673eef9562d4ed3a2717c1d749ab;hp=a40b5c532cfddae3999970e3f00189956940e6b9;hpb=943fbd5bd520934ca3a26abb2d5cfbdd2a7659ec;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/i386linux.c b/bfd/i386linux.c index a40b5c532c..5df2a11c50 100644 --- a/bfd/i386linux.c +++ b/bfd/i386linux.c @@ -1,5 +1,6 @@ /* BFD back-end for linux flavored i386 a.out binaries. - Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc. + Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999 + Free Software Foundation, Inc. This file is part of BFD, the Binary File Descriptor library. @@ -17,13 +18,15 @@ You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#define PAGE_SIZE 4096 +#define TARGET_PAGE_SIZE 4096 #define ZMAGIC_DISK_BLOCK_SIZE 1024 -#define SEGMENT_SIZE 4096 +#define SEGMENT_SIZE TARGET_PAGE_SIZE #define TEXT_START_ADDR 0x0 #define N_SHARED_LIB(x) 0 #define BYTES_IN_WORD 4 +#define MACHTYPE_OK(mtype) ((mtype) == M_386 || (mtype) == M_UNKNOWN) + #include "bfd.h" #include "sysdep.h" #include "libbfd.h" @@ -36,12 +39,17 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #define MY(OP) CAT(i386linux_,OP) #define TARGETNAME "a.out-i386-linux" +extern const bfd_target MY(vec); + /* We always generate QMAGIC files in preference to ZMAGIC files. It would be possible to make this a linker option, if that ever becomes important. */ static void MY_final_link_callback PARAMS ((bfd *, file_ptr *, file_ptr *, file_ptr *)); +static boolean i386linux_bfd_final_link + PARAMS ((bfd *, struct bfd_link_info *)); +static boolean i386linux_write_object_contents PARAMS ((bfd *)); static boolean i386linux_bfd_final_link (abfd, info) @@ -217,12 +225,9 @@ linux_link_hash_table_create (abfd) struct linux_link_hash_table *ret; ret = ((struct linux_link_hash_table *) - malloc (sizeof (struct linux_link_hash_table))); + bfd_alloc (abfd, sizeof (struct linux_link_hash_table))); if (ret == (struct linux_link_hash_table *) NULL) - { - bfd_set_error (bfd_error_no_memory); - return (struct bfd_link_hash_table *) NULL; - } + return (struct bfd_link_hash_table *) NULL; if (! NAME(aout,link_hash_table_init) (&ret->root, abfd, linux_link_hash_newfunc)) { @@ -293,7 +298,7 @@ new_fixup (info, h, value, builtin) static boolean linux_link_create_dynamic_sections (abfd, info) bfd *abfd; - struct bfd_link_info *info; + struct bfd_link_info *info ATTRIBUTE_UNUSED; { flagword flags; register asection *s; @@ -439,19 +444,19 @@ linux_tally_symbols (h, data) name = h->root.root.root.string + sizeof NEEDS_SHRLIB - 1; p = strrchr (name, '_'); if (p != NULL) - alloc = (char *) malloc (strlen (name) + 1); + alloc = (char *) bfd_malloc (strlen (name) + 1); - /* FIXME! BFD should not call printf! */ if (p == NULL || alloc == NULL) - fprintf (stderr, "Output file requires shared library `%s'\n", name); + (*_bfd_error_handler) (_("Output file requires shared library `%s'\n"), + name); else { strcpy (alloc, name); p = strrchr (alloc, '_'); *p++ = '\0'; - fprintf (stderr, - "Output file requires shared library `%s.so.%s'\n", - alloc, p); + (*_bfd_error_handler) + (_("Output file requires shared library `%s.so.%s'\n"), + alloc, p); free (alloc); } @@ -542,13 +547,16 @@ linux_tally_symbols (h, data) are required. */ boolean -bfd_linux_size_dynamic_sections (output_bfd, info) +bfd_i386linux_size_dynamic_sections (output_bfd, info) bfd *output_bfd; struct bfd_link_info *info; { struct fixup *f; asection *s; + if (output_bfd->xvec != &MY(vec)) + return true; + /* First find the fixups... */ linux_link_hash_traverse (linux_hash_table (info), linux_tally_symbols, @@ -582,11 +590,8 @@ bfd_linux_size_dynamic_sections (output_bfd, info) s->_raw_size = 8 + linux_hash_table (info)->fixup_count * 8; s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size); if (s->contents == NULL) - { - bfd_set_error (bfd_error_no_memory); - return false; - } - memset (s->contents, 0, s->_raw_size); + return false; + memset (s->contents, 0, (size_t) s->_raw_size); } return true; @@ -607,7 +612,7 @@ linux_finish_dynamic_link (output_bfd, info) struct fixup *f; unsigned int new_addr; int section_offset; - int fixups_written; + unsigned int fixups_written; if (linux_hash_table (info)->dynobj == NULL) return true; @@ -637,10 +642,9 @@ linux_finish_dynamic_link (output_bfd, info) if (f->h->root.root.type != bfd_link_hash_defined && f->h->root.root.type != bfd_link_hash_defweak) { - /* FIXME! */ - fprintf (stderr, - "Symbol %s not defined for fixups\n", - f->h->root.root.root.string); + (*_bfd_error_handler) + (_("Symbol %s not defined for fixups\n"), + f->h->root.root.root.string); continue; } @@ -688,10 +692,9 @@ linux_finish_dynamic_link (output_bfd, info) if (f->h->root.root.type != bfd_link_hash_defined && f->h->root.root.type != bfd_link_hash_defweak) { - /* FIXME! */ - fprintf (stderr, - "Symbol %s not defined for fixups\n", - f->h->root.root.root.string); + (*_bfd_error_handler) + (_("Symbol %s not defined for fixups\n"), + f->h->root.root.root.string); continue; } @@ -714,8 +717,7 @@ linux_finish_dynamic_link (output_bfd, info) if (linux_hash_table (info)->fixup_count != fixups_written) { - /* FIXME! */ - fprintf (stderr, "Warning: fixup count mismatch\n"); + (*_bfd_error_handler) (_("Warning: fixup count mismatch\n")); while (linux_hash_table (info)->fixup_count > fixups_written) { bfd_put_32 (output_bfd, 0, fixup_table);