From f0d19df99dfe1c63842206d15ae41dfd33d25bf0 Mon Sep 17 00:00:00 2001 From: Alan Modra Date: Thu, 22 Dec 2016 00:40:54 +1030 Subject: [PATCH] Don't make_bfd_vms_lib archive functions NULL Contrary to the comment, they can in fact be called. * libbfd-in.h (_bfd_vms_lib_slurp_armap): Use _bfd_noarchive function. (_bfd_vms_lib_slurp_extended_name_table: Likewise. (_bfd_vms_lib_construct_extended_name_table: Likewise. (_bfd_vms_lib_truncate_arname: Likewise. (_bfd_vms_lib_write_armap: Likewise. (_bfd_vms_lib_read_ar_hdr: Likewise. (_bfd_vms_lib_write_ar_hdr: Likewise. * libbfd.h: Regenerate. --- bfd/ChangeLog | 11 +++++++++++ bfd/libbfd-in.h | 18 ++++++++++-------- bfd/libbfd.h | 18 ++++++++++-------- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index fefad352f0..658def52ef 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,14 @@ +2016-12-22 Alan Modra + + * libbfd-in.h (_bfd_vms_lib_slurp_armap): Use _bfd_noarchive function. + (_bfd_vms_lib_slurp_extended_name_table: Likewise. + (_bfd_vms_lib_construct_extended_name_table: Likewise. + (_bfd_vms_lib_truncate_arname: Likewise. + (_bfd_vms_lib_write_armap: Likewise. + (_bfd_vms_lib_read_ar_hdr: Likewise. + (_bfd_vms_lib_write_ar_hdr: Likewise. + * libbfd.h: Regenerate. + 2016-12-21: Yury Norov Andreas Schwab diff --git a/bfd/libbfd-in.h b/bfd/libbfd-in.h index 833e1e6bed..fec1b89149 100644 --- a/bfd/libbfd-in.h +++ b/bfd/libbfd-in.h @@ -373,16 +373,18 @@ extern bfd_boolean _bfd_archive_bsd44_construct_extended_name_table /* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get VMS style archives. Use BFD_JUMP_TABLE_ARCHIVE (_bfd_vms_lib). Some of them - are irrelevant and never called, so defined as NULL. */ + are irrelevant. */ extern bfd_boolean _bfd_vms_lib_write_archive_contents (bfd *arch); -#define _bfd_vms_lib_slurp_armap NULL -#define _bfd_vms_lib_slurp_extended_name_table NULL -#define _bfd_vms_lib_construct_extended_name_table NULL -#define _bfd_vms_lib_truncate_arname NULL -#define _bfd_vms_lib_write_armap NULL -#define _bfd_vms_lib_read_ar_hdr NULL -#define _bfd_vms_lib_write_ar_hdr NULL +#define _bfd_vms_lib_slurp_armap _bfd_noarchive_slurp_armap +#define _bfd_vms_lib_slurp_extended_name_table \ + _bfd_noarchive_slurp_extended_name_table +#define _bfd_vms_lib_construct_extended_name_table \ + _bfd_noarchive_construct_extended_name_table +#define _bfd_vms_lib_truncate_arname _bfd_noarchive_truncate_arname +#define _bfd_vms_lib_write_armap _bfd_noarchive_write_armap +#define _bfd_vms_lib_read_ar_hdr _bfd_noarchive_read_ar_hdr +#define _bfd_vms_lib_write_ar_hdr _bfd_noarchive_write_ar_hdr extern bfd *_bfd_vms_lib_openr_next_archived_file (bfd *, bfd *); extern bfd *_bfd_vms_lib_get_elt_at_index (bfd *, symindex); extern int _bfd_vms_lib_generic_stat_arch_elt (bfd *, struct stat *); diff --git a/bfd/libbfd.h b/bfd/libbfd.h index 76bbd09c8b..ee8516340e 100644 --- a/bfd/libbfd.h +++ b/bfd/libbfd.h @@ -378,16 +378,18 @@ extern bfd_boolean _bfd_archive_bsd44_construct_extended_name_table /* Routines to use for BFD_JUMP_TABLE_ARCHIVE to get VMS style archives. Use BFD_JUMP_TABLE_ARCHIVE (_bfd_vms_lib). Some of them - are irrelevant and never called, so defined as NULL. */ + are irrelevant. */ extern bfd_boolean _bfd_vms_lib_write_archive_contents (bfd *arch); -#define _bfd_vms_lib_slurp_armap NULL -#define _bfd_vms_lib_slurp_extended_name_table NULL -#define _bfd_vms_lib_construct_extended_name_table NULL -#define _bfd_vms_lib_truncate_arname NULL -#define _bfd_vms_lib_write_armap NULL -#define _bfd_vms_lib_read_ar_hdr NULL -#define _bfd_vms_lib_write_ar_hdr NULL +#define _bfd_vms_lib_slurp_armap _bfd_noarchive_slurp_armap +#define _bfd_vms_lib_slurp_extended_name_table \ + _bfd_noarchive_slurp_extended_name_table +#define _bfd_vms_lib_construct_extended_name_table \ + _bfd_noarchive_construct_extended_name_table +#define _bfd_vms_lib_truncate_arname _bfd_noarchive_truncate_arname +#define _bfd_vms_lib_write_armap _bfd_noarchive_write_armap +#define _bfd_vms_lib_read_ar_hdr _bfd_noarchive_read_ar_hdr +#define _bfd_vms_lib_write_ar_hdr _bfd_noarchive_write_ar_hdr extern bfd *_bfd_vms_lib_openr_next_archived_file (bfd *, bfd *); extern bfd *_bfd_vms_lib_get_elt_at_index (bfd *, symindex); extern int _bfd_vms_lib_generic_stat_arch_elt (bfd *, struct stat *);