Commit fc9597db authored by Tanya Lattner's avatar Tanya Lattner
Browse files

Merging from mainline. 

llvm-svn: 31555
parent 9200d055

llvm/lib/AsmParser/llvmAsmParser.y

+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;