diff options
| author | Tilmann Scheller <tilmann.scheller@googlemail.com> | 2011-03-03 07:49:07 +0000 |
|---|---|---|
| committer | Tilmann Scheller <tilmann.scheller@googlemail.com> | 2011-03-03 07:49:07 +0000 |
| commit | 49d7999b89759a1b58180fec9c491ba05204c95c (patch) | |
| tree | c6323a9a5351cf0ec3bb0e8253cb3c6143aa8545 /lib/AsmParser | |
| parent | 78c1e1781cf36dd19988047eac8f664873d35237 (diff) | |
| download | external_llvm-49d7999b89759a1b58180fec9c491ba05204c95c.tar.gz external_llvm-49d7999b89759a1b58180fec9c491ba05204c95c.tar.bz2 external_llvm-49d7999b89759a1b58180fec9c491ba05204c95c.zip | |
Use X86_thiscall calling convention for Win64 as well.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@126934 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/AsmParser')
| -rw-r--r-- | lib/AsmParser/LLLexer.cpp | 1 | ||||
| -rw-r--r-- | lib/AsmParser/LLParser.cpp | 2 | ||||
| -rw-r--r-- | lib/AsmParser/LLToken.h | 1 |
3 files changed, 0 insertions, 4 deletions
diff --git a/lib/AsmParser/LLLexer.cpp b/lib/AsmParser/LLLexer.cpp index c8bbd051f6..857fa1ef62 100644 --- a/lib/AsmParser/LLLexer.cpp +++ b/lib/AsmParser/LLLexer.cpp @@ -549,7 +549,6 @@ lltok::Kind LLLexer::LexIdentifier() { KEYWORD(msp430_intrcc); KEYWORD(ptx_kernel); KEYWORD(ptx_device); - KEYWORD(win64_thiscallcc); KEYWORD(cc); KEYWORD(c); diff --git a/lib/AsmParser/LLParser.cpp b/lib/AsmParser/LLParser.cpp index ed97b401db..fc10c04054 100644 --- a/lib/AsmParser/LLParser.cpp +++ b/lib/AsmParser/LLParser.cpp @@ -1087,7 +1087,6 @@ bool LLParser::ParseOptionalVisibility(unsigned &Res) { /// ::= 'msp430_intrcc' /// ::= 'ptx_kernel' /// ::= 'ptx_device' -/// ::= 'win64_thiscallcc' /// ::= 'cc' UINT /// bool LLParser::ParseOptionalCallingConv(CallingConv::ID &CC) { @@ -1105,7 +1104,6 @@ bool LLParser::ParseOptionalCallingConv(CallingConv::ID &CC) { case lltok::kw_msp430_intrcc: CC = CallingConv::MSP430_INTR; break; case lltok::kw_ptx_kernel: CC = CallingConv::PTX_Kernel; break; case lltok::kw_ptx_device: CC = CallingConv::PTX_Device; break; - case lltok::kw_win64_thiscallcc:CC = CallingConv::Win64_ThisCall; break; case lltok::kw_cc: { unsigned ArbitraryCC; Lex.Lex(); diff --git a/lib/AsmParser/LLToken.h b/lib/AsmParser/LLToken.h index 7f36637292..576da191ae 100644 --- a/lib/AsmParser/LLToken.h +++ b/lib/AsmParser/LLToken.h @@ -74,7 +74,6 @@ namespace lltok { kw_arm_apcscc, kw_arm_aapcscc, kw_arm_aapcs_vfpcc, kw_msp430_intrcc, kw_ptx_kernel, kw_ptx_device, - kw_win64_thiscallcc, kw_signext, kw_zeroext, |