Index: include/lldb/Target/ABI.h
===================================================================
--- include/lldb/Target/ABI.h
+++ include/lldb/Target/ABI.h
@@ -107,6 +107,16 @@
     virtual bool
     CreateDefaultUnwindPlan (UnwindPlan &unwind_plan) = 0;
 
+    virtual int64_t
+    CFAOffset () const
+    {
+        // On most targets, the CFA equals the incoming stack pointer value.
+        // On some targets like SystemZ, however, the CFA is at a constant
+        // offset relative to the incoming stack pointer value.
+        // Return this offset.
+        return 0;
+    }
+
     virtual bool
     RegisterIsVolatile (const RegisterInfo *reg_info) = 0;
 
Index: source/Plugins/Process/Utility/RegisterContextLLDB.cpp
===================================================================
--- source/Plugins/Process/Utility/RegisterContextLLDB.cpp
+++ source/Plugins/Process/Utility/RegisterContextLLDB.cpp
@@ -1390,11 +1390,16 @@
         }
     }
 
+    ExecutionContext exe_ctx(m_thread.shared_from_this());
+    Process *process = exe_ctx.GetProcessPtr();
+    ABI *abi = process ? process->GetABI().get() : NULL;
+
     if (have_unwindplan_regloc == false)
     {
         // Did the UnwindPlan fail to give us the caller's stack pointer?  
         // The stack pointer is defined to be the same as THIS frame's CFA, so return the CFA value as
         // the caller's stack pointer.  This is true on x86-32/x86-64 at least.
+        // On other platforms, there may be a constant offset.  Consult the abi->CFAOffset callback.
 
         RegisterNumber sp_regnum (m_thread, eRegisterKindGeneric, LLDB_REGNUM_GENERIC_SP);
         if (sp_regnum.GetAsKind (eRegisterKindLLDB) != LLDB_INVALID_REGNUM 
@@ -1403,7 +1408,7 @@
             // make sure we won't lose precision copying an addr_t (m_cfa) into a uint64_t (.inferred_value)
             assert (sizeof (addr_t) <= sizeof (uint64_t));
             regloc.type = UnwindLLDB::RegisterLocation::eRegisterValueInferred;
-            regloc.location.inferred_value = m_cfa;
+            regloc.location.inferred_value = m_cfa - (abi ? abi->CFAOffset() : 0);
             m_registers[regnum.GetAsKind (eRegisterKindLLDB)] = regloc;
             UnwindLogMsg ("supplying caller's stack pointer %s (%d) value, computed from CFA", 
                         regnum.GetName(), regnum.GetAsKind (eRegisterKindLLDB));
@@ -1411,13 +1416,10 @@
         }
     }
 
-    ExecutionContext exe_ctx(m_thread.shared_from_this());
-    Process *process = exe_ctx.GetProcessPtr();
     if (have_unwindplan_regloc == false)
     {
         // If a volatile register is being requested, we don't want to forward the next frame's register contents
         // up the stack -- the register is not retrievable at this frame.
-        ABI *abi = process ? process->GetABI().get() : NULL;
         if (abi)
         {
             const RegisterInfo *reg_info = GetRegisterInfoAtIndex(regnum.GetAsKind (eRegisterKindLLDB));