1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
|
From: Jakub Adam <jakub.adam@ktknet.cz>
Date: Wed, 16 Jul 2014 15:27:00 +0200
Subject: debian-archs-fix-build
---
cmake/GammaRayProbeABI.cmake | 4 +++-
launcher/core/probeabidetector_elf.cpp | 6 ++++++
2 files changed, 9 insertions(+), 1 deletion(-)
--- a/cmake/GammaRayProbeABI.cmake
+++ b/cmake/GammaRayProbeABI.cmake
@@ -100,8 +100,10 @@ else()
else()
set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-arm")
endif()
+ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "ppc64le")
+ set(GAMMARAY_PROBE_ABI "${GAMMARAY_PROBE_ABI}-ppc64")
else()
- if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3456]86"
+ if(CMAKE_SYSTEM_PROCESSOR MATCHES "i[3456]86(-AT386)?"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "x86"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "corei"
OR CMAKE_SYSTEM_PROCESSOR MATCHES "amd64"
--- a/launcher/core/probeabidetector_elf.cpp
+++ b/launcher/core/probeabidetector_elf.cpp
@@ -149,6 +149,12 @@ static QString archFromELFHeader(const u
case EM_AARCH64:
return QStringLiteral("aarch64");
#endif
+ case EM_PPC:
+ return QStringLiteral("ppc");
+ case EM_S390:
+ return QStringLiteral("s390x");
+ case EM_PPC64:
+ return QStringLiteral("ppc64");
}
qWarning() << "Unsupported ELF machine type:" << hdr->e_machine;
|