Mercurial > hg > CbC > CbC_gcc

diff gcc/tree.h @ 112:ab0bcb71f44d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge gcc 7
author mir3636
date Fri, 10 Nov 2017 19:46:38 +0900
parents 04ced10e8804 6381ea127240
children bdf41c9fa0b7
line wrap: on
line diff
--- a/gcc/tree.h	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/tree.h	Fri Nov 10 19:46:38 2017 +0900
@@ -4105,6 +4105,14 @@
 extern bool vec_member (const_tree, vec<tree, va_gc> *);
 extern tree chain_index (int, tree);
 
+<<<<<<< local
+=======
+#ifndef noCbC
+extern tree build_code_segment_type (tree, tree);
+#endif
+extern int attribute_list_equal (const_tree, const_tree);
+extern int attribute_list_contained (const_tree, const_tree);
+>>>>>>> other
 extern int tree_int_cst_equal (const_tree, const_tree);
 
 extern bool tree_fits_shwi_p (const_tree)