maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Add LangOptions marker for assembler-with-cpp mode and use to define 

__ASSEMBLER__ properly. Patch from Roman Divacky (with minor
formatting changes). Thanks!

llvm-svn: 60362
This commit is contained in:
Daniel Dunbar 2008-12-01 18:55:22 +00:00
parent c12ce19595
commit 1f3d7849a8
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
clang/Driver/clang.cpp
View File

@ -353,6 +353,7 @@ static bool InitializeLangOptions(LangOptions &Options, LangKind LK){
PCH = true;
break;
case langkind_asm_cpp:
Options.AsmPreprocessor = 1;
// FALLTHROUGH
case langkind_c_cpp:
NoPreprocess = true;

6
clang/include/clang/Basic/LangOptions.h
View File

@ -25,6 +25,7 @@ struct LangOptions {
unsigned Trigraphs : 1; // Trigraphs in source files.
unsigned BCPLComment : 1; // BCPL-style '//' comments.
unsigned DollarIdents : 1; // '$' allowed in identifiers.
unsigned AsmPreprocessor : 1; // Preprocessor in asm mode.
unsigned ImplicitInt : 1; // C89 implicit 'int'.
unsigned Digraphs : 1; // C94, C99 and C++
unsigned HexFloats : 1; // C99 Hexadecimal float constants.
@ -47,7 +48,7 @@ struct LangOptions {
unsigned NeXTRuntime : 1; // Use NeXT runtime.
unsigned ThreadsafeStatics : 1; // Whether static initializers are protected
// by lockis.
// by locks.
unsigned Blocks : 1; // block extension to C
private:
unsigned GC : 2; // Objective-C Garbage Collection modes. We declare
@ -58,7 +59,8 @@ public:
enum GCMode { NonGC, GCOnly, HybridGC };
LangOptions() {
Trigraphs = BCPLComment = DollarIdents = ImplicitInt = Digraphs = 0;
Trigraphs = BCPLComment = DollarIdents = AsmPreprocessor = 0;
ImplicitInt = Digraphs = 0;
HexFloats = 0;
GC = ObjC1 = ObjC2 = 0;
C99 = Microsoft = CPlusPlus = CPlusPlus0x = NoExtensions = 0;

3
clang/lib/Lex/Preprocessor.cpp
View File

@ -431,7 +431,8 @@ static void InitializePredefinedMacros(Preprocessor &PP,
// These should all be defined in the preprocessor according to the
// current language configuration.
DefineBuiltinMacro(Buf, "__STDC__=1");
//DefineBuiltinMacro(Buf, "__ASSEMBLER__=1");
if (PP.getLangOptions().AsmPreprocessor)
DefineBuiltinMacro(Buf, "__ASSEMBLER__=1");
if (PP.getLangOptions().C99 && !PP.getLangOptions().CPlusPlus)
DefineBuiltinMacro(Buf, "__STDC_VERSION__=199901L");
else if (0) // STDC94 ?