Correct spelling of "relocatable".

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

diff --git a/ld/emultempl/gld960.em b/ld/emultempl/gld960.em
index 62eddb1ec601d45aa038c02e882b2e2cc42dd68d..e9ef7e5b27c9365eb1268119309368fc93455b8c 100644 (file)
--- a/ld/emultempl/gld960.em
+++ b/ld/emultempl/gld960.em
@@ -1,7 +1,8 @@
 # This shell script emits a C file. -*- C -*-
 # It does some substitutions.
 cat >e${EMULATION_NAME}.c <<EOF
-/* Copyright (C) 1991, 93, 94, 95, 1999 Free Software Foundation, Inc.
+/* Copyright 1991, 1992, 1994, 1999, 2000, 2001, 2002, 2003
+   Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
 
@@ -30,11 +31,19 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307
 #include "bfdlink.h"
 
 #include "ld.h"
-#include "ldemul.h"
-#include "ldfile.h"
 #include "ldmisc.h"
 #include "ldmain.h"
 
+#include "ldexp.h"
+#include "ldlang.h"
+#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
@@ -50,7 +59,7 @@ gld960_before_parse()
       ldfile_add_library_path (concat (env,
                                       "/lib/libbout",
                                       (const char *) NULL),
-                              false);
+                              FALSE);
     }
   }
   ldfile_output_architecture = bfd_arch_i960;
@@ -63,11 +72,11 @@ static void gld960_before_parse()
   char *env ;
   env =  getenv("G960LIB");
   if (env) {
-    ldfile_add_library_path(env, false);
+    ldfile_add_library_path(env, FALSE);
   }
   env = getenv("G960BASE");
   if (env)
-    ldfile_add_library_path (concat (env, "/lib", (const char *) NULL), false);
+    ldfile_add_library_path (concat (env, "/lib", (const char *) NULL), FALSE);
   ldfile_output_architecture = bfd_arch_i960;
 }
 
@@ -81,7 +90,9 @@ gld960_set_output_arch()
 }
 
 static char *
-gld960_choose_target()
+gld960_choose_target (argc, argv)
+     int argc ATTRIBUTE_UNUSED;
+     char **argv ATTRIBUTE_UNUSED;
 {
 #ifdef GNU960
 
@@ -117,19 +128,19 @@ cat >>e${EMULATION_NAME}.c <<EOF
 {                           
   *isfile = 0;
 
-  if (link_info.relocateable == true && config.build_constructors == true)
+  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 == true) 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
-echo '  ; else if (!config.magic_demand_paged) return'     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.xn                     >> e${EMULATION_NAME}.c
-echo '  ; else return'                                     >> e${EMULATION_NAME}.c
-sed $sc ldscripts/${EMULATION_NAME}.x                      >> e${EMULATION_NAME}.c
-echo '; }'                                                 >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xu                 >> 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
+echo '  ; else if (!config.magic_demand_paged) return' >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.xn                 >> e${EMULATION_NAME}.c
+echo '  ; else return'                                 >> e${EMULATION_NAME}.c
+sed $sc ldscripts/${EMULATION_NAME}.x                  >> e${EMULATION_NAME}.c
+echo '; }'                                             >> e${EMULATION_NAME}.c
 
 else
 # Scripts read from the filesystem.
@@ -138,9 +149,9 @@ cat >>e${EMULATION_NAME}.c <<EOF
 {                           
   *isfile = 1;
 
-  if (link_info.relocateable == true && config.build_constructors == true)
+  if (link_info.relocatable && config.build_constructors)
     return "ldscripts/${EMULATION_NAME}.xu";
-  else if (link_info.relocateable == true)
+  else if (link_info.relocatable)
     return "ldscripts/${EMULATION_NAME}.xr";
   else if (!config.text_read_only)
     return "ldscripts/${EMULATION_NAME}.xbn";
@@ -175,8 +186,12 @@ 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 */
+  NULL,        /* recognized file */
+  NULL,        /* find_potential_libraries */
+  NULL /* new_vers_pattern */
 };
 EOF