Mercurial > hg > CbC > CbC_gcc

comparison 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
comparison
equal deleted inserted replaced
116:367f9f4f266e 117:f81c5aa9f14f
62 #include "toplev.h" 62 #include "toplev.h"
63 #include "debug.h" 63 #include "debug.h"
64 #include "params.h" 64 #include "params.h"
65 #include "tree-inline.h" 65 #include "tree-inline.h"
66 #include "value-prof.h" 66 #include "value-prof.h"
67 <<<<<<< local
68 #include "tree-ssa-live.h" 67 #include "tree-ssa-live.h"
69 #include "tree-outof-ssa.h" 68 #include "tree-outof-ssa.h"
70 #include "cfgloop.h" 69 #include "cfgloop.h"
71 =======
72 #include "target.h"
73 #ifndef noCbC 70 #ifndef noCbC
74 #include "cbc-tree.h" 71 #include "c/cbc-tree.h"
75 #endif 72 #endif
76 #include "ssaexpand.h"
77 #include "bitmap.h"
78 #include "sbitmap.h"
79 >>>>>>> other
80 #include "insn-attr.h" /* For INSN_SCHEDULING. */ 73 #include "insn-attr.h" /* For INSN_SCHEDULING. */
81 #include "stringpool.h" 74 #include "stringpool.h"
82 #include "attribs.h" 75 #include "attribs.h"
83 #include "asan.h" 76 #include "asan.h"
84 #include "tree-ssa-address.h" 77 #include "tree-ssa-address.h"