diff options
| author | David MacKenzie <djm@cygnus> | 1994-02-05 12:00:15 +0000 |
|---|---|---|
| committer | David MacKenzie <djm@cygnus> | 1994-02-05 12:00:15 +0000 |
| commit | 52a8ebfe04a89a747b014ab2eaa96968bc346360 (patch) | |
| tree | 971aa46ee2d49a1e13a1baf73130ea3dd223dce2 /ld/emultempl | |
| parent | e3960b961029c8a5e0f46142a5734c78a5be8ff2 (diff) | |
| download | gdb-52a8ebfe04a89a747b014ab2eaa96968bc346360.zip gdb-52a8ebfe04a89a747b014ab2eaa96968bc346360.tar.gz gdb-52a8ebfe04a89a747b014ab2eaa96968bc346360.tar.bz2 | |
* emultempl/lnk960.em (append), emultempl/hppaosf.em
(hppaosf_finish): Call xmalloc, not ldmalloc.
* ldmain.c (preserve_output): Function removed.
(main): Do it here instead.
Diffstat (limited to 'ld/emultempl')
| -rw-r--r-- | ld/emultempl/hppaosf.em | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ld/emultempl/hppaosf.em b/ld/emultempl/hppaosf.em index fe98f4f..24b30e6 100644 --- a/ld/emultempl/hppaosf.em +++ b/ld/emultempl/hppaosf.em @@ -106,6 +106,11 @@ hppaosf_finish() extern lang_statement_list_type file_chain; lang_input_statement_type *statement; +<<<<<<< hppaosf.em + stub_file->asymbols = xmalloc((stub_file->symbol_count + new_sym_cnt) * sizeof(asymbol *)); +||||||| 1.7 + stub_file->asymbols = ldmalloc((stub_file->symbol_count + new_sym_cnt) * sizeof(asymbol *)); +======= for (statement = (lang_input_statement_type *)file_chain.head; statement != (lang_input_statement_type *)NULL; statement = (lang_input_statement_type *)statement->next) @@ -119,6 +124,7 @@ hppaosf_finish() int new_sym_cnt = 0; int i,j; asymbol *syms; +>>>>>>> 1.8 syms = hppa_look_for_stubs_in_section (stub_file->the_bfd, abfd, |