X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=ld%2Femultempl%2Fgld960.em;h=83819c127fdd3b582a0dc6eaa6f947190305dfcf;hb=aef6203bd6d412d65f539a41f1abd07b14d7a05d;hp=b390d83ae13eef8d0dcf489ea94ff337d3584cfa;hpb=b34976b65aea8f33690229600bbf4527ec3118e1;p=deliverable%2Fbinutils-gdb.git

diff --git a/ld/emultempl/gld960.em b/ld/emultempl/gld960.em
index b390d83ae1..83819c127f 100644
--- a/ld/emultempl/gld960.em
+++ b/ld/emultempl/gld960.em
@@ -1,7 +1,7 @@
 # This shell script emits a C file. -*- C -*-
 # It does some substitutions.
 cat >e${EMULATION_NAME}.c <<EOF
-/* Copyright 1991, 1992, 1994, 1999, 2000, 2001, 2002
+/* Copyright 1991, 1992, 1994, 1999, 2000, 2001, 2002, 2003, 2005
    Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
@@ -20,7 +20,7 @@ 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.  */
 
-/* 
+/*
  * emulate the Intels port of  gld
  */
 
@@ -39,35 +39,7 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307
 #include "ldfile.h"
 #include "ldemul.h"
 
-static void gld960_before_parse PARAMS ((void));
-static char *gld960_choose_target PARAMS ((int, char **));
-static void gld960_set_output_arch PARAMS ((void));
-static char *gld960_get_script PARAMS ((int *));
-
-#ifdef GNU960
-
-static void
-gld960_before_parse()
-{
-  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/libbout",
-				       (const char *) NULL),
-			       FALSE);
-    }
-  }
-  ldfile_output_architecture = bfd_arch_i960;
-}
-
-#else	/* not GNU960 */
-
-static void gld960_before_parse()
+static void gld960_before_parse (void)
 {
   char *env ;
   env =  getenv("G960LIB");
@@ -80,27 +52,15 @@ static void gld960_before_parse()
   ldfile_output_architecture = bfd_arch_i960;
 }
 
-#endif	/* GNU960 */
-
-
 static void
-gld960_set_output_arch()
+gld960_set_output_arch (void)
 {
   bfd_set_arch_mach(output_bfd, ldfile_output_architecture, bfd_mach_i960_core);
 }
 
 static char *
-gld960_choose_target (argc, argv)
-     int argc ATTRIBUTE_UNUSED;
-     char **argv ATTRIBUTE_UNUSED;
+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";
 
@@ -108,13 +68,10 @@ gld960_choose_target (argc, argv)
     return from_outside;
 
   return "b.out.little";
-
-#endif
 }
 
 static char *
-gld960_get_script(isfile)
-     int *isfile;
+gld960_get_script (int *isfile)
 EOF
 
 if test -n "$COMPILE_IN"
@@ -125,14 +82,14 @@ then
 sc="-f stringify.sed"
 
 cat >>e${EMULATION_NAME}.c <<EOF
-{			     
+{
   *isfile = 0;
 
-  if (link_info.relocateable && config.build_constructors)
+  if (link_info.relocatable && config.build_constructors)
     return
 EOF
 sed $sc ldscripts/${EMULATION_NAME}.xu                 >> e${EMULATION_NAME}.c
-echo '  ; else if (link_info.relocateable) return'     >> e${EMULATION_NAME}.c
+echo '  ; else if (link_info.relocatable) return'     >> e${EMULATION_NAME}.c
 sed $sc ldscripts/${EMULATION_NAME}.xr                 >> e${EMULATION_NAME}.c
 echo '  ; else if (!config.text_read_only) return'     >> e${EMULATION_NAME}.c
 sed $sc ldscripts/${EMULATION_NAME}.xbn                >> e${EMULATION_NAME}.c
@@ -146,12 +103,12 @@ else
 # Scripts read from the filesystem.
 
 cat >>e${EMULATION_NAME}.c <<EOF
-{			     
+{
   *isfile = 1;
 
-  if (link_info.relocateable && config.build_constructors)
+  if (link_info.relocatable && config.build_constructors)
     return "ldscripts/${EMULATION_NAME}.xu";
-  else if (link_info.relocateable)
+  else if (link_info.relocatable)
     return "ldscripts/${EMULATION_NAME}.xr";
   else if (!config.text_read_only)
     return "ldscripts/${EMULATION_NAME}.xbn";
@@ -166,7 +123,7 @@ fi
 
 cat >>e${EMULATION_NAME}.c <<EOF
 
-struct ld_emulation_xfer_struct ld_gld960_emulation = 
+struct ld_emulation_xfer_struct ld_gld960_emulation =
 {
   gld960_before_parse,
   syslib_default,
@@ -186,6 +143,8 @@ struct ld_emulation_xfer_struct ld_gld960_emulation =
   NULL,	/* place orphan */
   NULL,	/* set symbols */
   NULL,	/* parse args */
+  NULL,	/* add_options */
+  NULL,	/* handle_option */
   NULL,	/* unrecognized file */
   NULL,	/* list options */
   NULL,	/* recognized file */