From 5e2f15758b3831ad6fa9f8eee34dbefb689a8d68 Mon Sep 17 00:00:00 2001
From: Alan Modra <amodra@gmail.com>
Date: Sat, 3 Jan 2004 11:09:07 +0000
Subject: 	* ldfile.c (ldfile_set_output_arch): Add defarch param. 
 * ldfile.h (ldfile_set_output_arch): Ditto. 	* emultempl/aix.em
 (gld${EMULATION_NAME}_before_parse): Use 	ldfile_set_output_arch. 
 * emultempl/beos.em (gld${EMULATION_NAME}_before_parse): Ditto. 	*
 emultempl/elf32.em (gld${EMULATION_NAME}_before_parse): Ditto. 	*
 emultempl/linux.em (gld${EMULATION_NAME}_before_parse): Ditto. 	*
 emultempl/mipsecoff.em (gld${EMULATION_NAME}_before_parse): Ditto. 	*
 emultempl/pe.em (gld${EMULATION_NAME}_before_parse): Ditto. 	*
 emultempl/sunos.em (gld${EMULATION_NAME}_before_parse): Ditto. 	*
 ldgram.y: Adjust ldfile_set_output_arch call. 	* emultempl/armcoff.em
 (gld${EMULATION_NAME}_before_parse): Ditto. 	* emultempl/armelf.em
 (gld${EMULATION_NAME}_before_parse): Ditto. 	* emultempl/armelf_oabi.em
 (gld${EMULATION_NAME}_before_parse): Ditto. 	* emultempl/generic.em
 (gld${EMULATION_NAME}_before_parse): Ditto. 	* emultempl/gld960c.em
 (gld960_set_output_arch): Ditto. 	* emultempl/m68kcoff.em
 (gld${EMULATION_NAME}_before_parse): Ditto. 	* emultempl/ticoff.em
 (gld${EMULATION_NAME}_before_parse): Ditto.

---
 ld/emultempl/beos.em | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

(limited to 'ld/emultempl/beos.em')

diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
index e2f6099..0431baf 100644
--- a/ld/emultempl/beos.em
+++ b/ld/emultempl/beos.em
@@ -7,7 +7,7 @@ else
 fi
 cat >e${EMULATION_NAME}.c <<EOF
 /* This file is part of GLD, the Gnu Linker.
-   Copyright 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003
+   Copyright 1995, 1996, 1997, 1998, 2000, 2001, 2002, 2003, 2004
    Free Software Foundation, Inc.
 
 This program is free software; you can redistribute it and/or modify
@@ -59,15 +59,7 @@ extern const char *output_filename;
 static void
 gld_${EMULATION_NAME}_before_parse (void)
 {
-  const bfd_arch_info_type *arch = bfd_scan_arch ("${OUTPUT_ARCH}");
-  if (arch)
-    {
-      ldfile_output_architecture = arch->arch;
-      ldfile_output_machine = arch->mach;
-      ldfile_output_machine_name = arch->printable_name;
-    }
-  else
-    ldfile_output_architecture = bfd_arch_${ARCH};
+  ldfile_set_output_arch ("${OUTPUT_ARCH}", bfd_arch_`echo ${ARCH} | sed -e 's/:.*//'`);
   output_filename = "a.exe";
 }
 
-- 
cgit v1.1