2001-05-25 H.J. Lu <hjl@gnu.org>

* emultempl/beos.em (gld${EMULATION_NAME}_before_parse): Move
	setting of output_filename after bfd_scan_arch.
	* emultempl/pe.em: Likewise.

ld/ChangeLog

@@ -1,3 +1,9 @@
+2001-05-25  H.J. Lu  <hjl@gnu.org>
+
+	* emultempl/beos.em (gld${EMULATION_NAME}_before_parse): Move
+	setting of output_filename after bfd_scan_arch.
+	* emultempl/pe.em: Likewise.
+
 2001-05-25  H.J. Lu  <hjl@gnu.org>
 
 	* emulparams/aixrs6.sh: Add SYSCALL_MASK and SYMBOL_MODE_MASK

ld/emultempl/beos.em

@@ -76,7 +76,6 @@ extern const char *output_filename;
 static void
 gld_${EMULATION_NAME}_before_parse()
 {
-  output_filename = "a.exe";
   const bfd_arch_info_type *arch = bfd_scan_arch ("${OUTPUT_ARCH}");
   if (arch)
     {
@@ -86,6 +85,7 @@ gld_${EMULATION_NAME}_before_parse()
     }
   else
     ldfile_output_architecture = bfd_arch_${ARCH};
+  output_filename = "a.exe";
 }
 
 /* PE format extra command line options.  */

ld/emultempl/pe.em

@@ -135,7 +135,6 @@ extern const char *output_filename;
 static void
 gld_${EMULATION_NAME}_before_parse()
 {
-  output_filename = "${EXECUTABLE_NAME:-a.exe}";
   const bfd_arch_info_type *arch = bfd_scan_arch ("${OUTPUT_ARCH}");
   if (arch)
     {
@@ -145,6 +144,7 @@ gld_${EMULATION_NAME}_before_parse()
     }
   else
     ldfile_output_architecture = bfd_arch_${ARCH};
+  output_filename = "${EXECUTABLE_NAME:-a.exe}";
 #ifdef DLL_SUPPORT
   config.has_shared = 1;