Mercurial > hg > CbC > CbC_gcc

diff gcc/cfgexpand.c @ 117:f81c5aa9f14f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author mir3636
date Tue, 28 Nov 2017 21:17:15 +0900
parents ab0bcb71f44d
children d34655255c78
line wrap: on
line diff
--- a/gcc/cfgexpand.c	Tue Nov 28 20:22:01 2017 +0900
+++ b/gcc/cfgexpand.c	Tue Nov 28 21:17:15 2017 +0900
@@ -64,19 +64,12 @@
 #include "params.h"
 #include "tree-inline.h"
 #include "value-prof.h"
-<<<<<<< local
 #include "tree-ssa-live.h"
 #include "tree-outof-ssa.h"
 #include "cfgloop.h"
-=======
-#include "target.h"
 #ifndef noCbC
-#include "cbc-tree.h"
+#include "c/cbc-tree.h"
 #endif
-#include "ssaexpand.h"
-#include "bitmap.h"
-#include "sbitmap.h"
->>>>>>> other
 #include "insn-attr.h" /* For INSN_SCHEDULING.  */
 #include "stringpool.h"
 #include "attribs.h"