projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert the value change of DT_ENCODING from 2003-01-17. Luckily (and
[deliverable/binutils-gdb.git]
/
bfd
/
cofflink.c
diff --git
a/bfd/cofflink.c
b/bfd/cofflink.c
index 325f7875d37dbeaca6714921450cfc1f7b9fcbf9..fd4b3fed15a44204c1f40a033b55bb383ce9f9d8 100644
(file)
--- a/
bfd/cofflink.c
+++ b/
bfd/cofflink.c
@@
-1,6
+1,6
@@
/* COFF specific linker code.
Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
/* COFF specific linker code.
Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003,
- 2004, 2005 Free Software Foundation, Inc.
+ 2004, 2005
, 2006
Free Software Foundation, Inc.
Written by Ian Lance Taylor, Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
Written by Ian Lance Taylor, Cygnus Support.
This file is part of BFD, the Binary File Descriptor library.
@@
-17,7
+17,7
@@
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
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., 5
9 Temple Place - Suite 330
, Boston, MA 02110-1301, USA. */
+ Foundation, Inc., 5
1 Franklin Street - Fifth Floor
, Boston, MA 02110-1301, USA. */
/* This file contains the COFF backend linker code. */
/* This file contains the COFF backend linker code. */
@@
-94,10
+94,11
@@
_bfd_coff_link_hash_table_init (struct coff_link_hash_table *table,
bfd *abfd,
struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
struct bfd_hash_table *,
bfd *abfd,
struct bfd_hash_entry *(*newfunc) (struct bfd_hash_entry *,
struct bfd_hash_table *,
- const char *))
+ const char *),
+ unsigned int entsize)
{
memset (&table->stab_info, 0, sizeof (table->stab_info));
{
memset (&table->stab_info, 0, sizeof (table->stab_info));
- return _bfd_link_hash_table_init (&table->root, abfd, newfunc);
+ return _bfd_link_hash_table_init (&table->root, abfd, newfunc
, entsize
);
}
/* Create a COFF linker hash table. */
}
/* Create a COFF linker hash table. */
@@
-113,7
+114,8
@@
_bfd_coff_link_hash_table_create (bfd *abfd)
return NULL;
if (! _bfd_coff_link_hash_table_init (ret, abfd,
return NULL;
if (! _bfd_coff_link_hash_table_init (ret, abfd,
- _bfd_coff_link_hash_newfunc))
+ _bfd_coff_link_hash_newfunc,
+ sizeof (struct coff_link_hash_entry)))
{
free (ret);
return (struct bfd_link_hash_table *) NULL;
{
free (ret);
return (struct bfd_link_hash_table *) NULL;
@@
-230,7
+232,7
@@
coff_link_check_ar_symbols (bfd *abfd,
/* Auto import. */
if (!h
&& info->pei386_auto_import
/* Auto import. */
if (!h
&& info->pei386_auto_import
- &&
!strncmp (name,"__imp_", 6
))
+ &&
CONST_STRNEQ (name, "__imp_"
))
h = bfd_link_hash_lookup (info->hash, name + 6, FALSE, FALSE, TRUE);
/* We are only interested in symbols that are currently
h = bfd_link_hash_lookup (info->hash, name + 6, FALSE, FALSE, TRUE);
/* We are only interested in symbols that are currently
@@
-437,7
+439,7
@@
coff_link_add_symbols (bfd *abfd,
|| classification == COFF_SYMBOL_PE_SECTION)
&& coff_section_data (abfd, section) != NULL
&& coff_section_data (abfd, section)->comdat != NULL
|| classification == COFF_SYMBOL_PE_SECTION)
&& coff_section_data (abfd, section) != NULL
&& coff_section_data (abfd, section)->comdat != NULL
- &&
strncmp (name, "??_", 3) == 0
+ &&
CONST_STRNEQ (name, "??_")
&& strcmp (name, coff_section_data (abfd, section)->comdat->name) == 0)
{
if (*sym_hash == NULL)
&& strcmp (name, coff_section_data (abfd, section)->comdat->name) == 0)
{
if (*sym_hash == NULL)
@@
-581,7
+583,7
@@
coff_link_add_symbols (bfd *abfd,
asection *stab;
for (stab = abfd->sections; stab; stab = stab->next)
asection *stab;
for (stab = abfd->sections; stab; stab = stab->next)
- if (
strncmp (".stab", stab->name, 5) == 0
+ if (
CONST_STRNEQ (stab->name, ".stab")
&& (!stab->name[5]
|| (stab->name[5] == '.' && ISDIGIT (stab->name[6]))))
{
&& (!stab->name[5]
|| (stab->name[5] == '.' && ISDIGIT (stab->name[6]))))
{
@@
-693,7
+695,7
@@
_bfd_coff_final_link (bfd *abfd,
{
o->reloc_count = 0;
o->lineno_count = 0;
{
o->reloc_count = 0;
o->lineno_count = 0;
- for (p = o->
link_order_head
; p != NULL; p = p->next)
+ for (p = o->
map_head.link_order
; p != NULL; p = p->next)
{
if (p->type == bfd_indirect_link_order)
{
{
if (p->type == bfd_indirect_link_order)
{
@@
-888,7
+890,7
@@
_bfd_coff_final_link (bfd *abfd,
for (o = abfd->sections; o != NULL; o = o->next)
{
for (o = abfd->sections; o != NULL; o = o->next)
{
- for (p = o->
link_order_head
; p != NULL; p = p->next)
+ for (p = o->
map_head.link_order
; p != NULL; p = p->next)
{
if (p->type == bfd_indirect_link_order
&& bfd_family_coff (p->u.indirect.section->owner))
{
if (p->type == bfd_indirect_link_order
&& bfd_family_coff (p->u.indirect.section->owner))
@@
-1230,16
+1232,14
@@
process_embedded_commands (bfd *output_bfd,
s++;
continue;
}
s++;
continue;
}
- if (
strncmp (s, "-attr", 5) == 0
)
+ if (
CONST_STRNEQ (s, "-attr")
)
{
char *name;
char *attribs;
asection *asec;
int loop = 1;
int had_write = 0;
{
char *name;
char *attribs;
asection *asec;
int loop = 1;
int had_write = 0;
- int had_read = 0;
int had_exec= 0;
int had_exec= 0;
- int had_shared= 0;
s += 5;
s = get_name (s, &name);
s += 5;
s = get_name (s, &name);
@@
-1253,10
+1253,8
@@
process_embedded_commands (bfd *output_bfd,
had_write = 1;
break;
case 'R':
had_write = 1;
break;
case 'R':
- had_read = 1;
break;
case 'S':
break;
case 'S':
- had_shared = 1;
break;
case 'X':
had_exec = 1;
break;
case 'X':
had_exec = 1;
@@
-1274,11
+1272,11
@@
process_embedded_commands (bfd *output_bfd,
asec->flags |= SEC_READONLY;
}
}
asec->flags |= SEC_READONLY;
}
}
- else if (
strncmp (s,"-heap", 5) == 0
)
- s = dores_com (s
+
5, output_bfd, 1);
+ else if (
CONST_STRNEQ (s, "-heap")
)
+ s = dores_com (s
+
5, output_bfd, 1);
- else if (
strncmp (s,"-stack", 6) == 0
)
- s = dores_com (s
+
6, output_bfd, 0);
+ else if (
CONST_STRNEQ (s, "-stack")
)
+ s = dores_com (s
+
6, output_bfd, 0);
else
s++;
else
s++;
@@
-1923,6
+1921,7
@@
_bfd_coff_link_input_bfd (struct coff_final_link_info *finfo, bfd *input_bfd)
generate two symbols with the same name, but only one
will have aux entries. */
BFD_ASSERT (isymp->n_numaux == 0
generate two symbols with the same name, but only one
will have aux entries. */
BFD_ASSERT (isymp->n_numaux == 0
+ || h->numaux == 0
|| h->numaux == isymp->n_numaux);
}
|| h->numaux == isymp->n_numaux);
}
@@
-1938,7
+1937,7
@@
_bfd_coff_link_input_bfd (struct coff_final_link_info *finfo, bfd *input_bfd)
union internal_auxent aux;
union internal_auxent *auxp;
union internal_auxent aux;
union internal_auxent *auxp;
- if (h != NULL)
+ if (h != NULL
&& h->aux != NULL && (h->numaux > i)
)
auxp = h->aux + i;
else
{
auxp = h->aux + i;
else
{
@@
-2937,9
+2936,11
@@
_bfd_coff_generic_relocate_section (bfd *output_bfd,
Note that weak symbols without aux records are a GNU
extension.
FIXME: All weak externals are treated as having
Note that weak symbols without aux records are a GNU
extension.
FIXME: All weak externals are treated as having
- characteristics IMAGE_WEAK_EXTERN_SEARCH_LIBRARY (2).
- There are no known uses of the other two types of
- weak externals. */
+ characteristic IMAGE_WEAK_EXTERN_SEARCH_NOLIBRARY (1).
+ These behave as per SVR4 ABI: A library member
+ will resolve a weak external only if a normal
+ external causes the library member to be linked.
+ See also linker.c: generic_link_check_archive_element. */
asection *sec;
struct coff_link_hash_entry *h2 =
input_bfd->tdata.coff_obj_data->sym_hashes[
asection *sec;
struct coff_link_hash_entry *h2 =
input_bfd->tdata.coff_obj_data->sym_hashes[
This page took
0.028121 seconds
and
4
git commands to generate.
projects / deliverable / binutils-gdb.git / blobdiff