From: William Cohen <wcohen@gcc.gnu.org>
Date: Fri, 15 Sep 2000 17:43:25 +0000 (+0000)
Subject: Described changes to dwarf2out.c.
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5eca72d98021cb04fae2e5b02b3ad84e09ce046b;p=platform%2Fupstream%2Fgcc.git

Described changes to dwarf2out.c.

From-SVN: r36441
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index df77257..3a628e4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -86,7 +86,6 @@ Fri 15-Sep-2000 06:49:07 BST  Neil Booth  <NeilB@earthling.net>
 	Remove undefine before config/elfos.h.
 	* config/sh/t-sh (EXTRA_MULTILIB_PARTS): Comment out.
 
->>>>>>> 1.7757
 2000-09-14  Kazu Hirata  <kazu@hxi.com>
 
 	* invoke.texi (H8/300 Options): Add -ms2600.
@@ -185,7 +184,6 @@ Tue Sep 12 13:51:13 2000  Denis Chertykov  <denisc@overta.ru>
 	(extendhisi2): Use `movw' for enhanced avr cores.
 	(zero_extendhisi2): Likewise.
 
->>>>>>> 1.7742
 Wed Sep 13 02:31:23 EDT 2000  John Wehle  (john@feith.com)
 
 	* alias.c (find_base_term): Use frame_pointer_rtx