* ldlang.h (lang_afile_asection_pair_statement_enum): Delete.

	(lang_afile_asection_pair_statement_type): Delete.
	(lang_statement_union_type): Delete afile_asection_pair_statement.
	* ldlang.c (lang_insert_orphan): Delete case handling the above.
	(map_input_to_output_sections, print_statement): Likewise.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 5da7791..1913eac 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,11 @@
+2008-01-16  Alan Modra  <amodra@bigpond.net.au>
+
+       * ldlang.h (lang_afile_asection_pair_statement_enum): Delete.
+       (lang_afile_asection_pair_statement_type): Delete.
+       (lang_statement_union_type): Delete afile_asection_pair_statement.
+       * ldlang.c (lang_insert_orphan): Delete case handling the above.
+       (map_input_to_output_sections, print_statement): Likewise.
+
 2008-01-15  Kaz Kojima  <kkojima@rr.iij4u.or.jp>
 
        * emulparams/shlelf_linux.sh (DATA_START_SYMBOLS): Use PROVIDE

diff --git a/ld/ldlang.c b/ld/ldlang.c
index ec5f000..8aee9a3 100644 (file)
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -1660,7 +1660,6 @@ lang_insert_orphan (asection *s,
                    case lang_target_statement_enum:
                    case lang_output_statement_enum:
                    case lang_group_statement_enum:
-                   case lang_afile_asection_pair_statement_enum:
                      continue;
                    }
                  break;
@@ -3290,9 +3289,6 @@ map_input_to_output_sections
             are initialized.  */
          exp_init_os (s->assignment_statement.exp);
          break;
-       case lang_afile_asection_pair_statement_enum:
-         FAIL ();
-         break;
        case lang_address_statement_enum:
          /* Mark the specified section with the supplied address.
 
@@ -3958,9 +3954,6 @@ print_statement (lang_statement_union_type *s,
     case lang_group_statement_enum:
       print_group (&s->group_statement, os);
       break;
-    case lang_afile_asection_pair_statement_enum:
-      FAIL ();
-      break;
     }
 }
 

diff --git a/ld/ldlang.h b/ld/ldlang.h
index 9d02c8b..3d54356 100644 (file)
--- a/ld/ldlang.h
+++ b/ld/ldlang.h
@@ -79,8 +79,6 @@ typedef struct lang_statement_header_struct
     lang_output_statement_enum,
     lang_padding_statement_enum,
     lang_group_statement_enum,
-
-    lang_afile_asection_pair_statement_enum,
     lang_constructors_statement_enum
   } type;
 } lang_statement_header_type;
@@ -290,13 +288,6 @@ typedef struct
   asection *section;
 } lang_input_section_type;
 
-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 lang_wild_statement_type;
 
 typedef void (*callback_t) (lang_wild_statement_type *, struct wildcard_list *,
@@ -369,7 +360,6 @@ typedef union lang_statement_union
   lang_reloc_statement_type reloc_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;