Add ChangeLog for PR ld/19615 fix

[external/binutils.git] / ld / emultempl / crxelf.em

diff --git a/ld/emultempl/crxelf.em b/ld/emultempl/crxelf.em
index 0694bb9..4c6b8a5 100644 (file)
--- a/ld/emultempl/crxelf.em
+++ b/ld/emultempl/crxelf.em
@@ -1,12 +1,11 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2004
-#   Free Software Foundation, Inc.
+#   Copyright (C) 2004-2016 Free Software Foundation, Inc.
 #
-# This file is part of GLD, the Gnu Linker.
+# This file is part of the GNU Binutils.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful,
@@ -16,13 +15,14 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
+# MA 02110-1301, USA.
 #
 
 # This file is sourced from elf32.em, and defines extra crx-elf
 # specific routines.
 #
-cat >>e${EMULATION_NAME}.c <<EOF
+fragment <<EOF
 
 #include "ldctor.h"
 
@@ -38,9 +38,28 @@ crxelf_after_parse (void)
   config.sort_common = TRUE;
 
   /* Don't create a demand-paged executable, since this feature isn't
-     meaninful in CR16C embedded systems. Moreover, when magic_demand_paged
+     meaninful in CRX embedded systems. Moreover, when magic_demand_paged
      is true the link sometimes fails.  */
   config.magic_demand_paged = FALSE;
+
+  gld${EMULATION_NAME}_after_parse ();
+}
+
+/* This is called after the sections have been attached to output
+   sections, but before any sizes or addresses have been set.  */
+
+static void
+crxelf_before_allocation (void)
+{
+  /* Call the default first.  */
+  gld${EMULATION_NAME}_before_allocation ();
+
+  /* Enable relaxation by default if the "--no-relax" option was not
+     specified.  This is done here instead of in the before_parse hook
+     because there is a check in main() to prohibit use of --relax and
+     -r together.  */
+  if (RELAXATION_DISABLED_BY_DEFAULT)
+    ENABLE_RELAXATION;
 }
 
 EOF
@@ -48,3 +67,4 @@ EOF
 # Put these extra crx-elf routines in ld_${EMULATION_NAME}_emulation
 #
 LDEMUL_AFTER_PARSE=crxelf_after_parse
+LDEMUL_BEFORE_ALLOCATION=crxelf_before_allocation