aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorRichard Kenner <kenner@gcc.gnu.org>2001-02-18 19:10:27 -0500
committerRichard Kenner <kenner@gcc.gnu.org>2001-02-18 19:10:27 -0500
commit63aa1491fcaa66169d6f66490a514b95017c07f3 (patch)
treece65ddc4aaf8734544fac4fc6327ce2500b8b6d5 /gcc
parent48aba75b6b84511c3ffb0a38029b69ed9286917b (diff)
downloadgcc-63aa1491fcaa66169d6f66490a514b95017c07f3.zip
gcc-63aa1491fcaa66169d6f66490a514b95017c07f3.tar.gz
gcc-63aa1491fcaa66169d6f66490a514b95017c07f3.tar.bz2
Remove conflict indicator
From-SVN: r39862
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 52042ac..208a73d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -19,7 +19,6 @@ Sun Feb 18 17:05:50 2001 Jeffrey A Law (law@cygnus.com)
(rtx_varies_p, rtx_addr_can_trap_p): Similarly.
Sun Feb 18 15:45:17 2001 Richard Kenner <kenner@vlsi1.ultra.nyu.edu>
->>>>>>> 1.9328
* sibcall.c (optimize_sibling_and_tail_recursive_call): Compare
against last real insn in basic block.