From d0706ae3a3996ef6edc196152ad7ae6eaac24dc6 Mon Sep 17 00:00:00 2001 From: James McDonnell Date: Mon, 24 Apr 2017 09:53:57 -0400 Subject: Enable stack-protector-strong for QNX 7.0.0 This was originally enabled in the mkspecs for 64-bit QNX 7.0.0 but that broke when the qtConfig change was made. It looks like qtConfig shouldn't be used in the platform mkspecs. I suspect the stack-protector changes were left out of the 32-bit mkspecs so that 6.6.0 builds wouldn't be affected. Ignore the stack-protector/stack-protector-all possibility since it isn't possible to access it without a command line option. Specifying both options doesn't even make sense since stack-protector-all encompasses stack-protector. For now, leave out command line control of this feature. Task-number: QTBUG-59644 Change-Id: I99323216be5b592dd2c3bef6d22da195764a6e65 Reviewed-by: Oswald Buddenhagen --- .../unix/stack-protector/stack-protector.cpp | 52 ++++++++++++++++++++++ .../unix/stack-protector/stack-protector.pro | 2 + 2 files changed, 54 insertions(+) create mode 100644 config.tests/unix/stack-protector/stack-protector.cpp create mode 100644 config.tests/unix/stack-protector/stack-protector.pro (limited to 'config.tests') diff --git a/config.tests/unix/stack-protector/stack-protector.cpp b/config.tests/unix/stack-protector/stack-protector.cpp new file mode 100644 index 0000000000..8b3926fe1f --- /dev/null +++ b/config.tests/unix/stack-protector/stack-protector.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the config.tests of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#if defined(__QNXNTO__) +#include + +#if _NTO_VERSION < 700 +#error stack-protector not used (by default) before QNX 7.0.0. +#endif + +#endif + +int main() +{ + return 0; +} diff --git a/config.tests/unix/stack-protector/stack-protector.pro b/config.tests/unix/stack-protector/stack-protector.pro new file mode 100644 index 0000000000..ac84d7f148 --- /dev/null +++ b/config.tests/unix/stack-protector/stack-protector.pro @@ -0,0 +1,2 @@ +SOURCES = stack-protector.cpp +QMAKE_CXXFLAGS += -fstack-protector-strong -- cgit v1.2.3 From 9d90bbd7b14db17a64e6a664e6f98b58efa97747 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 9 Jun 2017 16:17:34 +0200 Subject: rework detection and use of clock_gettime()/librt recent versions of glibc include clock_gettime() inside libc itself. Task-number: QTBUG-41009 Change-Id: I7401773be99682a356bf06a69571d11c4b15978b Reviewed-by: Thiago Macieira --- config.tests/unix/clock-gettime/clock-gettime.pri | 2 -- config.tests/unix/clock-gettime/clock-gettime.pro | 1 - config.tests/unix/clock-monotonic/clock-monotonic.pro | 1 - 3 files changed, 4 deletions(-) delete mode 100644 config.tests/unix/clock-gettime/clock-gettime.pri (limited to 'config.tests') diff --git a/config.tests/unix/clock-gettime/clock-gettime.pri b/config.tests/unix/clock-gettime/clock-gettime.pri deleted file mode 100644 index 65b49fb8b4..0000000000 --- a/config.tests/unix/clock-gettime/clock-gettime.pri +++ /dev/null @@ -1,2 +0,0 @@ -# clock_gettime() is implemented in librt on these systems -linux-*|hpux-*|solaris-*:LIBS_PRIVATE *= -lrt diff --git a/config.tests/unix/clock-gettime/clock-gettime.pro b/config.tests/unix/clock-gettime/clock-gettime.pro index bdbb1c2a82..985b94e3fe 100644 --- a/config.tests/unix/clock-gettime/clock-gettime.pro +++ b/config.tests/unix/clock-gettime/clock-gettime.pro @@ -1,3 +1,2 @@ SOURCES = clock-gettime.cpp CONFIG -= qt dylib -include(clock-gettime.pri) diff --git a/config.tests/unix/clock-monotonic/clock-monotonic.pro b/config.tests/unix/clock-monotonic/clock-monotonic.pro index 253a9f7346..4c421c2413 100644 --- a/config.tests/unix/clock-monotonic/clock-monotonic.pro +++ b/config.tests/unix/clock-monotonic/clock-monotonic.pro @@ -1,3 +1,2 @@ SOURCES = clock-monotonic.cpp CONFIG -= qt dylib -include(../clock-gettime/clock-gettime.pri) -- cgit v1.2.3