* emultempl/lnk960.em (append), emultempl/hppaosf.em
(hppaosf_finish): Call xmalloc, not ldmalloc. * ldmain.c (preserve_output): Function removed. (main): Do it here instead.
This commit is contained in:
parent
e3960b9610
commit
52a8ebfe04
|
@ -1,3 +1,10 @@
|
|||
Sat Feb 5 03:54:34 1994 David J. Mackenzie (djm@thepub.cygnus.com)
|
||||
|
||||
* emultempl/lnk960.em (append), emultempl/hppaosf.em
|
||||
(hppaosf_finish): Call xmalloc, not ldmalloc.
|
||||
* ldmain.c (preserve_output): Function removed.
|
||||
(main): Do it here instead.
|
||||
|
||||
Fri Feb 4 23:02:19 1994 Jeffrey A. Law (law@snake.cs.utah.edu)
|
||||
|
||||
* ldlang.h (LANG_FOR_EACH_{INPUT,OUTPUT}_SECTION): Delete (unused)
|
||||
|
|
|
@ -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,
|
||||
|
|
13
ld/ldmain.c
13
ld/ldmain.c
|
@ -144,15 +144,6 @@ remove_output ()
|
|||
}
|
||||
}
|
||||
|
||||
/* Prevent remove_output from doing anything.
|
||||
Called after a successful link. */
|
||||
|
||||
static void
|
||||
preserve_output ()
|
||||
{
|
||||
output_filename = NULL;
|
||||
}
|
||||
|
||||
int
|
||||
main (argc, argv)
|
||||
int argc;
|
||||
|
@ -323,7 +314,9 @@ main (argc, argv)
|
|||
(long) (lim - (char *) &environ));
|
||||
}
|
||||
|
||||
atexit (preserve_output);
|
||||
/* Prevent remove_output from doing anything, after a successful link. */
|
||||
output_filename = NULL;
|
||||
|
||||
xexit (0);
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue