From: Chris Lattner <sabre@nondot.org>
Date: Mon, 29 Jan 2007 02:18:13 +0000 (+0000)
Subject: Read from the right place.
X-Git-Tag: android-x86-6.0-r1~1003^2~37848
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ec9bfdc152a870d3c62377ed6855fb3bff69511c;p=android-x86%2Fexternal-llvm.git

Read from the right place.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@33611 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Linker/LinkModules.cpp b/lib/Linker/LinkModules.cpp
index 527c09359cb..59ebdee7954 100644
--- a/lib/Linker/LinkModules.cpp
+++ b/lib/Linker/LinkModules.cpp
@@ -851,7 +851,7 @@ Linker::LinkModules(Module *Dest, Module *Src, std::string *ErrorMsg) {
 
   if (Dest->getDataLayout().empty()) {
     if (!Src->getDataLayout().empty()) {
-      Dest->setDataLayout(Src->getTargetTriple());
+      Dest->setDataLayout(Src->getDataLayout());
     } else {
       std::string DataLayout;