projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add in support for SPIR to LLVM core. This adds a new target and two new calling...
[oota-llvm.git]
/
lib
/
AsmParser
/
LLLexer.cpp
diff --git
a/lib/AsmParser/LLLexer.cpp
b/lib/AsmParser/LLLexer.cpp
index 481733dd4e40123ea79f1560bbfcfba298978cf5..2ad0010fd127a8d1e5dd62c294c28f4147fad8b2 100644
(file)
--- a/
lib/AsmParser/LLLexer.cpp
+++ b/
lib/AsmParser/LLLexer.cpp
@@
-456,11
+456,12
@@
lltok::Kind LLLexer::LexIdentifier() {
KEYWORD(private);
KEYWORD(linker_private);
KEYWORD(linker_private_weak);
KEYWORD(private);
KEYWORD(linker_private);
KEYWORD(linker_private_weak);
- KEYWORD(linker_private_weak_def_auto);
+ KEYWORD(linker_private_weak_def_auto);
// FIXME: For backwards compatibility.
KEYWORD(internal);
KEYWORD(available_externally);
KEYWORD(linkonce);
KEYWORD(linkonce_odr);
KEYWORD(internal);
KEYWORD(available_externally);
KEYWORD(linkonce);
KEYWORD(linkonce_odr);
+ KEYWORD(linkonce_odr_auto_hide);
KEYWORD(weak);
KEYWORD(weak_odr);
KEYWORD(appending);
KEYWORD(weak);
KEYWORD(weak_odr);
KEYWORD(appending);
@@
-509,6
+510,7
@@
lltok::Kind LLLexer::LexIdentifier() {
KEYWORD(asm);
KEYWORD(sideeffect);
KEYWORD(alignstack);
KEYWORD(asm);
KEYWORD(sideeffect);
KEYWORD(alignstack);
+ KEYWORD(inteldialect);
KEYWORD(gc);
KEYWORD(ccc);
KEYWORD(gc);
KEYWORD(ccc);
@@
-523,6
+525,8
@@
lltok::Kind LLLexer::LexIdentifier() {
KEYWORD(msp430_intrcc);
KEYWORD(ptx_kernel);
KEYWORD(ptx_device);
KEYWORD(msp430_intrcc);
KEYWORD(ptx_kernel);
KEYWORD(ptx_device);
+ KEYWORD(spir_kernel);
+ KEYWORD(spir_func);
KEYWORD(cc);
KEYWORD(c);
KEYWORD(cc);
KEYWORD(c);
@@
-553,7
+557,6
@@
lltok::Kind LLLexer::LexIdentifier() {
KEYWORD(naked);
KEYWORD(nonlazybind);
KEYWORD(address_safety);
KEYWORD(naked);
KEYWORD(nonlazybind);
KEYWORD(address_safety);
- KEYWORD(ia_nsdialect);
KEYWORD(type);
KEYWORD(opaque);
KEYWORD(type);
KEYWORD(opaque);