diff options
| author | Andrew Pinski <pinskia@gcc.gnu.org> | 2008-09-24 15:49:54 -0700 |
|---|---|---|
| committer | Andrew Pinski <pinskia@gcc.gnu.org> | 2008-09-24 15:49:54 -0700 |
| commit | 70d1a75009d4a04bc076d466f18a9d5c10ec0f0b (patch) | |
| tree | d02538e3f284021ea41b9907ab42008b6f5de76d /gcc | |
| parent | 0c327f097de176f17ed9356c8b4aa5cbccef8312 (diff) | |
| download | gcc-70d1a75009d4a04bc076d466f18a9d5c10ec0f0b.zip gcc-70d1a75009d4a04bc076d466f18a9d5c10ec0f0b.tar.gz gcc-70d1a75009d4a04bc076d466f18a9d5c10ec0f0b.tar.bz2 | |
Remove conflict mark.
From-SVN: r140651
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2faf9bd..2e2db7b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -148,14 +148,13 @@ 2008-09-23 Kai Tietz <kai.tietz@onevision.com> - *config/i386/i386.c (ix86_function_ok_for_sibcall): Correct + * config/i386/i386.c (ix86_function_ok_for_sibcall): Correct check for sibcall support for w64. 2008-09-23 Eric Botcazou <ebotcazou@adacore.com> * c-ppoutput.c (cb_used_define): Do nothing for a builtin node. ->>>>>>> .r140641 2008-09-23 Aldy Hernandez <aldyh@redhat.com> * c-tree.h: Add argument to c_objc_common_truthvalue_conversion, |