Commit e2420687 by Uros Bizjak

* ChangeLog: Remove merge marker.

From-SVN: r199079
parent 13719e8b
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment