Mercurial > hg > CbC > CbC_gcc

diff gcc/c-family/c-common.c @ 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 a3a2f64cf8f4
children bdf41c9fa0b7
line wrap: on
line diff
--- a/gcc/c-family/c-common.c	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/c-family/c-common.c	Fri Nov 10 19:46:38 2017 +0900
@@ -367,11 +367,21 @@
   { "__asm__",		RID_ASM,	0 },
   { "__attribute",	RID_ATTRIBUTE,	0 },
   { "__attribute__",	RID_ATTRIBUTE,	0 },
+<<<<<<< local
   { "__auto_type",	RID_AUTO_TYPE,	D_CONLY },
   { "__bases",          RID_BASES, D_CXXONLY },
   { "__builtin_addressof", RID_ADDRESSOF, D_CXXONLY },
   { "__builtin_call_with_static_chain",
     RID_BUILTIN_CALL_WITH_STATIC_CHAIN, D_CONLY },
+=======
+#ifndef noCbC
+  /* CbC project */
+  { "__code",         RID_CbC_CODE,   0 },
+  //  { "code",         RID_CbC_CODE,   0 },
+  { "__rectype",       RID_CbC_REC,    0},
+  { "selftype",       RID_CbC_SELFTYPE,    0},
+#endif
+>>>>>>> other
   { "__builtin_choose_expr", RID_CHOOSE_EXPR, D_CONLY },
   { "__builtin_complex", RID_BUILTIN_COMPLEX, D_CONLY },
   { "__builtin_launder", RID_BUILTIN_LAUNDER, D_CXXONLY },
@@ -383,6 +393,11 @@
   { "__complex__",	RID_COMPLEX,	0 },
   { "__const",		RID_CONST,	0 },
   { "__const__",	RID_CONST,	0 },
+#ifndef noCbC
+  /* CbC project */
+  { "_CbC_environment",  RID_CbC_ENV,    0 },
+  { "_CbC_return",       RID_CbC_RET,    0 },
+#endif
   { "__decltype",       RID_DECLTYPE,   D_CXXONLY },
   { "__direct_bases",   RID_DIRECT_BASES, D_CXXONLY },
   { "__extension__",	RID_EXTENSION,	0 },