On Thu, Dec 05, 2013 at 11:51:12AM +0400, Konstantin Serebryany wrote: > Committed upstream: > http://llvm.org/viewvc/llvm-project?view=revision&revision=196480
LGTM, can we commit it after the merge you have already prepared, or do you want to do another merge for it? Alternatively, rather than defining separate CFI_INL* and CFI_* macros, you could just use the same names of macros and just provide different definitions based on #ifdef __ASSEMBLER__, in preprocessed assembly the ones without string literals, in C/C++ with them. Jakub