From 3b509e336185d75d64ddba6e3866f1cfbc986111 Mon Sep 17 00:00:00 2001 From: Uros Bizjak Date: Mon, 10 Mar 2008 14:33:07 +0100 Subject: [PATCH] * ChangeLog: Remove merge marker. From-SVN: r133077 --- gcc/ChangeLog | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 6e5619f9d9b..052d6169dc5 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -21,7 +21,7 @@ 2008-03-09 Uros Bizjak PR target/35496 - * config/i386/i386.c (ix86_constant_algnment): Compute alignment using + * config/i386/i386.c (ix86_constant_alignment): Compute alignment using ALIGN_MODE_128 for VECTOR_CST and INTEGER_CST in addition to REAL_CST. 2008-03-09 Ira Rosen @@ -416,7 +416,6 @@ transformations for modes that have signed zeros. * ifcvt.c (noce_try_abs): Ditto. ->>>>>>> .r132956 2008-03-04 Joseph Myers * config/i386/i386.c (override_options): Force @@ -1772,8 +1771,7 @@ (OPTION_MASK_ISA_SSE5_UNSET): Likewise. (OPTION_MASK_ISA_SSE4): Removed. (ix86_handle_option): Turn on bits in ix86_isa_flags and - ix86_isa_flags_explicit with OPTION_MASK_ISA_XXX_SET for - -mXXX. + ix86_isa_flags_explicit with OPTION_MASK_ISA_XXX_SET for -mXXX. (override_options): Don't turn on implied SSE/MMX bits in ix86_isa_flags. -- 2.30.2