diff options
| author | Uros Bizjak <uros@gcc.gnu.org> | 2013-05-19 12:10:58 +0200 |
|---|---|---|
| committer | Uros Bizjak <uros@gcc.gnu.org> | 2013-05-19 12:10:58 +0200 |
| commit | e242068731a13571c1a0099c06a0b7820f34c0c4 (patch) | |
| tree | 3ff5b3a78a58d0fc71f55a35c0e5160061eb8715 | |
| parent | 13719e8b7abb07bfd1e78d9bf456aa6cb70b47bc (diff) | |
| download | gcc-e242068731a13571c1a0099c06a0b7820f34c0c4.zip gcc-e242068731a13571c1a0099c06a0b7820f34c0c4.tar.gz gcc-e242068731a13571c1a0099c06a0b7820f34c0c4.tar.bz2 | |
* ChangeLog: Remove merge marker.
From-SVN: r199079
| -rw-r--r-- | gcc/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index af73839..adfb5b2 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -41,7 +41,8 @@ * lto-symtab.c (lto_symtab_merge_cgraph_nodes): Resolve cross module weakrefs. * cgraph.c (dump_cgraph_node): Do not ice on unresolved alias. - * cgraphunit.c (handle_alias_pairs): Store target of unresolved weakrefs. + * cgraphunit.c (handle_alias_pairs): Store target of unresolved + weakrefs. (output_weakrefs): Update. 2013-05-17 Po-Chun Chang <pchang9@cs.wisc.edu> @@ -194,7 +195,6 @@ * Makefile.in (tree-switch-conversion.o): Depend on $(OPTABS_H). ->>>>>>> .r199043 2013-05-16 Uros Bizjak <ubizjak@gmail.com> * config/i386/driver-i386.c (host_detect_local_cpu): Determine |