aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@airs.com>1994-06-01 18:28:26 +0000
committerIan Lance Taylor <ian@airs.com>1994-06-01 18:28:26 +0000
commit210c52ac91caa53272dd12ea1266d408593f055a (patch)
treec3b6188c956c592af76d4fc3914a3170a4e16fcb
parent6d40175db077d15dfc741391bd9ea6055c292b91 (diff)
downloadgdb-210c52ac91caa53272dd12ea1266d408593f055a.zip
gdb-210c52ac91caa53272dd12ea1266d408593f055a.tar.gz
gdb-210c52ac91caa53272dd12ea1266d408593f055a.tar.bz2
* 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.
-rw-r--r--ld/ChangeLog11
-rw-r--r--ld/ldfile.c4
-rw-r--r--ld/ldlang.c1
-rw-r--r--ld/ldlang.h14
-rw-r--r--ld/ldmain.c17
5 files changed, 18 insertions, 29 deletions
diff --git a/ld/ChangeLog b/ld/ChangeLog
index f0ebae5..a2a8373 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -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)
* ldver.c (ldversion): Changed version to "cygnus-2.4.1".
diff --git a/ld/ldfile.c b/ld/ldfile.c
index 43e9575..34b142c 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -145,7 +145,6 @@ open_a(arch, entry, lib, suffix)
if (desc)
{
entry->filename = string;
- entry->search_dirs_flag = false;
entry->the_bfd = desc;
return desc;
}
@@ -162,8 +161,7 @@ void
ldfile_open_file (entry)
lang_input_statement_type *entry;
{
- if (entry->superfile != NULL)
- ldfile_open_file (entry->superfile);
+ ASSERT (entry->the_bfd == NULL);
if (! entry->search_dirs_flag)
entry->the_bfd = cached_bfd_openr (entry->filename, entry);
diff --git a/ld/ldlang.c b/ld/ldlang.c
index b4a3850..7b9fcd8 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -372,7 +372,6 @@ new_afile (name, file_type, target, add_to_list)
}
p->the_bfd = (bfd *) NULL;
p->asymbols = (asymbol **) NULL;
- p->superfile = (lang_input_statement_type *) NULL;
p->next_real_file = (lang_statement_union_type *) NULL;
p->next = (lang_statement_union_type *) NULL;
p->symbol_count = 0;
diff --git a/ld/ldlang.h b/ld/ldlang.h
index a3a98e5..a4e3ca7 100644
--- a/ld/ldlang.h
+++ b/ld/ldlang.h
@@ -201,20 +201,6 @@ typedef struct lang_input_statement_struct
asymbol **asymbols;
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
archives */
diff --git a/ld/ldmain.c b/ld/ldmain.c
index 7deeb6a..ae64b23 100644
--- a/ld/ldmain.c
+++ b/ld/ldmain.c
@@ -552,22 +552,17 @@ add_archive_element (info, abfd, name)
input->local_sym_name = abfd->filename;
input->the_bfd = abfd;
input->asymbols = NULL;
- input->subfiles = NULL;
input->next = NULL;
input->just_syms_flag = false;
input->loaded = false;
- input->chain = NULL;
-
- /* FIXME: This is wrong. It should point to an entry for the
- archive itself. However, it doesn't seem to matter. */
- input->superfile = NULL;
+ input->search_dirs_flag = false;
/* FIXME: The following fields are not set: header.next,
- header.type, closed, passive_position, symbol_count, total_size,
- next_real_file, is_archive, search_dirs_flag, target, real,
- common_section, common_output_section, complained. This bit of
- code is from the old decode_library_subfile function. I don't
- know whether any of those fields matters. */
+ header.type, closed, passive_position, symbol_count,
+ next_real_file, is_archive, target, real, common_section,
+ common_output_section, complained. This bit of code is from the
+ old decode_library_subfile function. I don't know whether any of
+ those fields matters. */
ldlang_add_file (input);