From 80f6d7862c0e2e41768620d5bd81b0e1d5e3f61f Mon Sep 17 00:00:00 2001
From: Peter Hartmann <phartmann@rim.com>
Date: Thu, 20 Sep 2012 14:11:25 +0200
Subject: Blackberry mkspecs: Refine compiler options

stack-protector-strong gives performance benefits over
stack-protector-all and is still checking more than -stack-protector,
so seems to be a good middle way and we want to use it when it is
there.

The -shared option for the compiler (not the linker) prevents a
RIM internal version of qcc from forcing -fPIE, and should not harm
in general when set.

In addition, add a method "compilerSupportsFlag" for Windows as is
present in the Unix configure script.

Change-Id: Iba300e9cb82f34043e7b36f8e45287a1aed2a1a5
Original-patch-by: Greg Bentz
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
---
 configure                                 | 17 ++++++++++++++--
 mkspecs/blackberry-armv7le-qcc/qmake.conf |  8 +++++++-
 mkspecs/blackberry-x86-qcc/qmake.conf     |  8 +++++++-
 mkspecs/common/qcc-base.conf              |  2 +-
 tools/configure/configureapp.cpp          | 32 +++++++++++++++++++++++++++++++
 tools/configure/configureapp.h            |  1 +
 6 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 58d7a86ad7..19eef3f4bb 100755
--- a/configure
+++ b/configure
@@ -230,9 +230,9 @@ compilerSupportsFlag()
     cat >conftest.cpp <<EOF
 int main() { return 0; }
 EOF
-    "$TEST_COMPILER" "$@" -o conftest.o conftest.cpp
+    $TEST_COMPILER "$@" -o conftest-out.o conftest.cpp
     ret=$?
-    rm -f conftest.cpp conftest.o
+    rm -f conftest.cpp conftest-out.o
     return $ret
 }
 
@@ -783,6 +783,7 @@ CFG_V8SNAPSHOT=auto
 CFG_QML_DEBUG=yes
 CFG_JAVASCRIPTCORE_JIT=auto
 CFG_PKGCONFIG=auto
+CFG_STACK_PROTECTOR_STRONG=auto
 
 # Target architecture
 CFG_ARCH=
@@ -2660,6 +2661,17 @@ if [ "$CFG_REDUCE_EXPORTS" != "no" ]; then
     fi
 fi
 
+# auto-detect -fstack-protector-strong support (for QNX only currently)
+if [ "$XPLATFORM_QNX" = "yes" ]; then
+    if compilerSupportsFlag -fstack-protector-strong; then
+       CFG_STACK_PROTECTOR_STRONG=yes
+    else
+       CFG_STACK_PROTECTOR_STRONG=no
+    fi
+else
+   CFG_STACK_PROTECTOR_STRONG=no
+fi
+
 # detect the availability of the -Bsymbolic-functions linker optimization
 if [ "$CFG_REDUCE_RELOCATIONS" != "no" ]; then
     if "$unixtests/bsymbolic_functions.test" "$TEST_COMPILER" "$OPT_VERBOSE"; then
@@ -5296,6 +5308,7 @@ if [ "$CFG_USE_GNUMAKE" = "yes" ]; then
     QMAKE_CONFIG="$QMAKE_CONFIG GNUmake"
 fi
 [ "$CFG_REDUCE_EXPORTS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_exports"
+[ "$CFG_STACK_PROTECTOR_STRONG" = "yes" ] && QT_CONFIG="$QT_CONFIG stack-protector-strong"
 [ "$CFG_REDUCE_RELOCATIONS" = "yes" ] && QT_CONFIG="$QT_CONFIG reduce_relocations"
 [ "$CFG_STRIP" = "no" ] && QMAKE_CONFIG="$QMAKE_CONFIG nostrip"
 [ "$CFG_PRECOMPILE" = "yes" ] && QMAKE_CONFIG="$QMAKE_CONFIG precompile_header"
diff --git a/mkspecs/blackberry-armv7le-qcc/qmake.conf b/mkspecs/blackberry-armv7le-qcc/qmake.conf
index 4a8cde7b16..2886527a5c 100644
--- a/mkspecs/blackberry-armv7le-qcc/qmake.conf
+++ b/mkspecs/blackberry-armv7le-qcc/qmake.conf
@@ -2,11 +2,17 @@
 # qmake configuration for blackberry armv7le systems
 #
 
+load(qt_config)
+
 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
+contains(QT_CONFIG, stack-protector-strong) {
+    QMAKE_CFLAGS += -fstack-protector-strong
+} else {
+    QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
+}
 
 include(../common/qcc-base-qnx-armv7le.conf)
diff --git a/mkspecs/blackberry-x86-qcc/qmake.conf b/mkspecs/blackberry-x86-qcc/qmake.conf
index 24bbffe920..4dc3da6c07 100644
--- a/mkspecs/blackberry-x86-qcc/qmake.conf
+++ b/mkspecs/blackberry-x86-qcc/qmake.conf
@@ -2,11 +2,17 @@
 # qmake configuration for blackberry x86 systems
 #
 
+load(qt_config)
+
 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
+contains(QT_CONFIG, stack-protector-strong) {
+    QMAKE_CFLAGS += -fstack-protector-strong
+} else {
+    QMAKE_CFLAGS += -fstack-protector -fstack-protector-all
+}
 
 include(../common/qcc-base-qnx-x86.conf)
diff --git a/mkspecs/common/qcc-base.conf b/mkspecs/common/qcc-base.conf
index b6abb8f52d..76d3d1362f 100644
--- a/mkspecs/common/qcc-base.conf
+++ b/mkspecs/common/qcc-base.conf
@@ -17,7 +17,7 @@ QMAKE_CFLAGS_WARN_ON        += -Wall -W
 QMAKE_CFLAGS_WARN_OFF       += -w
 QMAKE_CFLAGS_RELEASE        += -O2
 QMAKE_CFLAGS_DEBUG          += -g
-QMAKE_CFLAGS_SHLIB          += -fPIC
+QMAKE_CFLAGS_SHLIB          += -fPIC -shared
 QMAKE_CFLAGS_STATIC_LIB     += -fPIC
 QMAKE_CFLAGS_APP            += -fPIE
 QMAKE_CFLAGS_YACC           += -Wno-unused -Wno-parentheses
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 4fce6f21d7..d1244f0f59 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -1504,6 +1504,8 @@ void Configure::applySpecSpecifics()
         dictionary[ "QT_ICONV" ]            = "no";
 
         dictionary["DECORATIONS"]           = "default windows styled";
+    } else if ((platform() == QNX) || (platform() == BLACKBERRY)) {
+        dictionary["STACK_PROTECTOR_STRONG"] = "auto";
     }
 }
 
@@ -2041,6 +2043,8 @@ bool Configure::checkAvailability(const QString &part)
         available = tryCompileProject("unix/iconv") || tryCompileProject("unix/gnu-libiconv");
     } else if (part == "CUPS") {
         available = (platform() != WINDOWS) && (platform() != WINDOWS_CE) && tryCompileProject("unix/cups");
+    } else if (part == "STACK_PROTECTOR_STRONG") {
+        available = (platform() == QNX || platform() == BLACKBERRY) && compilerSupportsFlag("qcc -fstack-protector-strong");
     }
 
     return available;
@@ -2153,6 +2157,10 @@ void Configure::autoDetection()
     if (dictionary["QT_CUPS"] == "auto")
         dictionary["QT_CUPS"] = checkAvailability("CUPS") ? "yes" : "no";
 
+    // Detection of -fstack-protector-strong support
+    if (dictionary["STACK_PROTECTOR_STRONG"] == "auto")
+        dictionary["STACK_PROTECTOR_STRONG"] = checkAvailability("STACK_PROTECTOR_STRONG") ? "yes" : "no";
+
     // Mark all unknown "auto" to the default value..
     for (QMap<QString,QString>::iterator i = dictionary.begin(); i != dictionary.end(); ++i) {
         if (i.value() == "auto")
@@ -2511,6 +2519,9 @@ void Configure::generateOutputVars()
     if (dictionary["QT_GLIB"] == "yes")
         qtConfig += "glib";
 
+    if (dictionary["STACK_PROTECTOR_STRONG"] == "yes")
+        qtConfig += "stack-protector-strong";
+
     // We currently have no switch for QtConcurrent, so add it unconditionally.
     qtConfig += "concurrent";
 
@@ -2872,6 +2883,27 @@ bool Configure::tryCompileProject(const QString &projectPath, const QString &ext
     return code == 0;
 }
 
+bool Configure::compilerSupportsFlag(const QString &compilerAndArgs)
+{
+    QFile file("conftest.cpp");
+    if (!file.open(QIODevice::WriteOnly | QIODevice::Text)) {
+        cout << "could not open temp file for writing" << endl;
+        return false;
+    }
+    if (!file.write("int main() { return 0; }\r\n")) {
+        cout << "could not write to temp file" << endl;
+        return false;
+    }
+    file.close();
+    // compilerAndArgs contains compiler because there is no way to query it
+    QString command = compilerAndArgs + " -o conftest-out.o conftest.cpp";
+    int code = 0;
+    QString output = Environment::execute(command, &code);
+    file.remove();
+    QFile::remove("conftest-out.o");
+    return code == 0;
+}
+
 void Configure::generateQConfigPri()
 {
     // Generate qconfig.pri
diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h
index 3261f4f80d..8cae9da4f8 100644
--- a/tools/configure/configureapp.h
+++ b/tools/configure/configureapp.h
@@ -175,6 +175,7 @@ private:
 #endif
 
     bool tryCompileProject(const QString &projectPath, const QString &extraOptions = QString());
+    bool compilerSupportsFlag(const QString &compilerAndArgs);
 
     void desc(const char *description, int startingAt = 0, int wrapIndent = 0);
     void desc(const char *option, const char *description, bool skipIndent = false, char fillChar = '.');
-- 
cgit v1.2.3