diff options
| -rw-r--r-- | configure.json | 16 | ||||
| -rw-r--r-- | mkspecs/common/gcc-base.conf | 2 | ||||
| -rw-r--r-- | src/3rdparty/pcre2/pcre2.pri | 5 |
3 files changed, 23 insertions, 0 deletions
diff --git a/configure.json b/configure.json index 6d1385dafe..c174b45262 100644 --- a/configure.json +++ b/configure.json @@ -635,6 +635,17 @@ "label": "ccache", "type": "files", "files": [ "ccache" ] + }, + "intelcet": { + "label": "Support for Intel Control-flow Enforcement Technology", + "type": "compile", + "test": { + "main": [ + "#if !defined(__CET__)", + "# error Intel CET not available", + "#endif" + ] + } } }, @@ -1401,6 +1412,11 @@ "autoDetect": "features.shared", "condition": "features.dlopen || config.win32 || !features.shared", "output": [ "privateFeature" ] + }, + "intelcet": { + "label": "Using Intel CET", + "condition": "tests.intelcet", + "output": [ "privateFeature" ] } }, diff --git a/mkspecs/common/gcc-base.conf b/mkspecs/common/gcc-base.conf index 1f919d270a..3c2d5fdd53 100644 --- a/mkspecs/common/gcc-base.conf +++ b/mkspecs/common/gcc-base.conf @@ -54,6 +54,7 @@ QMAKE_CFLAGS_SPLIT_SECTIONS += -ffunction-sections -fdata-sections QMAKE_CFLAGS_LTCG = -flto -fno-fat-lto-objects QMAKE_CFLAGS_LTCG_FATOBJECTS = -ffat-lto-objects QMAKE_CFLAGS_DISABLE_LTCG = -fno-lto +QMAKE_CFLAGS_SHSTK = -mshstk QMAKE_CXXFLAGS += $$QMAKE_CFLAGS QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS @@ -74,6 +75,7 @@ QMAKE_CXXFLAGS_SPLIT_SECTIONS += $$QMAKE_CFLAGS_SPLIT_SECTIONS QMAKE_CXXFLAGS_LTCG = $$QMAKE_CFLAGS_LTCG QMAKE_CXXFLAGS_LTCG_FATOBJECTS = $$QMAKE_CFLAGS_LTCG_FATOBJECTS QMAKE_CXXFLAGS_DISABLE_LTCG = $$QMAKE_CFLAGS_DISABLE_LTCG +QMAKE_CXXFLAGS_SHSTK = $$QMAKE_CFLAGS_SHSTK QMAKE_LFLAGS += QMAKE_LFLAGS_DEBUG += diff --git a/src/3rdparty/pcre2/pcre2.pri b/src/3rdparty/pcre2/pcre2.pri index fa901f783f..b11ec7302a 100644 --- a/src/3rdparty/pcre2/pcre2.pri +++ b/src/3rdparty/pcre2/pcre2.pri @@ -5,6 +5,11 @@ win32: MODULE_DEFINES += PCRE2_STATIC DEFINES += HAVE_CONFIG_H +qtConfig(intelcet) { + QMAKE_CFLAGS += QMAKE_CFLAGS_SHSTK + QMAKE_CXXFLAGS += QMAKE_CXXFLAGS_SHSTK +} + SOURCES += \ $$PWD/src/pcre2_auto_possess.c \ $$PWD/src/pcre2_chartables.c \ |