[Lldb-commits] [lldb] r267508 - Fix arm-linux-gnueabi regression due to rL267291

[Omair Javaid via lldb-commits]

Author: omjavaid
Date: Mon Apr 25 20:08:59 2016
New Revision: 267508

URL: http://llvm.org/viewvc/llvm-project?rev=267508&view=rev
Log:
Fix arm-linux-gnueabi regression due to rL267291

rL267291 introduces a lot regression on arm-linux LLDB testsuite.

This patch fixes half of them. I am merging it under already revied android counterpart.

Another patch fixing rest of the issue will follow this commit.

Differential revision: http://reviews.llvm.org/D19480


Modified:
    lldb/trunk/source/Core/ArchSpec.cpp

Modified: lldb/trunk/source/Core/ArchSpec.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Core/ArchSpec.cpp?rev=267508&r1=267507&r2=267508&view=diff
==============================================================================
--- lldb/trunk/source/Core/ArchSpec.cpp (original)
+++ lldb/trunk/source/Core/ArchSpec.cpp Mon Apr 25 20:08:59 2016
@@ -1016,7 +1016,11 @@ isCompatibleEnvironment(llvm::Triple::En
     // be compatible. This is required as a workaround for shared libraries compiled for Android
     // without the NOTE section indicating that they are using the Android ABI.
     if ((lhs == llvm::Triple::Android && rhs == llvm::Triple::EABI) ||
-        (rhs == llvm::Triple::Android && lhs == llvm::Triple::EABI))
+        (rhs == llvm::Triple::Android && lhs == llvm::Triple::EABI) ||
+        (lhs == llvm::Triple::GNUEABI && rhs == llvm::Triple::EABI) ||
+        (rhs == llvm::Triple::GNUEABI && lhs == llvm::Triple::EABI) ||
+        (lhs == llvm::Triple::GNUEABIHF && rhs == llvm::Triple::EABIHF) ||
+        (rhs == llvm::Triple::GNUEABIHF && lhs == llvm::Triple::EABIHF))
         return true;
 
     return false;