diff options
| author | Omair Javaid <omair.javaid@linaro.org> | 2016-04-26 01:08:59 +0000 |
|---|---|---|
| committer | Omair Javaid <omair.javaid@linaro.org> | 2016-04-26 01:08:59 +0000 |
| commit | 9a1699c0c6ef98c9d2f30fd52dda7a8e4990fbc8 (patch) | |
| tree | c7207ee9b0fee367136c04fffb8a340de5617ecd /lldb/source/Core/ArchSpec.cpp | |
| parent | 30ffc4ce452db846f17f2a792392fc5a55af92ef (diff) | |
| download | bcm5719-llvm-9a1699c0c6ef98c9d2f30fd52dda7a8e4990fbc8.tar.gz bcm5719-llvm-9a1699c0c6ef98c9d2f30fd52dda7a8e4990fbc8.zip | |
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
llvm-svn: 267508
Diffstat (limited to 'lldb/source/Core/ArchSpec.cpp')
| -rw-r--r-- | lldb/source/Core/ArchSpec.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lldb/source/Core/ArchSpec.cpp b/lldb/source/Core/ArchSpec.cpp index 1d4613c79ba..4c5971935ef 100644 --- a/lldb/source/Core/ArchSpec.cpp +++ b/lldb/source/Core/ArchSpec.cpp @@ -1016,7 +1016,11 @@ isCompatibleEnvironment(llvm::Triple::EnvironmentType lhs, llvm::Triple::Environ // 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; |
