diff options
| author | uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-19 10:10:58 +0000 |
|---|---|---|
| committer | uros <uros@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-05-19 10:10:58 +0000 |
| commit | ae837da3ce8bde4208f2b08df9e130cb0e46cae9 (patch) | |
| tree | 3ff5b3a78a58d0fc71f55a35c0e5160061eb8715 | |
| parent | 18ea5fe90aad97d60125fc5a028c0d552af79ed9 (diff) | |
| download | ppe42-gcc-ae837da3ce8bde4208f2b08df9e130cb0e46cae9.tar.gz ppe42-gcc-ae837da3ce8bde4208f2b08df9e130cb0e46cae9.zip | |
* ChangeLog: Remove merge marker.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@199079 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index af7383977a6..adfb5b29c4c 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 |
