projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't mark entry symbol IR only.
[deliverable/binutils-gdb.git]
/
bfd
/
ecoff.c
diff --git
a/bfd/ecoff.c
b/bfd/ecoff.c
index 43494868d6c6ea18cc3553c132156f572465ccd2..f85627d2f521f6f66f5207e3a70ff87b0b694003 100644
(file)
--- a/
bfd/ecoff.c
+++ b/
bfd/ecoff.c
@@
-3600,7
+3600,7
@@
ecoff_link_check_archive_element (bfd *abfd,
EXTR esym;
bfd_boolean def;
const char *name;
EXTR esym;
bfd_boolean def;
const char *name;
- bfd *
subs
bfd;
+ bfd *
old
bfd;
struct bfd_link_hash_entry *h;
(*swap_ext_in) (abfd, (void *) ext_ptr, &esym);
struct bfd_link_hash_entry *h;
(*swap_ext_in) (abfd, (void *) ext_ptr, &esym);
@@
-3645,18
+3645,17
@@
ecoff_link_check_archive_element (bfd *abfd,
continue;
/* Include this element. */
continue;
/* Include this element. */
-
subsbfd = NULL
;
- if (!
(*info->callbacks->add_archive_element)
-
(info, abfd, name, &subs
bfd))
+
oldbfd = abfd
;
+ if (!
(*info->callbacks
+
->add_archive_element) (info, abfd, name, &a
bfd))
goto error_return;
/* Potentially, the add_archive_element hook may have set a
substitute BFD for us. */
goto error_return;
/* Potentially, the add_archive_element hook may have set a
substitute BFD for us. */
- if (
subs
bfd
+ if (
abfd != old
bfd
&& !reread_ext_syms_and_strs (&symhdr, &external_ext_size, &esize,
&& !reread_ext_syms_and_strs (&symhdr, &external_ext_size, &esize,
-
&external_ext, &ssext, subs
bfd, backend))
+
&external_ext, &ssext, a
bfd, backend))
goto error_return;
goto error_return;
- if (! ecoff_link_add_externals (subsbfd ? subsbfd : abfd, info,
- external_ext, ssext))
+ if (! ecoff_link_add_externals (abfd, info, external_ext, ssext))
goto error_return;
*pneeded = TRUE;
goto error_return;
*pneeded = TRUE;
@@
-3733,7
+3732,6
@@
ecoff_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
unsigned int file_offset;
const char *name;
bfd *element;
unsigned int file_offset;
const char *name;
bfd *element;
- bfd *subsbfd;
h = *pundef;
h = *pundef;
@@
-3820,13
+3818,10
@@
ecoff_link_add_archive_symbols (bfd *abfd, struct bfd_link_info *info)
/* Unlike the generic linker, we know that this element provides
a definition for an undefined symbol and we know that we want
to include it. We don't need to check anything. */
/* Unlike the generic linker, we know that this element provides
a definition for an undefined symbol and we know that we want
to include it. We don't need to check anything. */
- subsbfd = NULL;
- if (! (*info->callbacks->add_archive_element)
- (info, element, name, &subsbfd))
+ if (!(*info->callbacks
+ ->add_archive_element) (info, element, name, &element))
return FALSE;
return FALSE;
- /* Potentially, the add_archive_element hook may have set a
- substitute BFD for us. */
- if (! ecoff_link_add_object_symbols (subsbfd ? subsbfd : element, info))
+ if (! ecoff_link_add_object_symbols (element, info))
return FALSE;
pundef = &(*pundef)->u.undef.next;
return FALSE;
pundef = &(*pundef)->u.undef.next;
This page took
0.028414 seconds
and
4
git commands to generate.