r158082 - in /branches/spu-4_5-branch/gcc: Chan...

[uweigand@gcc.gnu.org]

Author: uweigand
Date: Wed Apr  7 18:54:20 2010
New Revision: 158082

URL: http://gcc.gnu.org/viewcvs?root=gcc&view=rev&rev=158082
Log:
	* dwarf2out.c (dwarf2out_finish): Fix merge errors.
	(gen_subprogram_die): Likewise.
	(add_high_low_attributes): Likewise.
	(convert_cfa_to_fb_loc_list_multiple_sect): Likewise.

Modified:
    branches/spu-4_5-branch/gcc/ChangeLog.spu-4_5
    branches/spu-4_5-branch/gcc/dwarf2out.c