From fcf276c4958f7cc906ec389f003aa2a713c98528 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Sat, 11 Dec 1993 22:55:55 +0000 Subject: Made many changes to eliminate gcc warnings. Made various cosmetic changes, declared various things in header files, removed various extern declarations from .c files. No substantive changes. --- ld/ldlang.h | 438 ++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 237 insertions(+), 201 deletions(-) (limited to 'ld/ldlang.h') diff --git a/ld/ldlang.h b/ld/ldlang.h index ad0fe6b..7df1189 100644 --- a/ld/ldlang.h +++ b/ld/ldlang.h @@ -1,6 +1,5 @@ -/* ldlang.h - - - Copyright (C) 1991 Free Software Foundation, Inc. +/* ldlang.h - linker command language support + Copyright 1991, 1992, 1993 Free Software Foundation, Inc. This file is part of GLD, the Gnu Linker. @@ -18,39 +17,44 @@ along with GLD; see the file COPYING. If not, write to the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef LDLANG_H +#define LDLANG_H -typedef enum { +typedef enum +{ lang_input_file_is_l_enum, lang_input_file_is_symbols_only_enum, lang_input_file_is_marker_enum, lang_input_file_is_fake_enum, lang_input_file_is_search_file_enum, - lang_input_file_is_file_enum } lang_input_file_enum_type; + lang_input_file_is_file_enum +} lang_input_file_enum_type; typedef unsigned short fill_type; -typedef struct statement_list { +typedef struct statement_list +{ union lang_statement_union *head; union lang_statement_union **tail; } lang_statement_list_type; - - -typedef struct memory_region_struct { +typedef struct memory_region_struct +{ char *name; struct memory_region_struct *next; bfd_vma origin; - bfd_offset length; + bfd_size_type length; bfd_vma current; + bfd_size_type old_length; int flags; boolean had_full_message; - } lang_memory_region_type ; typedef struct lang_statement_header_struct - { - union lang_statement_union *next; - enum statement_enum { +{ + union lang_statement_union *next; + enum statement_enum + { lang_output_section_statement_enum, lang_assignment_statement_enum, lang_input_statement_enum, @@ -65,66 +69,77 @@ typedef struct lang_statement_header_struct lang_padding_statement_enum, lang_afile_asection_pair_statement_enum, - lang_constructors_statement_enum - } type; - - } lang_statement_header_type; + lang_constructors_statement_enum + } type; +} lang_statement_header_type; typedef struct - { - lang_statement_header_type header; - union etree_union *exp; - } lang_assignment_statement_type; +{ + lang_statement_header_type header; + union etree_union *exp; +} lang_assignment_statement_type; -typedef struct lang_target_statement_struct { +typedef struct lang_target_statement_struct +{ lang_statement_header_type header; - CONST char *target; + const char *target; } lang_target_statement_type; -typedef struct lang_output_statement_struct { +typedef struct lang_output_statement_struct +{ lang_statement_header_type header; - CONST char *name; + const char *name; } lang_output_statement_type; typedef struct lang_output_section_statement_struct - { - lang_statement_header_type header; - union etree_union *addr_tree; - lang_statement_list_type children; - CONST char *memspec; - union lang_statement_union *next; - CONST char *name; - unsigned long subsection_alignment; - boolean processed; +{ + lang_statement_header_type header; + union etree_union *addr_tree; + lang_statement_list_type children; + const char *memspec; + union lang_statement_union *next; + const char *name; + + boolean processed; - asection *bfd_section; - int flags; - struct memory_region_struct *region; - size_t block_value; - fill_type fill; - } lang_output_section_statement_type; + asection *bfd_section; + int flags; /* Or together of all input sections */ + int loadable; /* set from NOLOAD flag in script */ + struct memory_region_struct *region; + size_t block_value; + fill_type fill; + + int subsection_alignment; /* alignment of components */ + int section_alignment; /* alignment of start of section */ + + union etree_union *load_base; +} lang_output_section_statement_type; -typedef struct { +typedef struct +{ lang_statement_header_type header; } lang_common_statement_type; -typedef struct { +typedef struct +{ lang_statement_header_type header; } lang_object_symbols_statement_type; -typedef struct { +typedef struct +{ lang_statement_header_type header; fill_type fill; int size; asection *output_section; } lang_fill_statement_type; -typedef struct { +typedef struct +{ lang_statement_header_type header; unsigned int type; union etree_union *exp; @@ -137,67 +152,69 @@ typedef struct { typedef struct lang_input_statement_struct - { - lang_statement_header_type header; - /* Name of this file. */ - CONST char *filename; - /* Name to use for the symbol giving address of text start */ - /* Usually the same as filename, but for a file spec'd with -l - this is the -l switch itself rather than the filename. */ - CONST char *local_sym_name; - - bfd *the_bfd; +{ + lang_statement_header_type header; + /* Name of this file. */ + const char *filename; + /* Name to use for the symbol giving address of text start */ + /* Usually the same as filename, but for a file spec'd with -l + this is the -l switch itself rather than the filename. */ + const char *local_sym_name; - boolean closed; - file_ptr passive_position; + bfd *the_bfd; - /* Symbol table of the file. */ - asymbol **asymbols; - unsigned int symbol_count; + boolean closed; + file_ptr passive_position; - /* For library members only */ + /* Symbol table of the file. */ + asymbol **asymbols; + unsigned int symbol_count; - /* For a library, points to chain of entries for the library members. */ - struct lang_input_statement_struct *subfiles; - /* For a library member, offset of the member within the archive. - Zero for files that are not library members. */ - /* int starting_offset;*/ - /* 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 */ + /* For library members only */ - union lang_statement_union *next; - /* Point to the next file, but skips archive contents */ - union lang_statement_union *next_real_file; + /* 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 */ - boolean is_archive; + union lang_statement_union *next; + /* Point to the next file, but skips archive contents */ + union lang_statement_union *next_real_file; - /* 1 means search a set of directories for this file. */ - boolean search_dirs_flag; + boolean is_archive; - /* 1 means this is base file of incremental load. - Do not load this file's text or data. - Also default text_start to after this file's bss. */ + /* 1 means search a set of directories for this file. */ + boolean search_dirs_flag; - boolean just_syms_flag; + /* 1 means this is base file of incremental load. + Do not load this file's text or data. + Also default text_start to after this file's bss. */ - boolean loaded; + boolean just_syms_flag; + boolean loaded; - /* unsigned int globals_in_this_file;*/ - CONST char *target; - boolean real; - asection *common_section; - asection *common_output_section; - } lang_input_statement_type; - -typedef struct { + /* unsigned int globals_in_this_file;*/ + const char *target; + boolean real; + asection *common_section; + asection *common_output_section; + boolean complained; +} lang_input_statement_type; + +typedef struct +{ lang_statement_header_type header; asection *section; lang_input_statement_type *ifile; @@ -205,26 +222,30 @@ typedef struct { } lang_input_section_type; -typedef struct { +typedef struct +{ lang_statement_header_type header; asection *section; union lang_statement_union *file; } lang_afile_asection_pair_statement_type; -typedef struct lang_wild_statement_struct { +typedef struct lang_wild_statement_struct +{ lang_statement_header_type header; - CONST char *section_name; - CONST char *filename; + const char *section_name; + const char *filename; lang_statement_list_type children; } lang_wild_statement_type; -typedef struct lang_address_statement_struct { +typedef struct lang_address_statement_struct +{ lang_statement_header_type header; - CONST char *section_name; + const char *section_name; union etree_union *address; } lang_address_statement_type; -typedef struct { +typedef struct +{ lang_statement_header_type header; bfd_vma output_offset; size_t size; @@ -233,112 +254,127 @@ typedef struct { } lang_padding_statement_type; typedef union lang_statement_union - { - lang_statement_header_type header; - union lang_statement_union *next; - lang_wild_statement_type wild_statement; - lang_data_statement_type data_statement; - lang_address_statement_type address_statement; - lang_output_section_statement_type output_section_statement; - lang_afile_asection_pair_statement_type afile_asection_pair_statement; - lang_assignment_statement_type assignment_statement; - lang_input_statement_type input_statement; - lang_target_statement_type target_statement; - lang_output_statement_type output_statement; - lang_input_section_type input_section; - lang_common_statement_type common_statement; - lang_object_symbols_statement_type object_symbols_statement; - lang_fill_statement_type fill_statement; - lang_padding_statement_type padding_statement; - } lang_statement_union_type; - - - -PROTO(void,lang_init,(void)); -PROTO(struct memory_region_struct , - *lang_memory_region_lookup,(CONST - char *CONST)); - - -PROTO(void ,lang_map,(void)); -PROTO(void,lang_set_flags,(int *, CONST char *)); -PROTO(void,lang_add_output,(CONST char *)); - -PROTO(void,lang_final,(void)); -PROTO(struct symbol_cache_entry *,create_symbol,(CONST char *, unsigned int, struct sec *)); -PROTO(void ,lang_process,(void)); -PROTO(void ,lang_section_start,(CONST char *, union etree_union *)); -PROTO(void,lang_add_entry,(CONST char *)); -PROTO(void,lang_add_target,(CONST char *)); -PROTO(void,lang_add_wild,(CONST char *CONST , CONST char *CONST)); -PROTO(void,lang_add_map,(CONST char *)); -PROTO(void,lang_add_fill,(int)); -PROTO(void,lang_add_assignment,(union etree_union *)); -PROTO(void,lang_add_attribute,(enum statement_enum)); -PROTO(void,lang_startup,(CONST char *)); -PROTO(void,lang_float,(enum bfd_boolean)); -PROTO(void,lang_leave_output_section_statement,(bfd_vma, CONST char *)); -PROTO(void,lang_abs_symbol_at_end_of,(CONST char *, CONST char *)); -PROTO(void,lang_abs_symbol_at_beginning_of,(CONST char *, CONST char *)); -PROTO(void,lang_statement_append,(struct statement_list *, union lang_statement_union *, union lang_statement_union **)); -PROTO(void, lang_for_each_file,(void (*dothis)(lang_input_statement_type *))); - - -#define LANG_FOR_EACH_INPUT_STATEMENT(statement) \ +{ + lang_statement_header_type header; + union lang_statement_union *next; + lang_wild_statement_type wild_statement; + lang_data_statement_type data_statement; + lang_address_statement_type address_statement; + lang_output_section_statement_type output_section_statement; + lang_afile_asection_pair_statement_type afile_asection_pair_statement; + lang_assignment_statement_type assignment_statement; + lang_input_statement_type input_statement; + lang_target_statement_type target_statement; + lang_output_statement_type output_statement; + lang_input_section_type input_section; + lang_common_statement_type common_statement; + lang_object_symbols_statement_type object_symbols_statement; + lang_fill_statement_type fill_statement; + lang_padding_statement_type padding_statement; +} lang_statement_union_type; + +extern bfd_size_type largest_section; +extern lang_output_section_statement_type *abs_output_section; +extern lang_input_statement_type *script_file; +extern boolean lang_has_input_file; +extern boolean relaxing; +extern etree_type *base; +extern lang_statement_list_type *stat_ptr; +extern boolean delete_output_file_on_failure; +extern lang_output_section_statement_type *create_object_symbols; + +extern void lang_init PARAMS ((void)); +extern struct memory_region_struct *lang_memory_region_lookup + PARAMS ((const char *const)); +extern void lang_map PARAMS ((void)); +extern void lang_set_flags PARAMS ((int *, const char *)); +extern void lang_add_output PARAMS ((const char *, int from_script)); +extern void lang_enter_output_section_statement + PARAMS ((const char *output_section_statement_name, + etree_type * address_exp, + int flags, + bfd_vma block_value, + etree_type *align, + etree_type *subalign, + etree_type *base)); +extern void lang_final PARAMS ((void)); +extern struct symbol_cache_entry *create_symbol + PARAMS ((const char *, unsigned int, struct sec *)); +extern void lang_process PARAMS ((void)); +extern void lang_section_start PARAMS ((const char *, union etree_union *)); +extern void lang_add_entry PARAMS ((const char *)); +extern void lang_add_target PARAMS ((const char *)); +extern void lang_add_wild PARAMS ((const char *const , const char *const)); +extern void lang_add_map PARAMS ((const char *)); +extern void lang_add_fill PARAMS ((int)); +extern void lang_add_assignment PARAMS ((union etree_union *)); +extern void lang_add_attribute PARAMS ((enum statement_enum)); +extern void lang_startup PARAMS ((const char *)); +extern void lang_float PARAMS ((enum bfd_boolean)); +extern void lang_leave_output_section_statement PARAMS ((bfd_vma, + const char *)); +extern void lang_abs_symbol_at_end_of PARAMS ((const char *, const char *)); +extern void lang_abs_symbol_at_beginning_of PARAMS ((const char *, + const char *)); +extern void lang_statement_append PARAMS ((struct statement_list *, + union lang_statement_union *, + union lang_statement_union **)); +extern void lang_for_each_file + PARAMS ((void (*dothis) (lang_input_statement_type *))); + +#define LANG_FOR_EACH_INPUT_STATEMENT(statement) \ extern lang_statement_list_type file_chain; \ lang_input_statement_type *statement; \ for (statement = (lang_input_statement_type *)file_chain.head;\ statement != (lang_input_statement_type *)NULL; \ statement = (lang_input_statement_type *)statement->next)\ -#define LANG_FOR_EACH_INPUT_SECTION(statement, abfd, section, x) \ - { extern lang_statement_list_type file_chain; \ - lang_input_statement_type *statement; \ - for (statement = (lang_input_statement_type *)file_chain.head;\ - statement != (lang_input_statement_type *)NULL; \ - statement = (lang_input_statement_type *)statement->next)\ - { \ - asection *section; \ - bfd *abfd = statement->the_bfd; \ - for (section = abfd->sections; \ - section != (asection *)NULL; \ - section = section->next) { \ - x; \ - } \ - } \ - } - -#define LANG_FOR_EACH_OUTPUT_SECTION(section, x) \ - { extern bfd *output_bfd; \ - asection *section; \ - for (section = output_bfd->sections; \ +#define LANG_FOR_EACH_INPUT_SECTION(statement, abfd, section, x) \ + { \ + extern lang_statement_list_type file_chain; \ + lang_input_statement_type *statement; \ + for (statement = (lang_input_statement_type *)file_chain.head; \ + statement != (lang_input_statement_type *)NULL; \ + statement = (lang_input_statement_type *)statement->next) \ + { \ + asection *section; \ + bfd *abfd = statement->the_bfd; \ + for (section = abfd->sections; \ section != (asection *)NULL; \ - section = section->next) \ - { x; } \ - } - - -PROTO(void, lang_process,(void)); -PROTO(void, ldlang_add_file,(lang_input_statement_type *)); + section = section->next) \ + { \ + x; \ + } \ + } \ + } -PROTO(lang_output_section_statement_type - *,lang_output_section_find,(CONST char * CONST)); - -PROTO(lang_input_statement_type *, - lang_add_input_file,(CONST char *name, - lang_input_file_enum_type file_type, - CONST char *target)); -PROTO(lang_output_section_statement_type *, - lang_output_section_statement_lookup,(CONST char * CONST name)); - -PROTO(void, ldlang_add_undef,(CONST char *CONST name)); -PROTO(void, lang_add_output_format,(CONST char *)); - - -void EXFUN(lang_list_init,( lang_statement_list_type*)); - -void EXFUN(lang_add_data,(int type, union etree_union *)); - -void EXFUN(lang_for_each_statement,(void (*func)())); - -PTR EXFUN(stat_alloc,(size_t size)); +#define LANG_FOR_EACH_OUTPUT_SECTION(section, x) \ + { \ + extern bfd *output_bfd; \ + asection *section; \ + for (section = output_bfd->sections; \ + section != (asection *)NULL; \ + section = section->next) \ + { \ + x; \ + } \ + } + +extern void lang_process PARAMS ((void)); +extern void ldlang_add_file PARAMS ((lang_input_statement_type *)); +extern lang_output_section_statement_type *lang_output_section_find + PARAMS ((const char * const)); +extern lang_input_statement_type *lang_add_input_file + PARAMS ((const char *name, lang_input_file_enum_type file_type, + const char *target)); +extern void lang_add_keepsyms_file PARAMS ((const char *filename)); +extern lang_output_section_statement_type * + lang_output_section_statement_lookup PARAMS ((const char * const name)); +extern void ldlang_add_undef PARAMS ((const char *const name)); +extern void lang_add_output_format PARAMS ((const char *, int from_script)); +extern void lang_list_init PARAMS ((lang_statement_list_type*)); +extern void lang_add_data PARAMS ((int type, union etree_union *)); +extern void lang_for_each_statement PARAMS ((void (*func)())); +extern PTR stat_alloc PARAMS ((size_t size)); + +#endif -- cgit v1.1