aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@gcc.gnu.org>2001-06-08 14:14:27 -0400
committerJason Merrill <jason@gcc.gnu.org>2001-06-08 14:14:27 -0400
commitacb5223fb5a7fb8cd6ea3cc12c6b25b6c6d5c920 (patch)
tree0dbe65292b5eb5f7297bde465e2cac1d0b6e331f
parent91088ddb810837c123b010796ec85bed37a5f78b (diff)
downloadgcc-acb5223fb5a7fb8cd6ea3cc12c6b25b6c6d5c920.zip
gcc-acb5223fb5a7fb8cd6ea3cc12c6b25b6c6d5c920.tar.gz
gcc-acb5223fb5a7fb8cd6ea3cc12c6b25b6c6d5c920.tar.bz2
conflict
From-SVN: r43038
-rw-r--r--gcc/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 984633d..eca3773 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -176,7 +176,6 @@ Thu Jun 7 12:12:58 CEST 2001 Jan Hubicka <jh@suse.cz>
* emit-rtl.c (operand_subword): Remove unused variable.
->>>>>>> 1.10284
Wed Jun 6 14:51:05 CEST 2001 Jan Hubicka <jh@suse.cz>
* i386.md (floatdi?f): Avoid usinf of SSE instructions