From 3bc69c18671c762f7412ceaae8c9c6a225bc81bc Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 20 Apr 2023 12:14:09 +0930 Subject: [PATCH] Delete struct artdata archive_head This element is unused. Ideally we'd be moving archive_head and other archive specific fields from struct bfd to here, but that's a much larger change than this little bit of cleanup. * libbfd-in.h (struct artdata): Delete archive_head. * libbfd.h: Regenerate. * archive.c, * coff-rs6000.c, * coff64-rs6000.c: Delete comments mentioning artdata archive_head. --- bfd/archive.c | 20 +------------------- bfd/coff-rs6000.c | 7 ------- bfd/coff64-rs6000.c | 6 ------ bfd/libbfd-in.h | 1 - bfd/libbfd.h | 1 - 5 files changed, 1 insertion(+), 34 deletions(-) diff --git a/bfd/archive.c b/bfd/archive.c index 4cc2f7c9487..01bfcfc80a1 100644 --- a/bfd/archive.c +++ b/bfd/archive.c @@ -215,18 +215,7 @@ _bfd_generic_mkarchive (bfd *abfd) size_t amt = sizeof (struct artdata); abfd->tdata.aout_ar_data = (struct artdata *) bfd_zalloc (abfd, amt); - if (bfd_ardata (abfd) == NULL) - return false; - - /* Already cleared by bfd_zalloc above. - bfd_ardata (abfd)->cache = NULL; - bfd_ardata (abfd)->archive_head = NULL; - bfd_ardata (abfd)->symdefs = NULL; - bfd_ardata (abfd)->extended_names = NULL; - bfd_ardata (abfd)->extended_names_size = 0; - bfd_ardata (abfd)->tdata = NULL; */ - - return true; + return bfd_ardata (abfd) != NULL; } /* @@ -905,13 +894,6 @@ bfd_generic_archive_p (bfd *abfd) } bfd_ardata (abfd)->first_file_filepos = SARMAG; - /* Cleared by bfd_zalloc above. - bfd_ardata (abfd)->cache = NULL; - bfd_ardata (abfd)->archive_head = NULL; - bfd_ardata (abfd)->symdefs = NULL; - bfd_ardata (abfd)->extended_names = NULL; - bfd_ardata (abfd)->extended_names_size = 0; - bfd_ardata (abfd)->tdata = NULL; */ if (!BFD_SEND (abfd, _bfd_slurp_armap, (abfd)) || !BFD_SEND (abfd, _bfd_slurp_extended_name_table, (abfd))) diff --git a/bfd/coff-rs6000.c b/bfd/coff-rs6000.c index 6c4e32c9f0d..5ea06fa2e09 100644 --- a/bfd/coff-rs6000.c +++ b/bfd/coff-rs6000.c @@ -1527,13 +1527,6 @@ _bfd_xcoff_archive_p (bfd *abfd) if (bfd_ardata (abfd) == (struct artdata *) NULL) goto error_ret_restore; - /* Cleared by bfd_zalloc above. - bfd_ardata (abfd)->cache = NULL; - bfd_ardata (abfd)->archive_head = NULL; - bfd_ardata (abfd)->symdefs = NULL; - bfd_ardata (abfd)->extended_names = NULL; - bfd_ardata (abfd)->extended_names_size = 0; */ - /* Now handle the two formats. */ if (magic[1] != 'b') { diff --git a/bfd/coff64-rs6000.c b/bfd/coff64-rs6000.c index f8a0bde8c30..a4f631ce0e0 100644 --- a/bfd/coff64-rs6000.c +++ b/bfd/coff64-rs6000.c @@ -1939,12 +1939,6 @@ xcoff64_archive_p (bfd *abfd) if (bfd_ardata (abfd) == (struct artdata *) NULL) goto error_ret_restore; - /* Already cleared by bfd_zalloc above. - bfd_ardata (abfd)->cache = NULL; - bfd_ardata (abfd)->archive_head = NULL; - bfd_ardata (abfd)->symdefs = NULL; - bfd_ardata (abfd)->extended_names = NULL; - bfd_ardata (abfd)->extended_names_size = 0; */ bfd_ardata (abfd)->first_file_filepos = bfd_scan_vma (hdr.firstmemoff, (const char **) NULL, 10); diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index 561cef1a12e..68b5343fd2e 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -75,7 +75,6 @@ struct artdata file_ptr first_file_filepos; /* Speed up searching the armap */ htab_t cache; - bfd *archive_head; /* Only interesting in output routines. */ carsym *symdefs; /* The symdef entries. */ symindex symdef_count; /* How many there are. */ char *extended_names; /* Clever intel extension. */ diff --git a/bfd/libbfd.h b/bfd/libbfd.h index ae17717efa3..bb7f2f1efcf 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -81,7 +81,6 @@ struct artdata file_ptr first_file_filepos; /* Speed up searching the armap */ htab_t cache; - bfd *archive_head; /* Only interesting in output routines. */ carsym *symdefs; /* The symdef entries. */ symindex symdef_count; /* How many there are. */ char *extended_names; /* Clever intel extension. */ -- 2.30.2