Add variable length tests for emit_ref in trace-condition.exp

[deliverable/binutils-gdb.git] / ld / emultempl / cr16elf.em

diff --git a/ld/emultempl/cr16elf.em b/ld/emultempl/cr16elf.em
index 22fe501c72fdd5fac5946d3e00bf9f789871ceff..e0cadf79d8ccd8de6aa517a770726bf7e233ab0d 100644 (file)
--- a/ld/emultempl/cr16elf.em
+++ b/ld/emultempl/cr16elf.em
@@ -1,5 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-# Copyright 2007 Free Software Foundation, Inc.
+# Copyright (C) 2007-2016 Free Software Foundation, Inc.
 # Contributed by M R Swami Reddy <MR.Swami.Reddy@nsc.com>
 #
 # This file is part of the GNU Binutils.
@@ -27,9 +27,6 @@ fragment <<EOF
 
 #include "ldctor.h"
 
-/* Flag for the emulation-specific "--no-relax" option.  */
-static bfd_boolean disable_relaxation = FALSE;
-
 static void check_sections (bfd *, asection *, void *);
 
 
@@ -42,7 +39,7 @@ cr16_elf_after_open (void)
   gld${EMULATION_NAME}_after_open ();
 
    if (command_line.embedded_relocs
-       && (! link_info.relocatable))
+       && !bfd_link_relocatable (&link_info))
      {
        bfd *abfd;
 
@@ -50,7 +47,7 @@ cr16_elf_after_open (void)
         input file with a nonzero .data section.  The BFD backend will fill in
         these sections with magic numbers which can be used to relocate the
         data section at run time.  */
-      for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
+      for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link.next)
        {
          asection *datasec;
 
@@ -90,7 +87,7 @@ cr16_elf_after_open (void)
 
          /* Double check that all other data sections are empty, as is
             required for embedded PIC code.  */
-         bfd_map_over_sections (abfd, check_sections, datasec); 
+         bfd_map_over_sections (abfd, check_sections, datasec);
        }
     }
 }
@@ -121,6 +118,8 @@ cr16elf_after_parse (void)
      meaninful in CR16 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
@@ -133,14 +132,14 @@ cr16elf_before_allocation (void)
   gld${EMULATION_NAME}_before_allocation ();
 
    if (command_line.embedded_relocs
-       && (! link_info.relocatable))
+       && (!bfd_link_relocatable (&link_info)))
      {
 
    bfd *abfd;
 
    /* If we are generating embedded relocs, call a special BFD backend
         routine to do the work.  */
-   for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link_next)
+   for (abfd = link_info.input_bfds; abfd != NULL; abfd = abfd->link.next)
       {
          asection *datasec, *relsec;
          char *errmsg;
@@ -171,34 +170,12 @@ cr16elf_before_allocation (void)
      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 (!disable_relaxation)
-    command_line.relax = TRUE;
+  if (RELAXATION_DISABLED_BY_DEFAULT)
+    ENABLE_RELAXATION;
 }
 
 EOF
 
-# Define some shell vars to insert bits of code into the standard elf
-# parse_args and list_options functions.
-#
-PARSE_AND_LIST_PROLOGUE='
-#define OPTION_NO_RELAX                        301
-'
-
-PARSE_AND_LIST_LONGOPTS='
-  { "no-relax", no_argument, NULL, OPTION_NO_RELAX},
-'
-
-PARSE_AND_LIST_OPTIONS='
-  fprintf (file, _("  --no-relax                  Do not relax branches\n"));
-'
-
-PARSE_AND_LIST_ARGS_CASES='
-    case OPTION_NO_RELAX:
-      disable_relaxation = TRUE;
-      break;
-'
-
 # Put these extra cr16-elf routines in ld_${EMULATION_NAME}_emulation
 #
 LDEMUL_AFTER_OPEN=cr16_elf_after_open