Apply patch from Mumit Khan to fix bugs generating dll names.

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

diff --git a/ld/emultempl/gld960.em b/ld/emultempl/gld960.em
index 69555e2ada9bb107e2920294f36df76609c667e3..63b4af09738b6be1e5e5a272e18b2ec3d56ae5d3 100644 (file)
--- a/ld/emultempl/gld960.em
+++ b/ld/emultempl/gld960.em
@@ -1,7 +1,7 @@
 # This shell script emits a C file. -*- C -*-
 # It does some substitutions.
-cat >em_${EMULATION_NAME}.c <<EOF
-/* Copyright (C) 1991 Free Software Foundation, Inc.
+cat >e${EMULATION_NAME}.c <<EOF
+/* Copyright (C) 1991, 93, 94, 95, 1999 Free Software Foundation, Inc.
 
 This file is part of GLD, the Gnu Linker.
 
@@ -17,7 +17,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GLD; see the file COPYING.  If not, write to
-the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
+the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 /* 
  * emulate the Intels port of  gld
@@ -26,27 +26,14 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #include "bfd.h"
 #include "sysdep.h"
-
+#include "libiberty.h"
+#include "bfdlink.h"
 
 #include "ld.h"
-#include "config.h"
 #include "ldemul.h"
 #include "ldfile.h"
 #include "ldmisc.h"
-
-
-/* IMPORTS */
-extern char *output_filename;
-extern  boolean lang_float_flag;
-
-
-extern enum bfd_architecture ldfile_output_architecture;
-extern unsigned long ldfile_output_machine;
-extern char *ldfile_output_machine_name;
-
-extern bfd *output_bfd;
-
-
+#include "ldmain.h"
 
 #ifdef GNU960
 
@@ -60,7 +47,10 @@ gld960_before_parse()
   for ( p = env_variables; *p; p++ ){
     env =  (char *) getenv(*p);
     if (env) {
-      ldfile_add_library_path(concat(env,"/lib/libbout",""));
+      ldfile_add_library_path (concat (env,
+                                      "/lib/libbout",
+                                      (const char *) NULL),
+                              false);
     }
   }
   ldfile_output_architecture = bfd_arch_i960;
@@ -73,12 +63,11 @@ static void gld960_before_parse()
   char *env ;
   env =  getenv("G960LIB");
   if (env) {
-    ldfile_add_library_path(env);
+    ldfile_add_library_path(env, false);
   }
   env = getenv("G960BASE");
-  if (env) {
-    ldfile_add_library_path(concat(env,"/lib",""));
-  }
+  if (env)
+    ldfile_add_library_path (concat (env, "/lib", (const char *) NULL), false);
   ldfile_output_architecture = bfd_arch_i960;
 }
 
@@ -117,48 +106,41 @@ gld960_get_script(isfile)
      int *isfile;
 EOF
 
-if test "$DEFAULT_EMULATION" = "$EMULATION_NAME"
+if test -n "$COMPILE_IN"
 then
 # Scripts compiled in.
 
 # sed commands to quote an ld script as a C string.
-sc='s/["\\]/\\&/g
-s/$/\\n\\/
-1s/^/"{/
-$s/$/n}"/
-'
+sc="-f stringify.sed"
 
-cat >>em_${EMULATION_NAME}.c <<EOF
+cat >>e${EMULATION_NAME}.c <<EOF
 {                           
-  extern ld_config_type config;
-
   *isfile = 0;
 
-  if (config.relocateable_output == true && config.build_constructors == true)
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.xu`;
-  else if (config.relocateable_output == true)
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.xr`;
-  else if (!config.text_read_only)
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.xbn`;
-  else if (!config.magic_demand_paged)
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.xn`;
-  else
-    return `sed "$sc" ldscripts/${EMULATION_NAME}.x`;
-}
+  if (link_info.relocateable == true && config.build_constructors == true)
+    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
 
 else
 # Scripts read from the filesystem.
 
-cat >>em_${EMULATION_NAME}.c <<EOF
+cat >>e${EMULATION_NAME}.c <<EOF
 {                           
-  extern ld_config_type config;
-
   *isfile = 1;
 
-  if (config.relocateable_output == true && config.build_constructors == true)
+  if (link_info.relocateable == true && config.build_constructors == true)
     return "ldscripts/${EMULATION_NAME}.xu";
-  else if (config.relocateable_output == true)
+  else if (link_info.relocateable == true)
     return "ldscripts/${EMULATION_NAME}.xr";
   else if (!config.text_read_only)
     return "ldscripts/${EMULATION_NAME}.xbn";
@@ -171,7 +153,7 @@ EOF
 
 fi
 
-cat >>em_${EMULATION_NAME}.c <<EOF
+cat >>e${EMULATION_NAME}.c <<EOF
 
 struct ld_emulation_xfer_struct ld_gld960_emulation = 
 {
@@ -179,6 +161,7 @@ struct ld_emulation_xfer_struct ld_gld960_emulation =
   syslib_default,
   hll_default,
   after_parse_default,
+  after_open_default,
   after_allocation_default,
   gld960_set_output_arch,
   gld960_choose_target,