Changes in directory llvm/lib/AsmParser:
llvmAsmParser.y updated: 1.272 -> 1.272.2.1
---
Log message:
Merging from mainline.
---
Diffs of the changes: (+2 -2)
llvmAsmParser.y | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Index: llvm/lib/AsmParser/llvmAsmParser.y
diff -u llvm/lib/AsmParser/llvmAsmParser.y:1.272
llvm/lib/AsmParser/llvmAsmParser.y:1.272.2.1
--- llvm/lib/AsmParser/llvmAsmParser.y:1.272 Wed Nov 1 19:53:58 2006
+++ llvm/lib/AsmParser/llvmAsmParser.y Wed Nov 8 11:41:32 2006
@@ -2102,8 +2102,8 @@
};
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;
_______________________________________________
llvm-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits