* ldfile.c: Remove GNU960 conditional code.

	* emultempl/gld960.em: Likewise.
	* emultempl/gld960c.em: Likewise.
	* emultempl/lnk960.em: Likewise.

5 files changed, 7 insertions, 163 deletions

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 434e876..89ace4a 100644
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,10 @@
+2005-02-24  Ben Elliston  <bje@au.ibm.com>
+
+	* ldfile.c: Remove GNU960 conditional code.
+	* emultempl/gld960.em: Likewise.
+	* emultempl/gld960c.em: Likewise.
+	* emultempl/lnk960.em: Likewise.
+
 2005-02-24  Nick Clifton  <nickc@redhat.com>
 
 	* emultempl/lnk960.em (lnk960_before_parse): Remove redundant
diff --git a/ld/emultempl/gld960.em b/ld/emultempl/gld960.em
index 9b93bac..10e60e7 100644
--- a/ld/emultempl/gld960.em
+++ b/ld/emultempl/gld960.em
@@ -39,29 +39,6 @@ the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307
 #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/libbout",
-				       (const char *) NULL),
-			       FALSE);
-    }
-  }
-  ldfile_output_architecture = bfd_arch_i960;
-}
-
-#else	/* not GNU960 */
-
 static void gld960_before_parse (void)
 {
   char *env ;
@@ -75,9 +52,6 @@ static void gld960_before_parse (void)
   ldfile_output_architecture = bfd_arch_i960;
 }
 
-#endif	/* GNU960 */
-
-
 static void
 gld960_set_output_arch (void)
 {
@@ -87,13 +61,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";
 
@@ -101,8 +68,6 @@ gld960_choose_target (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
     return from_outside;
 
   return "b.out.little";
-
-#endif
 }
 
 static char *
diff --git a/ld/emultempl/gld960c.em b/ld/emultempl/gld960c.em
index ef2293e..a24772c 100644
--- a/ld/emultempl/gld960c.em
+++ b/ld/emultempl/gld960c.em
@@ -41,29 +41,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 +55,6 @@ static void gld960_before_parse (void)
   ldfile_output_architecture = bfd_arch_i960;
 }
 
-#endif	/* GNU960 */
-
-
 static void
 gld960_set_output_arch (void)
 {
@@ -102,13 +76,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 +83,6 @@ gld960_choose_target (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
     return from_outside;
 
   return "coff-Intel-little";
-
-#endif
 }
 
 static char *
diff --git a/ld/emultempl/lnk960.em b/ld/emultempl/lnk960.em
index f3bc901..7d9176e 100644
--- a/ld/emultempl/lnk960.em
+++ b/ld/emultempl/lnk960.em
@@ -81,32 +81,6 @@ lnk960_syslib (char *name)
 }
 
 
-#ifdef GNU960
-
-static void
-lnk960_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", NULL), FALSE);
-    }
-
-  env = (char *) getenv ("I960BASE");
-  if (env)
-    ldfile_add_library_path (concat (env, "/lib", NULL), FALSE);
-
-  ldfile_output_architecture = bfd_arch_i960;
-  ldfile_output_machine = bfd_mach_i960_core;
-}
-
-#else	/* not GNU960 */
-
 static void
 lnk960_before_parse (void)
 {
@@ -124,9 +98,6 @@ lnk960_before_parse (void)
   ldfile_output_machine = bfd_mach_i960_core;
 }
 
-#endif	/* GNU960 */
-
-
 static void
 add_on (lib_list_type *list, lang_input_file_enum_type search)
 {
@@ -229,12 +200,6 @@ lnk960_set_output_arch (void)
 static char *
 lnk960_choose_target (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
 {
-#ifdef GNU960
-
-  return bfd_make_targ_name (BFD_COFF_FORMAT, 0);
-
-#else
-
   char *from_outside = getenv (TARGET_ENVIRON);
   if (from_outside != (char *) NULL)
     return from_outside;
@@ -243,8 +208,6 @@ lnk960_choose_target (int argc ATTRIBUTE_UNUSED, char **argv ATTRIBUTE_UNUSED)
 #else
   return "coff-Intel-big";
 #endif
-#endif
-
 }
 
 static char *
diff --git a/ld/ldfile.c b/ld/ldfile.c
index 25d53e0..a073e88 100644
--- a/ld/ldfile.c
+++ b/ld/ldfile.c
@@ -507,61 +507,6 @@ ldfile_open_command_file (const char *name)
   saved_script_handle = ldlex_input_stack;
 }
 
-#ifdef GNU960
-static char *
-gnu960_map_archname (char *name)
-{
-  struct tabentry { char *cmd_switch; char *arch; };
-  static struct tabentry arch_tab[] =
-  {
-	"",   "",
-	"KA", "ka",
-	"KB", "kb",
-	"KC", "mc",	/* Synonym for MC */
-	"MC", "mc",
-	"CA", "ca",
-	"SA", "ka",	/* Functionally equivalent to KA */
-	"SB", "kb",	/* Functionally equivalent to KB */
-	NULL, ""
-  };
-  struct tabentry *tp;
-
-  for (tp = arch_tab; tp->cmd_switch != NULL; tp++)
-    {
-      if (! strcmp (name,tp->cmd_switch))
-	break;
-    }
-
-  if (tp->cmd_switch == NULL)
-    einfo (_("%P%F: unknown architecture: %s\n"), name);
-
-  return tp->arch;
-}
-
-void
-ldfile_add_arch (char *name)
-{
-  search_arch_type *new = xmalloc (sizeof (search_arch_type));
-
-  if (*name != '\0')
-    {
-      if (ldfile_output_machine_name[0] != '\0')
-	{
-	  einfo (_("%P%F: target architecture respecified\n"));
-	  return;
-	}
-
-      ldfile_output_machine_name = name;
-    }
-
-  new->next = NULL;
-  new->name = gnu960_map_archname (name);
-  *search_arch_tail_ptr = new;
-  search_arch_tail_ptr = &new->next;
-}
-
-#else /* not GNU960 */
-
 void
 ldfile_add_arch (const char *in_name)
 {
@@ -581,7 +526,6 @@ ldfile_add_arch (const char *in_name)
   search_arch_tail_ptr = &new->next;
 
 }
-#endif
 
 /* Set the output architecture.  */