From 4297f9f1cc92f09faef1ebf6857da57b50f85d2c Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Thu, 10 Feb 2005 01:03:49 +0000 Subject: [PATCH] * emultempl/beos.em: Remove #if 0 and #if 1 blocks. --- ld/ChangeLog | 4 ++++ ld/emultempl/beos.em | 27 --------------------------- 2 files changed, 4 insertions(+), 27 deletions(-) diff --git a/ld/ChangeLog b/ld/ChangeLog index e593d01dff..9a5824bbf5 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,7 @@ +2005-02-10 Ben Elliston + + * emultempl/beos.em: Remove #if 0 and #if 1 blocks. + 2005-02-08 Richard Sandiford * configure.tgt (mips64*el-*-linux-gnu*): Define targ_extra_libpath diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em index 0431baf7cc..aa3dab5a77 100644 --- a/ld/emultempl/beos.em +++ b/ld/emultempl/beos.em @@ -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_input_statement_type *file, asection *s) } 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