Commit 348cda68 authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merging from mainline and fixing wrong merge of llvmAsmParser.y 

llvm-svn: 31557
parent 532aeb4d

llvm/lib/AsmParser/Lexer.cpp.cvs

+138 −143

File changed.

Preview size limit exceeded, changes collapsed.

llvm/lib/AsmParser/llvmAsmParser.cpp.cvs

+2800 −3640

File changed.

Preview size limit exceeded, changes collapsed.

llvm/lib/AsmParser/llvmAsmParser.y

+2294 −805

File changed.

Preview size limit exceeded, changes collapsed.

llvm/lib/AsmParser/llvmAsmParser.y.cvs

+2 −2
Original line number Diff line number Diff line
@@ -2102,8 +2102,8 @@ Function : BasicBlockList END { 
};



FnDeclareLinkage: /*default*/ |

                  DLLIMPORT   { CurFun.Linkage = GlobalValue::DLLImportLinkage } |

                  EXTERN_WEAK { CurFun.Linkage = GlobalValue::DLLImportLinkage };

                  DLLIMPORT   { CurFun.Linkage = GlobalValue::DLLImportLinkage; } |

                  EXTERN_WEAK { CurFun.Linkage = GlobalValue::DLLImportLinkage; };

  

FunctionProto : DECLARE { CurFun.isDeclare = true; } FnDeclareLinkage FunctionHeaderH {

    $$ = CurFun.CurrentFunction;