From ba0b8769ced01064551eec7718044ac3a3427a9b Mon Sep 17 00:00:00 2001 From: Sean Harmer Date: Fri, 13 Apr 2012 12:00:05 +0100 Subject: Enable stack smashing protection on Blackberry platforms Backport of: 657ca81c910638128f533b7eb98edf187bd40a0c 1c20c3f29441a6856c6eb58dda40b86bdaac6a06 from qtbase. Change-Id: I2e30a16140eaf417a07674828642b74fc829bda8 Reviewed-by: Andreas Holzammer Reviewed-by: Oswald Buddenhagen --- mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf | 3 +++ mkspecs/unsupported/blackberry-x86-qcc/qmake.conf | 3 +++ 2 files changed, 6 insertions(+) diff --git a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf b/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf index df9961b..4e72667 100644 --- a/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf +++ b/mkspecs/unsupported/blackberry-armv7le-qcc/qmake.conf @@ -6,4 +6,7 @@ DEFINES += Q_OS_BLACKBERRY CONFIG += blackberry LIBS += -lbps +# Blackberry also has support for stack smashing protection in its libc +QMAKE_CFLAGS += -fstack-protector -fstack-protector-all + include(../qnx-armv7le-qcc/qmake.conf) diff --git a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf b/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf index 2cb405c..60b67f8 100644 --- a/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf +++ b/mkspecs/unsupported/blackberry-x86-qcc/qmake.conf @@ -6,4 +6,7 @@ DEFINES += Q_OS_BLACKBERRY CONFIG += blackberry LIBS += -lbps +# Blackberry also has support for stack smashing protection in its libc +QMAKE_CFLAGS += -fstack-protector -fstack-protector-all + include(../qnx-x86-qcc/qmake.conf) -- cgit v0.12