* bsd-uthread.c (bsd_uthread_wait): Don't try to fetch thread IDs

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

diff --git a/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em
index 1c820655cf5419d7706b17f7d5ee0c1fec8768bb..a868b539729fef1578430a5302a3f661c32d88ea 100644 (file)
--- a/ld/emultempl/lnk960.em
+++ b/ld/emultempl/lnk960.em
@@ -2,8 +2,8 @@
 # It does some substitutions.
 cat >e${EMULATION_NAME}.c <<EOF
 /* intel coff loader emulation specific stuff
-   Copyright 1991, 1992, 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003, 2005
-   Free Software Foundation, Inc.
+   Copyright 1991, 1992, 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2003,
+   2005, 2007 Free Software Foundation, Inc.
    Written by Steve Chamberlain steve@cygnus.com
 
 This file is part of GLD, the Gnu Linker.
@@ -22,9 +22,9 @@ You should have received a copy of the GNU General Public License
 along with GLD; see the file COPYING.  If not, write to
 the Free Software Foundation, 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.  */
 
+#include "sysdep.h"
 #include "libiberty.h"
 #include "bfd.h"
-#include "sysdep.h"
 #include "bfdlink.h"
 
 /*#include "archures.h"*/
@@ -269,11 +269,10 @@ struct ld_emulation_xfer_struct ld_lnk960_emulation =
   lnk960_set_output_arch,
   lnk960_choose_target,
   before_allocation_default,
-  do_assignments_default,
   lnk960_get_script,
   "lnk960",
   "",
-  NULL,        /* finish */
+  finish_default,
   NULL,        /* create output section statements */
   NULL,        /* open dynamic archive */
   NULL,        /* place orphan */