Use target_terminal_ours_for_output in cp-support.c

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

diff --git a/ld/emultempl/m68kelf.em b/ld/emultempl/m68kelf.em
index 48a50bcfdc7baa43b7835d085c6acd44c8ceb079..c1a514c5a8fbb81d30b590ed4e1db25bcbba7fe9 100644 (file)
--- a/ld/emultempl/m68kelf.em
+++ b/ld/emultempl/m68kelf.em
@@ -1,6 +1,5 @@
 # This shell script emits a C file. -*- C -*-
-#   Copyright 2000, 2001, 2003, 2005, 2007, 2008, 2009
-#   Free Software Foundation, Inc.
+#   Copyright (C) 2000-2016 Free Software Foundation, Inc.
 #   Written by Michael Sokolov <msokolov@ivan.Harhan.ORG>, based on armelf.em
 #
 # This file is part of the GNU Binutils.
@@ -68,7 +67,7 @@ m68k_elf_after_open (void)
 
 #ifdef SUPPORT_EMBEDDED_RELOCS
   if (command_line.embedded_relocs
-      && (! link_info.relocatable))
+      && (!bfd_link_relocatable (&link_info)))
     {
       bfd *abfd;
 
@@ -76,7 +75,7 @@ m68k_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;
 
@@ -148,13 +147,13 @@ m68k_elf_after_allocation (void)
 
 #ifdef SUPPORT_EMBEDDED_RELOCS
   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;