changeset 1639:41145d30acb8

Merge.
author Christian Kamm <kamm incasoftware de>
date Mon, 08 Mar 2010 20:09:18 +0100
parents 0de4525a9ed6 (current diff) a6a839bcc18a (diff)
children 9bf06e02070b
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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 \