/* Routines to help build PEI-format DLLs (Win32 etc)
- Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ Copyright 1998, 1999, 2000 Free Software Foundation, Inc.
Written by DJ Delorie <dj@cygnus.com>
This file is part of GLD, the Gnu Linker.
static int min_ordinal, max_ordinal;
static int *exported_symbols;
-typedef struct exclude_list_struct
- {
- char *string;
- struct exclude_list_struct *next;
- }
-exclude_list_struct;
+typedef struct exclude_list_struct {
+ char *string;
+ struct exclude_list_struct *next;
+} exclude_list_struct;
+
static struct exclude_list_struct *excludes = 0;
void
pe_def_file = def_file_empty ();
/* First, run around to all the objects looking for the .drectve
- sections, and push those into the def file too */
+ sections, and push those into the def file too. */
for (b = info->input_bfds; b; b = b->link_next)
{
}
}
- /* Now, maybe export everything else the default way */
+ /* Now, maybe export everything else the default way. */
if (pe_dll_export_everything || pe_def_file->num_exports == 0)
{
for (j = 0; j < nsyms; j++)
{
/* We should export symbols which are either global or not
- anything at all (.bss data is the latter) */
+ anything at all. (.bss data is the latter) */
if ((symbols[j]->flags & BSF_GLOBAL)
|| (symbols[j]->flags == BSF_NO_FLAGS))
{
if (*sn == '_')
sn++;
if (auto_export (pe_def_file, sn))
- def_file_add_export (pe_def_file, sn, 0, -1);
+ {
+ def_file_export *p;
+ p=def_file_add_export (pe_def_file, sn, 0, -1);
+ /* Fill data flag properly, from dlltool.c */
+ p->flag_data = !(symbols[j]->flags & BSF_FUNCTION);
+ }
}
}
}
#undef NE
#define NE pe_def_file->num_exports
- /* Canonicalize the export list */
+ /* Canonicalize the export list. */
if (pe_dll_kill_ats)
{
{
if (strchr (pe_def_file->exports[i].name, '@'))
{
- /* This will preserve internal_name, which may have been pointing
- to the same memory as name, or might not have */
+ /* This will preserve internal_name, which may have been
+ pointing to the same memory as name, or might not
+ have. */
char *tmp = xstrdup (pe_def_file->exports[i].name);
*(strchr (tmp, '@')) = 0;
pe_def_file->exports[i].name = tmp;
}
}
- e = pe_def_file->exports; /* convenience, but watch out for it changing */
+ /* Convenience, but watch out for it changing. */
+ e = pe_def_file->exports;
exported_symbol_offsets = (bfd_vma *) xmalloc (NE * sizeof (bfd_vma));
exported_symbol_sections = (struct sec **) xmalloc (NE * sizeof (struct sec *));
for (i = 0; i < export_table_size; i++)
exported_symbols[i] = -1;
- /* Now we need to assign ordinals to those that don't have them */
+ /* Now we need to assign ordinals to those that don't have them. */
for (i = 0; i < NE; i++)
{
if (exported_symbol_sections[i])
pe_def_file->exports[i].ordinal = next_ordinal;
}
- /* OK, now we can allocate some memory */
+ /* OK, now we can allocate some memory. */
edata_sz = (40 /* directory */
+ 4 * export_table_size /* addresses */
edata_d = (unsigned char *) xmalloc (edata_sz);
- /* Note use of array pointer math here */
+ /* Note use of array pointer math here. */
edirectory = edata_d;
eaddresses = (unsigned long *) (edata_d + 40);
enameptrs = eaddresses + export_table_size;
fill_exported_offsets (abfd, info);
- /* Ok, now for the filling in part */
+ /* Ok, now for the filling in part. */
hint = 0;
for (i = 0; i < export_table_size; i++)
{
struct bfd_link_info *info;
{
- /* for .reloc stuff */
+ /* For .reloc stuff. */
reloc_data_type *reloc_data;
int total_relocs = 0;
int i;
asymbol **symbols;
int nsyms, symsize;
- /* if it's not loaded, we don't need to relocate it this way */
+ /* If it's not loaded, we don't need to relocate it this way. */
if (!(s->output_section->flags & SEC_LOAD))
continue;
/* I don't know why there would be a reloc for these, but I've
- seen it happen - DJ */
+ seen it happen - DJ */
if (s->output_section == &bfd_abs_section)
continue;
if (s->output_section->vma == 0)
{
- /* Huh? Shouldn't happen, but punt if it does */
+ /* Huh? Shouldn't happen, but punt if it does. */
einfo ("DJ: zero vma section reloc detected: `%s' #%d f=%d\n",
s->output_section->name, s->output_section->index,
s->output_section->flags);
break;
case BITS_AND_SHIFT (16, 16):
reloc_data[total_relocs].type = 4;
- /* FIXME: we can't know the symbol's right value yet,
- but we probably can safely assume that CE will relocate
- us in 64k blocks, so leaving it zero is safe. */
+ /* FIXME: we can't know the symbol's right value
+ yet, but we probably can safely assume that
+ CE will relocate us in 64k blocks, so leaving
+ it zero is safe. */
reloc_data[total_relocs].extra = 0;
total_relocs++;
break;
}
}
free (relocs);
- /* Warning: the allocated symbols are remembered in BFD and reused
- later, so don't free them! */
- /* free (symbols); */
+ /* Warning: the allocated symbols are remembered in BFD and
+ reused later, so don't free them! */
+#if 0
+ free (symbol);
+#endif
}
}
asymbol *sym;
sec = bfd_make_section_old_way (abfd, name);
- bfd_set_section_flags (abfd, sec, flags
- | SEC_ALLOC
- | SEC_LOAD
- | SEC_KEEP
- );
+ bfd_set_section_flags (abfd, sec, flags | SEC_ALLOC | SEC_LOAD | SEC_KEEP);
bfd_set_section_alignment (abfd, sec, align);
- /* remember to undo this before trying to link internally! */
+ /* Remember to undo this before trying to link internally! */
sec->output_section = sec;
sym = bfd_make_empty_symbol (abfd);
bfd *parent;
{
asection *tx, *id7, *id5, *id4, *id6;
- unsigned char *td, *d7, *d5, *d4, *d6 = NULL;
+ unsigned char *td = NULL, *d7, *d5, *d4, *d6 = NULL;
int len;
char *oname;
bfd *abfd;
quick_symbol (abfd, U ("__imp_"), exp->internal_name, "",
id5, BSF_GLOBAL, 0);
- bfd_set_section_size (abfd, tx, jmp_byte_count);
- td = (unsigned char *) xmalloc (jmp_byte_count);
- tx->contents = td;
- memcpy (td, jmp_bytes, jmp_byte_count);
- switch (pe_details->pe_arch)
- {
- case PE_ARCH_i386:
- quick_reloc (abfd, 2, BFD_RELOC_32, 2);
- break;
- case PE_ARCH_sh:
- quick_reloc (abfd, 8, BFD_RELOC_32, 2);
- break;
- case PE_ARCH_mips:
- quick_reloc (abfd, 0, BFD_RELOC_HI16_S, 2);
- quick_reloc (abfd, 0, BFD_RELOC_LO16, 0); /* MIPS_R_PAIR */
- quick_reloc (abfd, 4, BFD_RELOC_LO16, 2);
- break;
- }
- save_relocs (tx);
+ if (! exp->flag_data)
+ {
+ bfd_set_section_size (abfd, tx, jmp_byte_count);
+ td = (unsigned char *) xmalloc (jmp_byte_count);
+ tx->contents = td;
+ memcpy (td, jmp_bytes, jmp_byte_count);
+ switch (pe_details->pe_arch)
+ {
+ case PE_ARCH_i386:
+ quick_reloc (abfd, 2, BFD_RELOC_32, 2);
+ break;
+ case PE_ARCH_sh:
+ quick_reloc (abfd, 8, BFD_RELOC_32, 2);
+ break;
+ case PE_ARCH_mips:
+ quick_reloc (abfd, 0, BFD_RELOC_HI16_S, 2);
+ quick_reloc (abfd, 0, BFD_RELOC_LO16, 0); /* MIPS_R_PAIR */
+ quick_reloc (abfd, 4, BFD_RELOC_LO16, 2);
+ break;
+ }
+ save_relocs (tx);
+ }
bfd_set_section_size (abfd, id7, 4);
d7 = (unsigned char *) xmalloc (4);
for (i = 0; i < def->num_exports; i++)
{
- /* The import library doesn't know about the internal name */
+ /* The import library doesn't know about the internal name. */
char *internal = def->exports[i].internal_name;
bfd *n;
def->exports[i].internal_name = def->exports[i].name;
if (ar_head == NULL || ar_tail == NULL)
return;
- /* Now stick them all into the archive */
+ /* Now stick them all into the archive. */
ar_head->next = head;
ar_tail->next = ar_head;
def_file_export exp;
struct bfd_link_hash_entry *blhe;
- /* see if we need this import */
+ /* See if we need this import. */
char *name = (char *) xmalloc (strlen (pe_def_file->imports[i].internal_name) + 2 + 6);
sprintf (name, "%s%s", U (""), pe_def_file->imports[i].internal_name);
blhe = bfd_link_hash_lookup (link_info->hash, name,
if (blhe && blhe->type == bfd_link_hash_undefined)
{
bfd *one;
- /* we do */
+ /* We do. */
if (!do_this_dll)
{
bfd *ar_head = make_head (output_bfd);
einfo ("%Xopen %s: %s\n", filename, bfd_errmsg (bfd_get_error ()));
return false;
}
- /* PEI dlls seem to be bfd_objects */
+ /* PEI dlls seem to be bfd_objects. */
if (!bfd_check_format (dll, bfd_object))
{
einfo ("%X%s: this doesn't appear to be a DLL\n", filename);
projects / deliverable / binutils-gdb.git / blobdiff