diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-01-29 13:54:19 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-10 11:42:31 +0100 |
| commit | 482d96a0c5d523ace63f56bda6851926b4469dd0 (patch) | |
| tree | ab25f3f91adbd6031f0bb83812b516e80131bff4 /src/corelib/global/qglobal.h | |
| parent | 09e2e77be25e02ff1c3ba432d739fbc5fe860ec7 (diff) | |
Force -fPIE on ELF if Qt is built with reduced relocations
Put in qconfig.h whether qt is compiled with reduced relocations.
When using -Bsymbolic-functions (enabled by default on Qt)
but not -fPIE, the comparison of the function pointers fail
because the addresses are different in Qt, and in the executable.
Hence we now enable -fPIE by default on qmake, and force a compilation
error when it is not enabled and built with reduced relocations.
Done-with: Sune Vuorela <sune@vuorela.dk>
Change-Id: Ib3fdba06fab6e8a93b75b4c6cf16cc973ab335db
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/corelib/global/qglobal.h')
| -rw-r--r-- | src/corelib/global/qglobal.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 33b5b8bd76..ffeb8a2bab 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -62,6 +62,7 @@ #include <QtCore/qconfig.h> #endif + #include <QtCore/qsystemdetection.h> #include <QtCore/qcompilerdetection.h> #include <QtCore/qprocessordetection.h> @@ -1783,6 +1784,11 @@ Q_CORE_EXPORT int qrand(); # endif #endif +#if defined(QT_REDUCE_RELOCATIONS) && defined(__ELF__) && !defined(__PIC__) +# error "You must build your code with position independent code if Qt was built with -reduce-relocations. "\ + "Compile your code with -fPIC or -fPIE." +#endif + namespace QtPrivate { //like std::enable_if template <bool B, typename T = void> struct QEnableIf; |