Mercurial > hg > CbC > CbC_gcc

comparison 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
comparison
equal deleted inserted replaced
111:04ced10e8804 112:ab0bcb71f44d
365 { "__alignof__", RID_ALIGNOF, 0 }, 365 { "__alignof__", RID_ALIGNOF, 0 },
366 { "__asm", RID_ASM, 0 }, 366 { "__asm", RID_ASM, 0 },
367 { "__asm__", RID_ASM, 0 }, 367 { "__asm__", RID_ASM, 0 },
368 { "__attribute", RID_ATTRIBUTE, 0 }, 368 { "__attribute", RID_ATTRIBUTE, 0 },
369 { "__attribute__", RID_ATTRIBUTE, 0 }, 369 { "__attribute__", RID_ATTRIBUTE, 0 },
370 <<<<<<< local
370 { "__auto_type", RID_AUTO_TYPE, D_CONLY }, 371 { "__auto_type", RID_AUTO_TYPE, D_CONLY },
371 { "__bases", RID_BASES, D_CXXONLY }, 372 { "__bases", RID_BASES, D_CXXONLY },
372 { "__builtin_addressof", RID_ADDRESSOF, D_CXXONLY }, 373 { "__builtin_addressof", RID_ADDRESSOF, D_CXXONLY },
373 { "__builtin_call_with_static_chain", 374 { "__builtin_call_with_static_chain",
374 RID_BUILTIN_CALL_WITH_STATIC_CHAIN, D_CONLY }, 375 RID_BUILTIN_CALL_WITH_STATIC_CHAIN, D_CONLY },
376 =======
377 #ifndef noCbC
378 /* CbC project */
379 { "__code", RID_CbC_CODE, 0 },
380 // { "code", RID_CbC_CODE, 0 },
381 { "__rectype", RID_CbC_REC, 0},
382 { "selftype", RID_CbC_SELFTYPE, 0},
383 #endif
384 >>>>>>> other
375 { "__builtin_choose_expr", RID_CHOOSE_EXPR, D_CONLY }, 385 { "__builtin_choose_expr", RID_CHOOSE_EXPR, D_CONLY },
376 { "__builtin_complex", RID_BUILTIN_COMPLEX, D_CONLY }, 386 { "__builtin_complex", RID_BUILTIN_COMPLEX, D_CONLY },
377 { "__builtin_launder", RID_BUILTIN_LAUNDER, D_CXXONLY }, 387 { "__builtin_launder", RID_BUILTIN_LAUNDER, D_CXXONLY },
378 { "__builtin_shuffle", RID_BUILTIN_SHUFFLE, 0 }, 388 { "__builtin_shuffle", RID_BUILTIN_SHUFFLE, 0 },
379 { "__builtin_offsetof", RID_OFFSETOF, 0 }, 389 { "__builtin_offsetof", RID_OFFSETOF, 0 },
381 { "__builtin_va_arg", RID_VA_ARG, 0 }, 391 { "__builtin_va_arg", RID_VA_ARG, 0 },
382 { "__complex", RID_COMPLEX, 0 }, 392 { "__complex", RID_COMPLEX, 0 },
383 { "__complex__", RID_COMPLEX, 0 }, 393 { "__complex__", RID_COMPLEX, 0 },
384 { "__const", RID_CONST, 0 }, 394 { "__const", RID_CONST, 0 },
385 { "__const__", RID_CONST, 0 }, 395 { "__const__", RID_CONST, 0 },
396 #ifndef noCbC
397 /* CbC project */
398 { "_CbC_environment", RID_CbC_ENV, 0 },
399 { "_CbC_return", RID_CbC_RET, 0 },
400 #endif
386 { "__decltype", RID_DECLTYPE, D_CXXONLY }, 401 { "__decltype", RID_DECLTYPE, D_CXXONLY },
387 { "__direct_bases", RID_DIRECT_BASES, D_CXXONLY }, 402 { "__direct_bases", RID_DIRECT_BASES, D_CXXONLY },
388 { "__extension__", RID_EXTENSION, 0 }, 403 { "__extension__", RID_EXTENSION, 0 },
389 { "__func__", RID_C99_FUNCTION_NAME, 0 }, 404 { "__func__", RID_C99_FUNCTION_NAME, 0 },
390 { "__has_nothrow_assign", RID_HAS_NOTHROW_ASSIGN, D_CXXONLY }, 405 { "__has_nothrow_assign", RID_HAS_NOTHROW_ASSIGN, D_CXXONLY },