From Peter Hoogenboom <hoogen@shafer.cs.utah.edu>:

* emultempl/hppaosf.em (ld_hppaosf_emulation): Correct name for PA
ELF emulation is "elf32-hppa" not "elf-big".
(hppaosf_before_parse): Remove unneeded processing of environment variables.
* scripttempl/hppaosf.sc: Include .hppa_linker_stubs sections in
.text segment of output file.
* emulparams/hppaosf.sh (OUTPUT_FORMAT): Use elf32-hppa.

diff --git a/ld/ChangeLog b/ld/ChangeLog
index 852cda036457b9bf2c3191f4802ded825c1c9e23..09e87dba14ca85e32defe899a4ac2f0146260d1f 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,3 +1,14 @@
+Tue Aug 24 18:49:40 1993  Ken Raeburn  (raeburn@cambridge.cygnus.com)
+
+       From Peter Hoogenboom <hoogen@shafer.cs.utah.edu>:
+       * emultempl/hppaosf.em (ld_hppaosf_emulation): Correct name for PA
+       ELF emulation is "elf32-hppa" not "elf-big".
+       (hppaosf_before_parse): Remove unneeded processing of environment
+       variables.
+       * scripttempl/hppaosf.sc: Include .hppa_linker_stubs sections in
+       .text segment of output file.
+       * emulparams/hppaosf.sh (OUTPUT_FORMAT): Use elf32-hppa.
+
 Tue Aug 24 16:17:00 1993  K. Richard Pixley  (rich@sendai.cygnus.com)
 
        * ld.h: define BYTE_SIZE, SHORT_SIZE, and LONG_SIZE which are no

diff --git a/ld/emulparams/hppaosf.sh b/ld/emulparams/hppaosf.sh
index c51582cda5bcc310d12f7dd3b95775903f838198..df41d5f14e3cee288c4fd7a37a79d735028256bb 100644 (file)
--- a/ld/emulparams/hppaosf.sh
+++ b/ld/emulparams/hppaosf.sh
@@ -1,5 +1,5 @@
 SCRIPT_NAME=hppaosf
-OUTPUT_FORMAT="elf-big"
+OUTPUT_FORMAT="elf32-hppa"
 TEXT_START_ADDR=0x1000
 PAGE_SIZE=4096
 ARCH=hppa

diff --git a/ld/emultempl/hppaosf.em b/ld/emultempl/hppaosf.em
index 91ddd364f64a40663726356b3bb5f4ce8be539aa..93ae02191dd610e59a8994dea8b50d4f1e314629 100644 (file)
--- a/ld/emultempl/hppaosf.em
+++ b/ld/emultempl/hppaosf.em
@@ -40,38 +40,10 @@ extern char *ldfile_output_machine_name;
 
 extern bfd *output_bfd;
 
-
-#ifdef HPPAOSF
-
-static void hppaosf_before_parse()
-{
-  static char *env_variables[] = { "HPPALIB", "HPPABASE", 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",""));
-    }
-  }
-  ldfile_output_architecture = bfd_arch_hppa;
-}
-#else
 static void hppaosf_before_parse()
 {
-  char *env ;
-  env =  getenv("HPPALIB");
-  if (env) {
-    ldfile_add_library_path(env);
-  }
-  env = getenv("HPPABASE");
-  if (env) {
-    ldfile_add_library_path(concat(env,"/lib",""));
-  }
   ldfile_output_architecture = bfd_arch_hppa;
 }
-#endif /* HPPAOSF */
 
 static void
 hppaosf_set_output_arch()
@@ -154,6 +126,6 @@ struct ld_emulation_xfer_struct ld_hppaosf_emulation =
   before_allocation_default,
   hppaosf_get_script,
   "hppaosf",
-  "elf-big"
+  "elf32-hppa"
 };
 EOF

diff --git a/ld/scripttempl/hppaosf.sc b/ld/scripttempl/hppaosf.sc
index 30e3c6e3a731e3a068ca62b86bbe577cafea2867..88a018b78bdc038c3075a332a80252635cbf9d01 100644 (file)
--- a/ld/scripttempl/hppaosf.sc
+++ b/ld/scripttempl/hppaosf.sc
@@ -9,6 +9,7 @@ SECTIONS
   {
     ${RELOCATING+__text_start = .};
     CREATE_OBJECT_SYMBOLS
+    *(.hppa_linker_stubs)
     *(.text)
   }
   .data  ${RELOCATING+ 0x40000000 } :