diff options
| author | Tanya Lattner <tonic@nondot.org> | 2006-11-08 17:41:32 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2006-11-08 17:41:32 +0000 |
| commit | fc9597dbbca6a63e1136304e7c5dc164bb4754e9 (patch) | |
| tree | 74dc4562212d92c5d7190e498d9ef6f0aa1662e3 | |
| parent | 9200d055b5c9fdec2992a2ab9fa3363978e8630d (diff) | |
| download | llvm-fc9597dbbca6a63e1136304e7c5dc164bb4754e9.zip llvm-fc9597dbbca6a63e1136304e7c5dc164bb4754e9.tar.gz llvm-fc9597dbbca6a63e1136304e7c5dc164bb4754e9.tar.bz2 | |
Merging from mainline.
llvm-svn: 31555
| -rw-r--r-- | llvm/lib/AsmParser/llvmAsmParser.y | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/AsmParser/llvmAsmParser.y b/llvm/lib/AsmParser/llvmAsmParser.y index d40b653..8eea9ab 100644 --- a/llvm/lib/AsmParser/llvmAsmParser.y +++ b/llvm/lib/AsmParser/llvmAsmParser.y @@ -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; |