Imported binutils-2.20

[msp430-binutils.git] / ld / emultempl / lnk960.em

diff --git a/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em
index 1e9e755230194bd9f86eead79bfbee5fd7fc526e..e13233c716eaf9363f3374a7b38b5448406367bd 100644 (file)
--- a/ld/emultempl/lnk960.em
+++ b/ld/emultempl/lnk960.em
@@ -3,7 +3,7 @@
 fragment <<EOF
 /* intel coff loader emulation specific stuff
    Copyright 1991, 1992, 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003,
-   2005, 2007 Free Software Foundation, Inc.
+   2005, 2007, 2008 Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
    This file is part of the GNU Binutils.
@@ -94,7 +94,7 @@ lnk960_before_parse (void)
        einfo ("%P%F I960BASE and G960BASE not set\n");
     }
 
-  ldfile_add_library_path (concat (name, "/lib", NULL), FALSE);
+  ldfile_add_library_path (concat (name, "/lib", (const char *) NULL), FALSE);
   ldfile_output_architecture = bfd_arch_i960;
   ldfile_output_machine = bfd_mach_i960_core;
 }
@@ -189,7 +189,7 @@ lnk960_set_output_arch (void)
          break;
        }
     }
-  bfd_set_arch_mach (output_bfd, ldfile_output_architecture,
+  bfd_set_arch_mach (link_info.output_bfd, ldfile_output_architecture,
                     ldfile_output_machine);
 }