OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove cvs lossage

This commit is contained in:
David MacKenzie 1994-02-06 01:05:54 +00:00
parent 021b10e345
commit 744b2885b4
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ld/emultempl/hppaosf.em
View File

@ -106,11 +106,6 @@ 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)
@ -124,7 +119,6 @@ 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,
@ -140,7 +134,7 @@ hppaosf_finish()
old_asymbols = stub_file->asymbols;
stub_file->asymbols = ldmalloc((stub_file->symbol_count + new_sym_cnt) * sizeof(asymbol *));
stub_file->asymbols = xmalloc((stub_file->symbol_count + new_sym_cnt) * sizeof(asymbol *));
for ( j = 0; j < stub_file->symbol_count; j++ )
stub_file->asymbols[j] = old_asymbols[j];