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.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index ab8d256..15c0d74 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,5 +1,11 @@
 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
        like emulparams/aixppc.sh.
 

diff --git a/ld/emultempl/beos.em b/ld/emultempl/beos.em
index 4ad033b..c2a63f1 100644 (file)
--- a/ld/emultempl/beos.em
+++ b/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";
 }
 \f
 /* PE format extra command line options.  */

diff --git a/ld/emultempl/pe.em b/ld/emultempl/pe.em
index f8dee33..69bea20 100644 (file)
--- a/ld/emultempl/pe.em
+++ b/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;