From 0f8f509c6aece2357200af325524f53e90d3333d Mon Sep 17 00:00:00 2001 From: David MacKenzie Date: Sat, 22 Jan 1994 02:18:02 +0000 Subject: [PATCH] * bfd-in.h: Remove decls of bfd_ec type and error printing functions. Remove decl of type symclass; wasn't used. * bfd.c: Document error handling, including code fragments containing the error decls that were in bfd-in.h. Remove DEFUNs. * bfd-in2.h: Regenerated. --- bfd/ChangeLog | 9 +++++++ bfd/bfd-in.h | 53 ++++++-------------------------------- bfd/bfd-in2.h | 82 +++++++++++++++++++++++++++-------------------------------- 3 files changed, 54 insertions(+), 90 deletions(-) diff --git a/bfd/ChangeLog b/bfd/ChangeLog index 42ce4cf..6e11748 100644 --- a/bfd/ChangeLog +++ b/bfd/ChangeLog @@ -1,3 +1,12 @@ +Fri Jan 21 16:25:35 1994 David J. Mackenzie (djm@thepub.cygnus.com) + + * bfd-in.h: Remove decls of bfd_ec type and error printing functions. + Remove decl of type symclass; wasn't used. + * bfd.c: Document error handling, including code fragments + containing the error decls that were in bfd-in.h. + Remove DEFUNs. + * bfd-in2.h: Regenerated. + Fri Jan 21 14:11:16 1994 Sean Fagan (sef@cygnus.com) * nlmcode.h, liblnm.h, nlm32-alpha.c nlm32-i386.c nlm32-sparc.c: diff --git a/bfd/bfd-in.h b/bfd/bfd-in.h index 7505210..6b0bc8c 100644 --- a/bfd/bfd-in.h +++ b/bfd/bfd-in.h @@ -218,22 +218,13 @@ typedef enum bfd_format { /* symbols and relocation */ +/* A count of carsyms (canonical archive symbols). */ typedef unsigned long symindex; #define BFD_NO_MORE_SYMBOLS ((symindex) ~0) -typedef enum bfd_symclass { - bfd_symclass_unknown = 0, - bfd_symclass_fcommon, /* fortran common symbols */ - bfd_symclass_global, /* global symbol, what a surprise */ - bfd_symclass_debugger, /* some debugger symbol */ - bfd_symclass_undefined /* none known */ - } symclass; - - -/* general purpose part of a symbol; - target specific parts will be found in libcoff.h, liba.out.h etc */ - +/* General purpose part of a symbol X; + target specific parts are in libcoff.h, libaout.h, etc. */ #define bfd_get_section(x) ((x)->section) #define bfd_get_output_section(x) ((x)->section->output_section) @@ -245,6 +236,7 @@ typedef enum bfd_symclass { #define bfd_asymbol_bfd(x) ((x)->the_bfd) #define bfd_asymbol_flavour(x) (bfd_asymbol_bfd(x)->xvec->flavour) +/* A canonical archive symbol. */ /* This is a type pun with struct ranlib on purpose! */ typedef struct carsym { char *name; @@ -252,7 +244,8 @@ typedef struct carsym { } carsym; /* to make these you call a carsymogen */ -/* Used in generating armaps. Perhaps just a forward definition would do? */ +/* Used in generating armaps (archive tables of contents). + Perhaps just a forward definition would do? */ struct orl { /* output ranlib */ char **name; /* symbol name */ file_ptr pos; /* bfd* or file position */ @@ -265,7 +258,7 @@ struct orl { /* output ranlib */ typedef struct lineno_cache_entry { unsigned int line_number; /* Linenumber from start of function*/ union { - struct symbol_cache_entry *sym; /* Function name */ + struct symbol_cache_entry *sym; /* Function name */ unsigned long offset; /* Offset into section */ } u; } alent; @@ -296,35 +289,6 @@ typedef struct sec *sec_ptr; typedef struct stat stat_type; -/* Error handling */ - -typedef enum bfd_error -{ - no_error = 0, - system_call_error, - invalid_target, - wrong_format, - invalid_operation, - no_memory, - no_symbols, - no_more_archived_files, - malformed_archive, - file_not_recognized, - file_ambiguously_recognized, - no_contents, - nonrepresentable_section, - no_debug_section, - bad_value, - file_truncated, - invalid_error_code -} bfd_ec; - -extern bfd_ec bfd_error; - -CONST char *bfd_errmsg PARAMS ((bfd_ec error_tag)); -void bfd_perror PARAMS ((CONST char *message)); - - typedef enum bfd_print_symbol { bfd_print_symbol_name, @@ -332,13 +296,12 @@ typedef enum bfd_print_symbol bfd_print_symbol_all } bfd_print_symbol_type; - /* Information about a symbol that nm needs. */ typedef struct _symbol_info { symvalue value; - char type; /* */ + char type; CONST char *name; /* Symbol name. */ char stab_other; /* Unused. */ short stab_desc; /* Info for N_TYPE. */ diff --git a/bfd/bfd-in2.h b/bfd/bfd-in2.h index 465ce32..f5ca9e2 100644 --- a/bfd/bfd-in2.h +++ b/bfd/bfd-in2.h @@ -218,22 +218,13 @@ typedef enum bfd_format { /* symbols and relocation */ +/* A count of carsyms (canonical archive symbols). */ typedef unsigned long symindex; #define BFD_NO_MORE_SYMBOLS ((symindex) ~0) -typedef enum bfd_symclass { - bfd_symclass_unknown = 0, - bfd_symclass_fcommon, /* fortran common symbols */ - bfd_symclass_global, /* global symbol, what a surprise */ - bfd_symclass_debugger, /* some debugger symbol */ - bfd_symclass_undefined /* none known */ - } symclass; - - -/* general purpose part of a symbol; - target specific parts will be found in libcoff.h, liba.out.h etc */ - +/* General purpose part of a symbol X; + target specific parts are in libcoff.h, libaout.h, etc. */ #define bfd_get_section(x) ((x)->section) #define bfd_get_output_section(x) ((x)->section->output_section) @@ -245,6 +236,7 @@ typedef enum bfd_symclass { #define bfd_asymbol_bfd(x) ((x)->the_bfd) #define bfd_asymbol_flavour(x) (bfd_asymbol_bfd(x)->xvec->flavour) +/* A canonical archive symbol. */ /* This is a type pun with struct ranlib on purpose! */ typedef struct carsym { char *name; @@ -252,7 +244,8 @@ typedef struct carsym { } carsym; /* to make these you call a carsymogen */ -/* Used in generating armaps. Perhaps just a forward definition would do? */ +/* Used in generating armaps (archive tables of contents). + Perhaps just a forward definition would do? */ struct orl { /* output ranlib */ char **name; /* symbol name */ file_ptr pos; /* bfd* or file position */ @@ -265,7 +258,7 @@ struct orl { /* output ranlib */ typedef struct lineno_cache_entry { unsigned int line_number; /* Linenumber from start of function*/ union { - struct symbol_cache_entry *sym; /* Function name */ + struct symbol_cache_entry *sym; /* Function name */ unsigned long offset; /* Offset into section */ } u; } alent; @@ -296,35 +289,6 @@ typedef struct sec *sec_ptr; typedef struct stat stat_type; -/* Error handling */ - -typedef enum bfd_error -{ - no_error = 0, - system_call_error, - invalid_target, - wrong_format, - invalid_operation, - no_memory, - no_symbols, - no_more_archived_files, - malformed_archive, - file_not_recognized, - file_ambiguously_recognized, - no_contents, - nonrepresentable_section, - no_debug_section, - bad_value, - file_truncated, - invalid_error_code -} bfd_ec; - -extern bfd_ec bfd_error; - -CONST char *bfd_errmsg PARAMS ((bfd_ec error_tag)); -void bfd_perror PARAMS ((CONST char *message)); - - typedef enum bfd_print_symbol { bfd_print_symbol_name, @@ -332,13 +296,12 @@ typedef enum bfd_print_symbol bfd_print_symbol_all } bfd_print_symbol_type; - /* Information about a symbol that nm needs. */ typedef struct _symbol_info { symvalue value; - char type; /* */ + char type; CONST char *name; /* Symbol name. */ char stab_other; /* Unused. */ short stab_desc; /* Info for N_TYPE. */ @@ -1817,6 +1780,35 @@ struct _bfd struct obstack memory; }; +typedef enum bfd_error +{ + no_error = 0, + system_call_error, + invalid_target, + wrong_format, + invalid_operation, + no_memory, + no_symbols, + no_more_archived_files, + malformed_archive, + file_not_recognized, + file_ambiguously_recognized, + no_contents, + nonrepresentable_section, + no_debug_section, + bad_value, + file_truncated, + invalid_error_code +} bfd_ec; + +extern bfd_ec bfd_error; + +CONST char * +bfd_errmsg PARAMS ((bfd_ec error_tag)); + +void +bfd_perror PARAMS ((CONST char *message)); + unsigned int bfd_get_reloc_upper_bound PARAMS ((bfd *abfd, asection *sect)); -- 2.7.4