1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNX: check and use elf.h from alternative location

Browse Source 
In QNX, instead of #include <elf.h>, we have to use #include <sys/elf.h>
since that file is placed in a subdirectory.

Also removed the previous workaround.

Fixes: QTBUG-97833
Change-Id: Id932a5eeb618a42c8778459cdfd8bb5bf903523c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Janne Juntunen 2021-11-03 13:04:07 +02:00
parent b9f7add531
commit 2bfa4b9960
5 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/corelib/plugin/qelfparser_p.cpp
View File

@ -40,7 +40,7 @@
#include "qelfparser_p.h" #include "qelfparser_p.h"
#if defined (Q_OF_ELF) && __has_include(<elf.h>) #ifdef Q_OF_ELF
#include "qlibrary_p.h" #include "qlibrary_p.h"
@ -48,7 +48,13 @@
#include <qnumeric.h> #include <qnumeric.h>
#include <qsysinfo.h> #include <qsysinfo.h>
#include <elf.h> #if __has_include(<elf.h>)
# include <elf.h>
#elif __has_include(<sys/elf.h>)
# include <sys/elf.h>
#else
# error "Need ELF header to parse plugins."
#endif
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -408,7 +414,9 @@ Q_DECL_UNUSED Q_DECL_COLD_FUNCTION static QDebug &operator<<(QDebug &d, ElfHeade
case EM_MIPS: d << ", MIPS"; break; case EM_MIPS: d << ", MIPS"; break;
case EM_PPC: d << ", PowerPC"; break; case EM_PPC: d << ", PowerPC"; break;
case EM_PPC64: d << ", PowerPC 64-bit"; break; case EM_PPC64: d << ", PowerPC 64-bit"; break;
#ifdef EM_RISCV
case EM_RISCV: d << ", RISC-V"; break; case EM_RISCV: d << ", RISC-V"; break;
#endif
case EM_S390: d << ", S/390"; break; case EM_S390: d << ", S/390"; break;
case EM_SH: d << ", SuperH"; break; case EM_SH: d << ", SuperH"; break;
case EM_SPARC: d << ", SPARC"; break; case EM_SPARC: d << ", SPARC"; break;
@ -790,4 +798,4 @@ QLibraryScanResult QElfParser::parse(QByteArrayView data, QString *errMsg)
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // defined(Q_OF_ELF) && defined(Q_CC_GNU) #endif // Q_OF_ELF

4
src/corelib/plugin/qelfparser_p.h
View File

@ -56,7 +56,7 @@
QT_REQUIRE_CONFIG(library); QT_REQUIRE_CONFIG(library);
#if defined(Q_OF_ELF) && __has_include(<elf.h>) #ifdef Q_OF_ELF
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -67,6 +67,6 @@ struct QElfParser
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // defined(Q_OF_ELF) && defined(Q_CC_GNU) #endif // Q_OF_ELF
#endif // QELFPARSER_P_H #endif // QELFPARSER_P_H

2
src/corelib/plugin/qlibrary.cpp
View File

@ -203,7 +203,7 @@ static QLibraryScanResult qt_find_pattern(const char *s, qsizetype s_len, QStrin
More importantly, the pattern string may exist in the debug information due More importantly, the pattern string may exist in the debug information due
to it being used in the plugin in the first place. to it being used in the plugin in the first place.
*/ */
#if defined (Q_OF_ELF) && __has_include(<elf.h>) #if defined(Q_OF_ELF)
return QElfParser::parse({s, s_len}, errMsg); return QElfParser::parse({s, s_len}, errMsg);
#elif defined(Q_OF_MACH_O) #elif defined(Q_OF_MACH_O)
return QMachOParser::parse(s, s_len, errMsg); return QMachOParser::parse(s, s_len, errMsg);

2
src/corelib/plugin/qmachparser_p.h
View File

@ -70,6 +70,6 @@ public:
QT_END_NAMESPACE QT_END_NAMESPACE
#endif // defined(Q_OF_ELF) && defined(Q_CC_GNU) #endif // defined(Q_OF_MACH_O)
#endif // QMACHPARSER_P_H #endif // QMACHPARSER_P_H

17
tests/auto/corelib/plugin/qpluginloader/tst_qpluginloader.cpp
View File

@ -94,14 +94,12 @@
# define PREFIX "lib" # define PREFIX "lib"
#endif #endif
// Workaround for missing elf.h in QNX test environment #if defined(Q_OF_ELF)
// TODO: this can be removed after QTBUG-97833 has been solved #if __has_include(<elf.h>)
#if defined(Q_OF_ELF) && defined(Q_OS_QNX) && !__has_include(<elf.h>) # include <elf.h>
#undef Q_OF_ELF #else
# include <sys/elf.h>
#endif #endif
#if defined (Q_OF_ELF)
# include <elf.h>
# include <memory> # include <memory>
# include <functional> # include <functional>
@ -183,7 +181,7 @@ static std::unique_ptr<QTemporaryFile> patchElf(const QString &source, ElfPatche
if (QTest::currentTestFailed()) return; \ if (QTest::currentTestFailed()) return; \
std::move(r); \ std::move(r); \
}) })
#endif #endif // Q_OF_ELF
static QString sys_qualifiedLibraryName(const QString &fileName) static QString sys_qualifiedLibraryName(const QString &fileName)
{ {
@ -395,7 +393,8 @@ void tst_QPluginLoader::deleteinstanceOnUnload()
} }
} }
#if defined (Q_OF_ELF) #if defined(Q_OF_ELF)
void tst_QPluginLoader::loadDebugObj() void tst_QPluginLoader::loadDebugObj()
{ {
#if !defined(QT_SHARED) #if !defined(QT_SHARED)