diff options
| author | Derek Schuff <dschuff@chromium.org> | 2012-10-25 11:26:14 -0700 |
|---|---|---|
| committer | Derek Schuff <dschuff@chromium.org> | 2012-10-25 11:26:14 -0700 |
| commit | 5c897cf45a7b9df227e0c562c27454f56ba86c20 (patch) | |
| tree | ae3a9ea4d11bfb20379639dd9ca0951ce411e73a /lib/AsmParser/LLLexer.cpp | |
| parent | 89758b0545198f9a3876f0deb747146cbd84ce61 (diff) | |
| parent | a8a0a155de16830b8fcab539ba2ec21de3145532 (diff) | |
Merge commit 'a8a0a155de16830b8fcab539ba2ec21de3145532'
Conflicts:
lib/Target/X86/X86FrameLowering.cpp
lib/Target/X86/X86ISelLowering.cpp
The Intel folks switched some of the FrameLowering code to use
X86RegisterInfo::getSlotSize isntead of pointer size, thus reducing
our localmods in that file.
Diffstat (limited to 'lib/AsmParser/LLLexer.cpp')
| -rw-r--r-- | lib/AsmParser/LLLexer.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp index 464dfd51d6..91f973d8d3 100644 --- a/lib/AsmParser/LLLexer.cpp +++ b/lib/AsmParser/LLLexer.cpp @@ -527,6 +527,7 @@ lltok::Kind LLLexer::LexIdentifier() { KEYWORD(ptx_device); KEYWORD(spir_kernel); KEYWORD(spir_func); + KEYWORD(intel_ocl_bicc); KEYWORD(cc); KEYWORD(c); |