[Lldb-commits] [lldb] r129500 - in /lldb/trunk: llvm.zip scripts/build-llvm.pl source/Expression/ClangExpressionParser.cpp source/Expression/IRDynamicChecks.cpp source/Expression/IRForTarget.cpp

[Sean Callanan]

Author: spyffe
Date: Wed Apr 13 21:01:31 2011
New Revision: 129500

URL: http://llvm.org/viewvc/llvm-project?rev=129500&view=rev
Log:
Updated LLVM to pick up fixes to the ARM instruction
tables.

Modified:
    lldb/trunk/llvm.zip
    lldb/trunk/scripts/build-llvm.pl
    lldb/trunk/source/Expression/ClangExpressionParser.cpp
    lldb/trunk/source/Expression/IRDynamicChecks.cpp
    lldb/trunk/source/Expression/IRForTarget.cpp

Modified: lldb/trunk/llvm.zip
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/llvm.zip?rev=129500&r1=129499&r2=129500&view=diff
==============================================================================
Binary files - no diff available.

Modified: lldb/trunk/scripts/build-llvm.pl
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/scripts/build-llvm.pl?rev=129500&r1=129499&r2=129500&view=diff
==============================================================================
--- lldb/trunk/scripts/build-llvm.pl (original)
+++ lldb/trunk/scripts/build-llvm.pl Wed Apr 13 21:01:31 2011
@@ -26,7 +26,7 @@
 
 our $llvm_configuration = $ENV{LLVM_CONFIGURATION};
 
-our $llvm_revision = "128303";
+our $llvm_revision = "129495";
 our $llvm_source_dir = "$ENV{SRCROOT}";
 our @archs = split (/\s+/, $ENV{ARCHS});
 

Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionParser.cpp?rev=129500&r1=129499&r2=129500&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionParser.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionParser.cpp Wed Apr 13 21:01:31 2011
@@ -244,10 +244,28 @@
     // and other things that _are_ target specific really shouldn't just be 
     // using the host triple. This needs to be fixed in a better way.
     if (target && target->GetArchitecture().IsValid())
-        m_compiler->getTargetOpts().Triple = target->GetArchitecture().GetTriple().str();
+    {
+        std::string triple = target->GetArchitecture().GetTriple().str();
+        
+        int dash_count = 0;
+        for (int i = 0; i < triple.size(); ++i)
+        {
+            if (triple[i] == '-')
+                dash_count++;
+            if (dash_count == 3)
+            {
+                triple.resize(i);
+                break;
+            }
+        }
+        
+        m_compiler->getTargetOpts().Triple = triple;
+    }
     else
+    {
         m_compiler->getTargetOpts().Triple = llvm::sys::getHostTriple();
-    
+    }
+        
     // 3. Set up various important bits of infrastructure.
     m_compiler->createDiagnostics(0, 0);
     

Modified: lldb/trunk/source/Expression/IRDynamicChecks.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRDynamicChecks.cpp?rev=129500&r1=129499&r2=129500&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRDynamicChecks.cpp (original)
+++ lldb/trunk/source/Expression/IRDynamicChecks.cpp Wed Apr 13 21:01:31 2011
@@ -18,6 +18,7 @@
 #include "lldb/Target/StackFrame.h"
 
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Constants.h"
 #include "llvm/Function.h"
 #include "llvm/Instructions.h"
 #include "llvm/Module.h"

Modified: lldb/trunk/source/Expression/IRForTarget.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/IRForTarget.cpp?rev=129500&r1=129499&r2=129500&view=diff
==============================================================================
--- lldb/trunk/source/Expression/IRForTarget.cpp (original)
+++ lldb/trunk/source/Expression/IRForTarget.cpp Wed Apr 13 21:01:31 2011
@@ -10,6 +10,7 @@
 #include "lldb/Expression/IRForTarget.h"
 
 #include "llvm/Support/raw_ostream.h"
+#include "llvm/Constants.h"
 #include "llvm/InstrTypes.h"
 #include "llvm/Instructions.h"
 #include "llvm/Intrinsics.h"