From fd9dd8e95b7563a439b1672fa622729bdcb6f4fc Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Fri, 20 Oct 2017 12:09:14 -0700 Subject: Move the minimum Linux version declarations to a header I'll need it in the AF_NETLINK implementation of QNetworkInterface. Change-Id: Icaa86fc7b54d4b368c0efffd14ef5ce895d0ed5b Reviewed-by: Edward Welbourne Reviewed-by: Thiago Macieira --- src/corelib/global/global.pri | 1 + src/corelib/global/minimum-linux.S | 33 ++---------- src/corelib/global/minimum-linux_p.h | 98 ++++++++++++++++++++++++++++++++++++ 3 files changed, 103 insertions(+), 29 deletions(-) create mode 100644 src/corelib/global/minimum-linux_p.h (limited to 'src/corelib') diff --git a/src/corelib/global/global.pri b/src/corelib/global/global.pri index 7c31df4d6a..e1ca8828f9 100644 --- a/src/corelib/global/global.pri +++ b/src/corelib/global/global.pri @@ -73,6 +73,7 @@ linux:!static { } else { SOURCES += global/minimum-linux.S } + HEADERS += global/minimum-linux_p.h } qtConfig(slog2): \ diff --git a/src/corelib/global/minimum-linux.S b/src/corelib/global/minimum-linux.S index 6b7fb4f63b..dfc3cec1be 100644 --- a/src/corelib/global/minimum-linux.S +++ b/src/corelib/global/minimum-linux.S @@ -37,7 +37,7 @@ ** ****************************************************************************/ -#include "private/qglobal_p.h" +#include "minimum-linux_p.h" /* Copied from #include : */ @@ -76,31 +76,6 @@ /* Operating systems: */ .long ELF_NOTE_OS_LINUX -/* Minimum Linux kernel version: - * We require the following features in Qt (unconditional, no fallback): - * Feature Added in version Macro - * - inotify_init1 before 2.6.12-rc12 - * - futex(2) before 2.6.12-rc12 - * - linkat(2) 2.6.17 O_TMPFILE - * - FUTEX_PRIVATE_FLAG 2.6.22 - * - O_CLOEXEC 2.6.23 - * - eventfd 2.6.23 - * - pipe2 & dup3 2.6.27 - * - accept4 2.6.28 - * - renameat2 3.16 QT_CONFIG(renameat2) - * - getrandom 3.17 QT_CONFIG(getentropy) - */ - -#if QT_CONFIG(getentropy) - .long 3 - .long 17 - .long 0 -#elif QT_CONFIG(renameat2) - .long 3 - .long 16 - .long 0 -#else - .long 2 - .long 6 - .long 28 -#endif + .long MINLINUX_MAJOR + .long MINLINUX_MINOR + .long MINLINUX_PATCH diff --git a/src/corelib/global/minimum-linux_p.h b/src/corelib/global/minimum-linux_p.h new file mode 100644 index 0000000000..324744b856 --- /dev/null +++ b/src/corelib/global/minimum-linux_p.h @@ -0,0 +1,98 @@ +/**************************************************************************** +** +** Copyright (C) 2017 Intel Corporation. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtCore module 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$ +** +****************************************************************************/ + +#ifndef MINIMUMLINUX_P_H +#define MINIMUMLINUX_P_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists purely as an +// implementation detail. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +// EXTRA WARNING +// ------------- +// +// This file must also be valid assembler source. +// + +#include "private/qglobal_p.h" + +QT_BEGIN_NAMESPACE + +/* Minimum Linux kernel version: + * We require the following features in Qt (unconditional, no fallback): + * Feature Added in version Macro + * - inotify_init1 before 2.6.12-rc12 + * - futex(2) before 2.6.12-rc12 + * - FUTEX_WAKE_OP 2.6.14 FUTEX_OP + * - linkat(2) 2.6.17 O_TMPFILE + * - FUTEX_PRIVATE_FLAG 2.6.22 + * - O_CLOEXEC 2.6.23 + * - eventfd 2.6.23 + * - pipe2 & dup3 2.6.27 + * - accept4 2.6.28 + * - renameat2 3.16 QT_CONFIG(renameat2) + * - getrandom 3.17 QT_CONFIG(getentropy) + */ + +#if QT_CONFIG(getentropy) +# define MINLINUX_MAJOR 3 +# define MINLINUX_MINOR 17 +# define MINLINUX_PATCH 0 +#elif QT_CONFIG(renameat2) +# define MINLINUX_MAJOR 3 +# define MINLINUX_MINOR 16 +# define MINLINUX_PATCH 0 +#else +# define MINLINUX_MAJOR 2 +# define MINLINUX_MINOR 6 +# define MINLINUX_PATCH 28 +#endif + +#define MINIMUM_LINUX_VERSION QT_VERSION_CHECK(MINLINUX_MAJOR, MINLINUX_MINOR, MINLINUX_PATCH) + +QT_END_NAMESPACE + +#endif // MINIMUMLINUX_P_H -- cgit v1.2.3