X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Fgld960c.em;h=1999ea89a85c43c9e88bb4b34f90f8d40ef6a97e;hb=92b93329b58c744ea269b50f6278ed99416941a9;hp=89e75aee6fd550e3fc025daa40a725636d6ed0b0;hpb=0c7a8e5acd399d1d36dbe0cda815844dd5308c10;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/emultempl/gld960c.em b/ld/emultempl/gld960c.em
index 89e75aee6f..1999ea89a8 100644
--- a/ld/emultempl/gld960c.em
+++ b/ld/emultempl/gld960c.em
@@ -1,33 +1,31 @@
 # This shell script emits a C file. -*- C -*-
 # It does some substitutions.
-cat >e${EMULATION_NAME}.c <<EOF
-/* Copyright 1991, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003
-   Free Software Foundation, Inc.
+fragment <<EOF
+/* Copyright 1991, 1993, 1994, 1996, 1999, 2000, 2001, 2002, 2003, 2004,
+   2005, 2007 Free Software Foundation, Inc.
 
-This file is part of GLD, the Gnu Linker.
+   This file is part of the GNU Binutils.
 
-GLD 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 1, or (at your option)
-any later version.
+   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 3 of the License, or
+   (at your option) any later version.
 
-GLD is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-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, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.  */
+   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., 51 Franklin Street - Fifth Floor, Boston,
+   MA 02110-1301, USA.  */
 
-/* 
- * emulate the Intels port of  gld
- */
 
+/* Emulate the Intel's port of gld.  */
 
-#include "bfd.h"
 #include "sysdep.h"
+#include "bfd.h"
 #include "libiberty.h"
 #include "safe-ctype.h"
 #include "bfdlink.h"
@@ -41,29 +39,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "ldfile.h"
 #include "ldemul.h"
 
-#ifdef GNU960
-
-static void
-gld960_before_parse (void)
-{
-  static char *env_variables[] = { "G960LIB", "G960BASE", 0 };
-  char **p;
-  char *env ;
-
-  for ( p = env_variables; *p; p++ ){
-    env =  (char *) getenv(*p);
-    if (env) {
-      ldfile_add_library_path (concat (env,
-				       "/lib/libcoff",
-				       (const char *) NULL),
-			       FALSE);
-    }
-  }
-  ldfile_output_architecture = bfd_arch_i960;
-}
-
-#else	/* not GNU960 */
-
 static void gld960_before_parse (void)
 {
   char *env ;
@@ -78,9 +53,6 @@ static void gld960_before_parse (void)
   ldfile_output_architecture = bfd_arch_i960;
 }
 
-#endif	/* GNU960 */
-
-
 static void
 gld960_set_output_arch (void)
 {
@@ -92,7 +64,7 @@ gld960_set_output_arch (void)
       s = concat ("i960:", ldfile_output_machine_name, (char *) NULL);
       for (s1 = s; *s1 != '\0'; s1++)
 	*s1 = TOLOWER (*s1);
-      ldfile_set_output_arch (s);
+      ldfile_set_output_arch (s, bfd_arch_unknown);
       free (s);
     }
 
@@ -102,13 +74,6 @@ gld960_set_output_arch (void)
 static char *
 gld960_choose_target (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
 {
-#ifdef GNU960
-
-  output_filename = "b.out";
-  return bfd_make_targ_name(BFD_BOUT_FORMAT, 0);
-
-#else
-
   char *from_outside = getenv(TARGET_ENVIRON);
   output_filename = "b.out";
 
@@ -116,8 +81,6 @@ gld960_choose_target (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
     return from_outside;
 
   return "coff-Intel-little";
-
-#endif
 }
 
 static char *
@@ -131,8 +94,8 @@ then
 # sed commands to quote an ld script as a C string.
 sc="-f stringify.sed"
 
-cat >>e${EMULATION_NAME}.c <<EOF
-{			     
+fragment <<EOF
+{
   *isfile = 0;
 
   if (link_info.relocatable && config.build_constructors)
@@ -152,8 +115,8 @@ echo '; }'                                             >> e${EMULATION_NAME}.c
 else
 # Scripts read from the filesystem.
 
-cat >>e${EMULATION_NAME}.c <<EOF
-{			     
+fragment <<EOF
+{
   *isfile = 1;
 
   if (link_info.relocatable && config.build_constructors)
@@ -171,9 +134,9 @@ EOF
 
 fi
 
-cat >>e${EMULATION_NAME}.c <<EOF
+fragment <<EOF
 
-struct ld_emulation_xfer_struct ld_gld960coff_emulation = 
+struct ld_emulation_xfer_struct ld_gld960coff_emulation =
 {
   gld960_before_parse,
   syslib_default,
@@ -187,7 +150,7 @@ struct ld_emulation_xfer_struct ld_gld960coff_emulation =
   gld960_get_script,
   "960coff",
   "",
-  NULL,	/* finish */
+  finish_default,
   NULL,	/* create output section statements */
   NULL,	/* open dynamic archive */
   NULL,	/* place orphan */