X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=bfd%2Fi386linux.c;h=c144822ac2a26ca1f1ca13c97140f264fad1f45e;hb=d45913a06f533285d66d3b10132d0b70dc872782;hp=ebc938857d810a904c823d787f55b4533a8e7fa7;hpb=ae115e5114deb0326333c80f7af9e689b2e7d01f;p=deliverable%2Fbinutils-gdb.git diff --git a/bfd/i386linux.c b/bfd/i386linux.c index ebc938857d..c144822ac2 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 1992, 1993, 1994, 1995, 1996, 1997, 2001, 2002 + 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" @@ -33,15 +36,24 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "libaout.h" /* BFD a.out internal data structures */ #define DEFAULT_ARCH bfd_arch_i386 -#define MY(OP) CAT(i386linux_,OP) + +/* Do not "beautify" the CONCAT* macro args. Traditional C will not + remove whitespace added here, and thus will fail to concatenate + the tokens. */ +#define MY(OP) CONCAT2 (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) @@ -215,14 +227,11 @@ linux_link_hash_table_create (abfd) bfd *abfd; { struct linux_link_hash_table *ret; + bfd_size_type amt = sizeof (struct linux_link_hash_table); - ret = ((struct linux_link_hash_table *) - bfd_alloc (abfd, sizeof (struct linux_link_hash_table))); + ret = (struct linux_link_hash_table *) bfd_alloc (abfd, amt); 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 +302,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; @@ -400,7 +409,8 @@ linux_add_one_symbol (info, abfd, name, flags, section, value, string, if (! (_bfd_generic_link_add_one_symbol (info, linux_hash_table (info)->dynobj, SHARABLE_CONFLICTS, - BSF_GLOBAL | BSF_CONSTRUCTOR, s, 0, NULL, false, false, NULL))) + BSF_GLOBAL | BSF_CONSTRUCTOR, s, (bfd_vma) 0, NULL, + false, false, NULL))) return false; } @@ -428,6 +438,9 @@ linux_tally_symbols (h, data) struct linux_link_hash_entry *h1, *h2; boolean exists; + if (h->root.root.type == bfd_link_hash_warning) + h = (struct linux_link_hash_entry *) h->root.root.u.i.link; + if (h->root.root.type == bfd_link_hash_undefined && strncmp (h->root.root.root.string, NEEDS_SHRLIB, sizeof NEEDS_SHRLIB - 1) == 0) @@ -439,19 +452,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 ((bfd_size_type) 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); } @@ -471,7 +484,7 @@ linux_tally_symbols (h, data) + sizeof PLT_REF_PREFIX - 1), false, false, true); /* h2 does not follow indirect symbols. */ - h2 = linux_link_hash_lookup (linux_hash_table (info), + h2 = linux_link_hash_lookup (linux_hash_table (info), (h->root.root.root.string + sizeof PLT_REF_PREFIX - 1), false, false, false); @@ -542,13 +555,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, @@ -579,14 +595,11 @@ bfd_linux_size_dynamic_sections (output_bfd, info) ".linux-dynamic"); if (s != NULL) { - s->_raw_size = 8 + linux_hash_table (info)->fixup_count * 8; - s->contents = (bfd_byte *) bfd_alloc (output_bfd, s->_raw_size); + s->_raw_size = linux_hash_table (info)->fixup_count + 1; + s->_raw_size *= 8; + s->contents = (bfd_byte *) bfd_zalloc (output_bfd, s->_raw_size); if (s->contents == NULL) - { - bfd_set_error (bfd_error_no_memory); - return false; - } - memset (s->contents, 0, (size_t) s->_raw_size); + return false; } return true; @@ -619,13 +632,14 @@ linux_finish_dynamic_link (output_bfd, info) fixups_written = 0; #ifdef LINUX_LINK_DEBUG - printf ("Fixup table file offset: %x VMA: %x\n", + printf ("Fixup table file offset: %x VMA: %x\n", os->filepos + s->output_offset, os->vma + s->output_offset); #endif fixup_table = s->contents; - bfd_put_32 (output_bfd, linux_hash_table (info)->fixup_count, fixup_table); + bfd_put_32 (output_bfd, + (bfd_vma) linux_hash_table (info)->fixup_count, fixup_table); fixup_table += 4; /* Fill in fixup table. */ @@ -637,10 +651,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; } @@ -656,15 +669,15 @@ linux_finish_dynamic_link (output_bfd, info) if (f->jump) { /* Relative address */ - new_addr = new_addr - (f->value + 5); - bfd_put_32 (output_bfd, new_addr, fixup_table); + new_addr = new_addr - (f->value + 5); + bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table); fixup_table += 4; bfd_put_32 (output_bfd, f->value + 1, fixup_table); fixup_table += 4; } else { - bfd_put_32 (output_bfd, new_addr, fixup_table); + bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table); fixup_table += 4; bfd_put_32 (output_bfd, f->value, fixup_table); fixup_table += 4; @@ -675,9 +688,9 @@ linux_finish_dynamic_link (output_bfd, info) if (linux_hash_table (info)->local_builtins != 0) { /* Special marker so we know to switch to the other type of fixup */ - bfd_put_32 (output_bfd, 0, fixup_table); + bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table); fixup_table += 4; - bfd_put_32 (output_bfd, 0, fixup_table); + bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table); fixup_table += 4; ++fixups_written; for (f = linux_hash_table (info)->fixup_list; f != NULL; f = f->next) @@ -688,10 +701,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; } @@ -704,7 +716,7 @@ linux_finish_dynamic_link (output_bfd, info) new_addr, f->value); #endif - bfd_put_32 (output_bfd, new_addr, fixup_table); + bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table); fixup_table += 4; bfd_put_32 (output_bfd, f->value, fixup_table); fixup_table += 4; @@ -714,19 +726,18 @@ 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); + bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table); fixup_table += 4; - bfd_put_32 (output_bfd, 0, fixup_table); + bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table); fixup_table += 4; ++fixups_written; } } - h = linux_link_hash_lookup (linux_hash_table (info), + h = linux_link_hash_lookup (linux_hash_table (info), "__BUILTIN_FIXUPS__", false, false, false); @@ -742,16 +753,16 @@ linux_finish_dynamic_link (output_bfd, info) printf ("Builtin fixup table at %x\n", new_addr); #endif - bfd_put_32 (output_bfd, new_addr, fixup_table); + bfd_put_32 (output_bfd, (bfd_vma) new_addr, fixup_table); } else - bfd_put_32 (output_bfd, 0, fixup_table); + bfd_put_32 (output_bfd, (bfd_vma) 0, fixup_table); - if (bfd_seek (output_bfd, os->filepos + s->output_offset, SEEK_SET) != 0) + if (bfd_seek (output_bfd, (file_ptr) (os->filepos + s->output_offset), + SEEK_SET) != 0) return false; - if (bfd_write ((PTR) s->contents, 1, s->_raw_size, output_bfd) - != s->_raw_size) + if (bfd_bwrite ((PTR) s->contents, s->_raw_size, output_bfd) != s->_raw_size) return false; return true;