summaryrefslogtreecommitdiffstats
path: root/src/core/configure.json
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2019-05-31 09:56:28 -0700
committerThiago Macieira <thiago.macieira@intel.com>2019-05-31 13:08:10 -0700
commit597359a16a798df3955404200f1fc6833a7425ab (patch)
treec21136eb65046a4e0250a7372c6368174c4ddc58 /src/core/configure.json
parent54fa06ccecaceeffdfbafdd516503f8007569cf0 (diff)
Don't allow QtWebEngineCore to request executable stack
The Chromium sources contain assembly code that causes the library to default to executable stack (the linker requires that *all* .o files have a .note.GNU-stack section in order to default to non-executable). So add the -z noexecstack linker flag to change the setting. The other libraries are not affected. Change-Id: I0bf9ebeb5aa34d19be30fffd15a3d3063dea2005 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/configure.json')
-rw-r--r--src/core/configure.json10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/core/configure.json b/src/core/configure.json
index fc23785df..6dccd1644 100644
--- a/src/core/configure.json
+++ b/src/core/configure.json
@@ -327,6 +327,11 @@
"webengine-arm-thumb" : {
"label": "thumb instruction set",
"type": "hasThumbFlag"
+ },
+ "webengine-noexecstack" : {
+ "label": "linker supports -z noexecstack",
+ "type": "linkerSupportsFlag",
+ "flag": "-z,noexecstack"
}
},
@@ -658,6 +663,11 @@
"label": "Thumb instruction set",
"condition": "config.linux && features.webengine-embedded-build && arch.arm && tests.webengine-arm-thumb",
"output": [ "privateFeature" ]
+ },
+ "webengine-noexecstack": {
+ "label": "linker supports -z noexecstack",
+ "condition": "config.unix && tests.webengine-noexecstack",
+ "output": [ "privateFeature" ]
}
},