arm bfd.h tidy

[deliverable/binutils-gdb.git] / ld / ldlang.h

diff --git a/ld/ldlang.h b/ld/ldlang.h
index 4e96a20c15129ad436dfc1e40f4c8433459c0638..5ab62e327929b94ff762a147a1bf47dc242769d1 100644 (file)
--- a/ld/ldlang.h
+++ b/ld/ldlang.h
@@ -68,22 +68,22 @@ typedef struct memory_region_struct
 
 enum statement_enum
 {
-  lang_output_section_statement_enum,
-  lang_assignment_statement_enum,
-  lang_input_statement_enum,
   lang_address_statement_enum,
-  lang_wild_statement_enum,
-  lang_input_section_enum,
-  lang_object_symbols_statement_enum,
-  lang_fill_statement_enum,
+  lang_assignment_statement_enum,
   lang_data_statement_enum,
-  lang_reloc_statement_enum,
-  lang_target_statement_enum,
-  lang_output_statement_enum,
-  lang_padding_statement_enum,
+  lang_fill_statement_enum,
   lang_group_statement_enum,
+  lang_input_section_enum,
+  lang_input_statement_enum,
   lang_insert_statement_enum,
-  lang_constructors_statement_enum
+  lang_output_section_statement_enum,
+  lang_output_statement_enum,
+  lang_padding_statement_enum,
+  lang_reloc_statement_enum,
+  lang_target_statement_enum,
+  lang_wild_statement_enum,
+  lang_constructors_statement_enum,
+  lang_object_symbols_statement_enum
 };
 
 typedef struct lang_statement_header_struct
@@ -173,16 +173,6 @@ typedef struct lang_output_section_statement_struct
   unsigned int align_lma_with_input : 1;
 } lang_output_section_statement_type;
 
-typedef struct
-{
-  lang_statement_header_type header;
-} lang_common_statement_type;
-
-typedef struct
-{
-  lang_statement_header_type header;
-} lang_object_symbols_statement_type;
-
 typedef struct
 {
   lang_statement_header_type header;
@@ -309,10 +299,10 @@ typedef struct lang_input_statement_struct
   struct flag_info *section_flag_list;
 
   /* Next pointer for file_chain statement list.  */
-  union lang_statement_union *next;
+  struct lang_input_statement_struct *next;
 
   /* Next pointer for input_file_chain statement list.  */
-  union lang_statement_union *next_real_file;
+  struct lang_input_statement_struct *next_real_file;
 
   const char *target;
 
@@ -339,8 +329,12 @@ typedef struct input_section_userdata_struct
   unsigned long map_symbol_def_count;
 } input_section_userdata_type;
 
-#define get_userdata(x) ((x)->userdata)
-
+static inline bfd_boolean
+bfd_input_just_syms (const bfd *abfd)
+{
+  lang_input_statement_type *is = bfd_usrdata (abfd);
+  return is != NULL && is->flags.just_syms;
+}
 
 typedef struct lang_wild_statement_struct lang_wild_statement_type;
 
@@ -419,22 +413,20 @@ typedef struct
 typedef union lang_statement_union
 {
   lang_statement_header_type header;
-  lang_wild_statement_type wild_statement;
-  lang_data_statement_type data_statement;
-  lang_reloc_statement_type reloc_statement;
   lang_address_statement_type address_statement;
-  lang_output_section_statement_type output_section_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_data_statement_type data_statement;
   lang_fill_statement_type fill_statement;
-  lang_padding_statement_type padding_statement;
   lang_group_statement_type group_statement;
+  lang_input_section_type input_section;
+  lang_input_statement_type input_statement;
   lang_insert_statement_type insert_statement;
+  lang_output_section_statement_type output_section_statement;
+  lang_output_statement_type output_statement;
+  lang_padding_statement_type padding_statement;
+  lang_reloc_statement_type reloc_statement;
+  lang_target_statement_type target_statement;
+  lang_wild_statement_type wild_statement;
 } lang_statement_union_type;
 
 /* This structure holds information about a program header, from the
@@ -502,7 +494,7 @@ extern struct lang_phdr *lang_phdr_list;
 extern struct lang_nocrossrefs *nocrossref_list;
 extern const char *output_target;
 extern lang_output_section_statement_type *abs_output_section;
-extern lang_statement_list_type lang_output_section_statement;
+extern lang_statement_list_type lang_os_list;
 extern struct lang_input_statement_flags input_flags;
 extern bfd_boolean lang_has_input_file;
 extern lang_statement_list_type *stat_ptr;
@@ -567,9 +559,6 @@ extern void lang_float
 extern void lang_leave_output_section_statement
   (fill_type *, const char *, lang_output_section_phdr_list *,
    const char *);
-extern void lang_statement_append
-  (lang_statement_list_type *, lang_statement_union_type *,
-   lang_statement_union_type **);
 extern void lang_for_each_input_file
   (void (*dothis) (lang_input_statement_type *));
 extern void lang_for_each_file
@@ -585,7 +574,7 @@ extern asection *section_for_dot
   lang_input_statement_type *statement;                                        \
   for (statement = &file_chain.head->input_statement;                  \
        statement != NULL;                                              \
-       statement = &statement->next->input_statement)
+       statement = statement->next)
 
 #define lang_output_section_find(NAME) \
   lang_output_section_statement_lookup (NAME, 0, FALSE)