espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-07-02 10:47:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

* ldlang.h (lang_input_statement_type): Remove fields subfiles,

Browse Source 
total_size, superfile and chain.
	* ldfile.c (open_a): Don't clear search_dirs_flag.
	(ldfile_open_file): Don't try to open superfile.  Assert that file
	has not already been opened.
	* ldlang.c (new_afile): Don't initialize superfile.
	* ldmain.c (add_archive_element): Don't initialize subfiles or
	chain or superfile.  Initialize search_dirs_flag to false.
This commit is contained in:
Ian Lance Taylor
1994-06-01 18:28:26 +00:00
parent 6d40175db0
commit 210c52ac91
5 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ld/ChangeLog
View File

@ -1,3 +1,14 @@
Wed Jun 1 14:24:08 1994 Ian Lance Taylor (ian@tweedledumb.cygnus.com)
* ldlang.h (lang_input_statement_type): Remove fields subfiles,
total_size, superfile and chain.
* ldfile.c (open_a): Don't clear search_dirs_flag.
(ldfile_open_file): Don't try to open superfile. Assert that file
has not already been opened.
* ldlang.c (new_afile): Don't initialize superfile.
* ldmain.c (add_archive_element): Don't initialize subfiles or
chain or superfile. Initialize search_dirs_flag to false.
Fri May 27 12:25:33 1994 Ken Raeburn (raeburn@cujo.cygnus.com) Fri May 27 12:25:33 1994 Ken Raeburn (raeburn@cujo.cygnus.com)
* ldver.c (ldversion): Changed version to "cygnus-2.4.1". * ldver.c (ldversion): Changed version to "cygnus-2.4.1".

4
ld/ldfile.c
View File

@ -145,7 +145,6 @@ open_a(arch, entry, lib, suffix)
if (desc) if (desc)
{ {
entry->filename = string; entry->filename = string;
entry->search_dirs_flag = false;
entry->the_bfd = desc; entry->the_bfd = desc;
return desc; return desc;
} }
@ -162,8 +161,7 @@ void
ldfile_open_file (entry) ldfile_open_file (entry)
lang_input_statement_type *entry; lang_input_statement_type *entry;
{ {
if (entry->superfile != NULL) ASSERT (entry->the_bfd == NULL);
ldfile_open_file (entry->superfile);
if (! entry->search_dirs_flag) if (! entry->search_dirs_flag)
entry->the_bfd = cached_bfd_openr (entry->filename, entry); entry->the_bfd = cached_bfd_openr (entry->filename, entry);

1
ld/ldlang.c
View File

@ -372,7 +372,6 @@ new_afile (name, file_type, target, add_to_list)
} }
p->the_bfd = (bfd *) NULL; p->the_bfd = (bfd *) NULL;
p->asymbols = (asymbol **) NULL; p->asymbols = (asymbol **) NULL;
p->superfile = (lang_input_statement_type *) NULL;
p->next_real_file = (lang_statement_union_type *) NULL; p->next_real_file = (lang_statement_union_type *) NULL;
p->next = (lang_statement_union_type *) NULL; p->next = (lang_statement_union_type *) NULL;
p->symbol_count = 0; p->symbol_count = 0;

14
ld/ldlang.h
View File

@ -201,20 +201,6 @@ typedef struct lang_input_statement_struct
asymbol **asymbols; asymbol **asymbols;
unsigned int symbol_count; unsigned int symbol_count;
/* For library members only */
/* For a library, points to chain of entries for the library members. */
struct lang_input_statement_struct *subfiles;
/* Size of contents of this file, if library member. */
bfd_size_type total_size;
/* For library member, points to the library's own entry. */
struct lang_input_statement_struct *superfile;
/* For library member, points to next entry for next member. */
struct lang_input_statement_struct *chain;
/* Point to the next file - whatever it is, wanders up and down /* Point to the next file - whatever it is, wanders up and down
archives */ archives */

17
ld/ldmain.c
View File

@ -552,22 +552,17 @@ add_archive_element (info, abfd, name)
input->local_sym_name = abfd->filename; input->local_sym_name = abfd->filename;
input->the_bfd = abfd; input->the_bfd = abfd;
input->asymbols = NULL; input->asymbols = NULL;
input->subfiles = NULL;
input->next = NULL; input->next = NULL;
input->just_syms_flag = false; input->just_syms_flag = false;
input->loaded = false; input->loaded = false;
input->chain = NULL; input->search_dirs_flag = false;
/* FIXME: This is wrong. It should point to an entry for the
archive itself. However, it doesn't seem to matter. */
input->superfile = NULL;
/* FIXME: The following fields are not set: header.next, /* FIXME: The following fields are not set: header.next,
header.type, closed, passive_position, symbol_count, total_size, header.type, closed, passive_position, symbol_count,
next_real_file, is_archive, search_dirs_flag, target, real, next_real_file, is_archive, target, real, common_section,
common_section, common_output_section, complained. This bit of common_output_section, complained. This bit of code is from the
code is from the old decode_library_subfile function. I don't old decode_library_subfile function. I don't know whether any of
know whether any of those fields matters. */ those fields matters. */
ldlang_add_file (input); ldlang_add_file (input);