summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2010-08-25 07:29:45 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2010-08-25 07:35:56 (GMT)
commit69f5543cceaed4b5836e3671f65c32235ea0e8eb (patch)
tree032208b72c7c945a56187955c241aa0fa26c78a4 /src
parent35e1c730c25d9e5c1af9715072754126e4b3c0c1 (diff)
downloadQt-69f5543cceaed4b5836e3671f65c32235ea0e8eb.zip
Qt-69f5543cceaed4b5836e3671f65c32235ea0e8eb.tar.gz
Qt-69f5543cceaed4b5836e3671f65c32235ea0e8eb.tar.bz2
I don't know why some linkers can't call this function, so comment it out.
It works fine for me on my Linux box (also 32-bit) and on ARM.
Diffstat (limited to 'src')
-rw-r--r--src/corelib/global/qlibraryinfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp
index b4f5d0f..a0779c9 100644
--- a/src/corelib/global/qlibraryinfo.cpp
+++ b/src/corelib/global/qlibraryinfo.cpp
@@ -500,6 +500,7 @@ QT_END_NAMESPACE
extern const char qt_core_interpreter[] __attribute__((section(".interp")))
= ELF_INTERPRETER;
+extern void qDumpCPUFeatures(); // in qsimd.cpp
extern "C" void qt_core_boilerplate();
void qt_core_boilerplate()
{
@@ -525,8 +526,7 @@ void qt_core_boilerplate()
qt_configure_libraries_path_str + 12,
qt_configure_headers_path_str + 12);
- extern void qDumpCPUFeatures();
- qDumpCPUFeatures();
+// qDumpCPUFeatures();
#ifdef QT_EVAL
extern void qt_core_eval_init(uint);