# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1268075358 -3600
# Node ID 41145d30acb8a843315b62a9b9e933c204507682
# Parent  0de4525a9ed6c9916c912fafdca0f98eb4e97579# Parent  a6a839bcc18a2749b2ded147ea3f5499fb2cafdc
Merge.

diff -r 0de4525a9ed6 -r 41145d30acb8 gen/linkage.h
--- a/gen/linkage.h	Mon Mar 08 20:06:08 2010 +0100
+++ b/gen/linkage.h	Mon Mar 08 20:09:18 2010 +0100
@@ -3,7 +3,7 @@
 
 // Make it easier to test new linkage types
 
-#  define TEMPLATE_LINKAGE_TYPE         llvm::GlobalValue::WeakODRLinkage
+#  define TEMPLATE_LINKAGE_TYPE         llvm::GlobalValue::LinkOnceODRLinkage
 #  define TYPEINFO_LINKAGE_TYPE         llvm::GlobalValue::LinkOnceODRLinkage
 // The One-Definition-Rule shouldn't matter for debug info, right?
 #  define DEBUGINFO_LINKONCE_LINKAGE_TYPE \