[AArch64] Revert local changes included in Matthew's commit

[deliverable/binutils-gdb.git] / ld / ldemul.c

diff --git a/ld/ldemul.c b/ld/ldemul.c
index 5e2fd82a0dd82fb3c2871ed2480b9bb44b26a9e6..4898892c43789ecd991f6d0838c58278d67681f6 100644 (file)
--- a/ld/ldemul.c
+++ b/ld/ldemul.c
@@ -1,7 +1,5 @@
 /* ldemul.c -- clearing house for ld emulation states
-   Copyright 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-   2001, 2002, 2003, 2005, 2007, 2008, 2009, 2010, 2011, 2012
-   Free Software Foundation, Inc.
+   Copyright (C) 1991-2015 Free Software Foundation, Inc.
 
    This file is part of the GNU Binutils.
 
@@ -122,6 +120,10 @@ ldemul_open_dynamic_archive (const char *arch, search_dirs_type *search,
 lang_output_section_statement_type *
 ldemul_place_orphan (asection *s, const char *name, int constraint)
 {
+  if (config.warn_orphan)
+    einfo (_("%P: Warning: input section '%s' from file '%B' is not mentioned in linker script\n"),
+          name, s->owner);
+
   if (ld_emulation->place_orphan)
     return (*ld_emulation->place_orphan) (s, name, constraint);
   return NULL;
@@ -237,7 +239,7 @@ after_allocation_default (void)
 void
 before_allocation_default (void)
 {
-  if (!link_info.relocatable && !link_info.emitrelocations)
+  if (!link_info.relocatable)
     strip_excluded_output_sections ();
 }
 
@@ -350,3 +352,10 @@ ldemul_new_vers_pattern (struct bfd_elf_version_expr *entry)
     entry = (*ld_emulation->new_vers_pattern) (entry);
   return entry;
 }
+
+void
+ldemul_extra_map_file_text (bfd *abfd, struct bfd_link_info *info, FILE *mapf)
+{
+  if (ld_emulation->extra_map_file_text)
+    ld_emulation->extra_map_file_text (abfd, info, mapf);
+}