PR25018, readelf crash on 32bits

[external/binutils.git] / ld / ldlang.h

diff --git a/ld/ldlang.h b/ld/ldlang.h
index 86ef342..686e44f 100644 (file)
--- a/ld/ldlang.h
+++ b/ld/ldlang.h
@@ -1,5 +1,5 @@
 /* ldlang.h - linker command language support
-   Copyright (C) 1991-2017 Free Software Foundation, Inc.
+   Copyright (C) 1991-2019 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -68,26 +68,27 @@ 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
 {
+  /* Next pointer for statement_list statement list.  */
   union lang_statement_union *next;
   enum statement_enum type;
 } lang_statement_header_type;
@@ -115,6 +116,7 @@ typedef struct lang_output_statement_struct
 enum section_type
 {
   normal_section,
+  first_overlay_section,
   overlay_section,
   noload_section,
   noalloc_section
@@ -143,6 +145,8 @@ typedef struct lang_output_section_statement_struct
   fill_type *fill;
   union etree_union *addr_tree;
   union etree_union *load_base;
+  union etree_union *section_alignment;
+  union etree_union *subsection_alignment;
 
   /* If non-null, an expression to evaluate after setting the section's
      size.  The expression is evaluated inside REGION (above) with '.'
@@ -153,8 +157,6 @@ typedef struct lang_output_section_statement_struct
   lang_output_section_phdr_list *phdrs;
 
   unsigned int block_value;
-  int subsection_alignment;    /* Alignment of components.  */
-  int section_alignment;       /* Alignment of start of section.  */
   int constraint;
   flagword flags;
   enum section_type sectype;
@@ -174,16 +176,6 @@ typedef struct lang_output_section_statement_struct
 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;
   fill_type *fill;
   int size;
   asection *output_section;
@@ -306,16 +298,11 @@ typedef struct lang_input_statement_struct
 
   struct flag_info *section_flag_list;
 
-  /* Point to the next file - whatever it is, wanders up and down
-     archive elements.  If this input_statement is for an archive, it
-     won't be on file_chain (which uses this list pointer), but if
-     any elements have been extracted from the archive, it will point
-     to the input_statement for the last such element.  */
-  union lang_statement_union *next;
+  /* Next pointer for file_chain statement list.  */
+  struct lang_input_statement_struct *next;
 
-  /* Point to the next file, but skips archive contents.  Used by
-     input_file_chain.  */
-  union lang_statement_union *next_real_file;
+  /* Next pointer for input_file_chain statement list.  */
+  struct lang_input_statement_struct *next_real_file;
 
   const char *target;
 
@@ -422,22 +409,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
@@ -505,7 +490,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;
@@ -570,9 +555,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
@@ -588,7 +570,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)