From: David MacKenzie <djm@cygnus>
Date: Sun, 6 Feb 1994 01:05:54 +0000 (+0000)
Subject: remove cvs lossage
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=744b2885b4b90bc3abee5fc94ca676b853507659;p=binutils-gdb.git

remove cvs lossage
---

diff --git a/ld/emultempl/hppaosf.em b/ld/emultempl/hppaosf.em
index 24b30e6082b..cb01a321e44 100644
--- a/ld/emultempl/hppaosf.em
+++ b/ld/emultempl/hppaosf.em
@@ -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];