small ld/emultempl cleanup

["Ben Elliston" <bje at au1 dot ibm dot com>]

I'm just flushing a few lurking patches from my tree, so here is a
small one against emultempl/beos.em.  Okay for mainline?

2005-02-10  Ben Elliston  <bje@au.ibm.com>

	* emultempl/beos.em: Remove #if 0 and #if 1 blocks.

Index: emultempl/beos.em
===================================================================
RCS file: /home/bje/src-cvs/src/ld/emultempl/beos.em,v
retrieving revision 1.25
diff -u -p -u -r1.25 beos.em
--- emultempl/beos.em	3 Jan 2004 11:09:07 -0000	1.25
+++ emultempl/beos.em	9 Feb 2005 23:02:36 -0000
@@ -187,10 +187,6 @@ set_pe_subsystem (void)
       { "wwindows", 2, "_wWinMainCRTStartup" },
       { "console", 3, "_mainCRTStartup" },
       { "wconsole", 3, "_wmainCRTStartup" },
-#if 0
-      /* The Microsoft linker does not recognize this.  */
-      { "os2", 5, "" },
-#endif
       { "posix", 7, "___PosixProcessStartup"},
       { 0, 0, 0 }
     };
@@ -733,30 +729,7 @@ gld${EMULATION_NAME}_place_orphan (lang_
       }
   ps[0] = 0;
   if (l == NULL)
-#if 1
     einfo ("%P%F: *(%s\$) missing from linker script\n", output_secname);
-#else /* FIXME: This block is untried.  It exists to convey the intent,
-	 should one decide to not require *(.foo\$) to appear in the linker
-	 script.  */
-    {
-      lang_wild_statement_type *new;
-      struct wildcard_list *tmp;
-
-      tmp = (struct wildcard_list *) xmalloc (sizeof *tmp);
-      tmp->next = NULL;
-      tmp->spec.name = xmalloc (strlen (output_secname) + 2);
-      sprintf (tmp->spec.name, "%s\$", output_secname);
-      tmp->spec.exclude_name_list = NULL;
-      tmp->sorted = FALSE;
-      new = new_stat (lang_wild_statement, &os->children);
-      new->filename = NULL;
-      new->filenames_sorted = FALSE;
-      new->section_list = tmp;
-      new->keep_sections = FALSE;
-      lang_list_init (&new->children);
-      l = new;
-    }
-#endif
 
   /* Link the input section in and we're done for now.
      The sections still have to be sorted, but that has to wait until

Attachment: signature.asc
Description: Digital signature