From 00f35b4ae7f94e0fe1c8c77efec401ab5f3c4855 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 22 Oct 2015 12:54:45 -0700 Subject: Move pointer size detection entirely to qprocessordetection.h This commit removes the legacy ptrsize check, which was deficient because it did not work for multiarch systems (when we supported fat OS X binaries) and did not work for bootstrap builds because the size might be different when cross-compiling. Instead, let's rely on the predefined preprocessor macros to detect correctly. As a nice side-effect, this fixes 64-bit Android builds cross-compiled from Windows. Task-number: QTBUG-48932 Change-Id: I1d0f78915b5942aab07cffff140f9a52b9342f23 Reviewed-by: Oswald Buddenhagen Reviewed-by: Erik Verbruggen --- configure | 13 ------------- 1 file changed, 13 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 85de53ca63..16e8fb4402 100755 --- a/configure +++ b/configure @@ -6738,19 +6738,6 @@ if [ "$CFG_FRAMEWORK" = "yes" ]; then echo "#define QT_MAC_FRAMEWORK_BUILD" fi -if [ "$XPLATFORM_MAC" = "yes" ]; then - cat <&3 - echo "#define QT_POINTER_SIZE $?" -fi - if [ "$CFG_ATOMIC64" = "no" ]; then echo "#define QT_NO_STD_ATOMIC64" fi -- cgit v1.2.3 From 317b9e9c5fd4ba318658cce2bdef3ef82e1dd288 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 29 Oct 2015 14:11:29 +0100 Subject: Support for Wayland servers on i.MX6 A wayland compositor on i.MX6 needs to create the wl_display before creating the EGL display. This wl_display then needs to be exposed so that QWaylandCompositor can use it. Change-Id: Id60f6dd2fbba05140ca0671da6f17dbc2ecce3a3 Reviewed-by: Laszlo Agocs --- configure | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'configure') diff --git a/configure b/configure index 16e8fb4402..f60802a9b5 100755 --- a/configure +++ b/configure @@ -681,6 +681,7 @@ CFG_EGLFS_BRCM=no CFG_EGLFS_EGLDEVICE=no CFG_EGLFS_MALI=no CFG_EGLFS_VIV=no +CFG_EGLFS_VIV_WL=no CFG_DIRECTFB=auto CFG_GBM=auto CFG_LINUXFB=auto @@ -5776,6 +5777,11 @@ if [ "$CFG_EGLFS" != "no" ]; then else CFG_EGLFS_VIV=no fi + if [ "$CFG_EGLFS_VIV" = "yes" ] && compileTest qpa/wayland-server "wayland-server"; then + CFG_EGLFS_VIV_WL=yes + else + CFG_EGLFS_VIV_WL=no + fi else CFG_EGLFS="no" fi @@ -6222,6 +6228,9 @@ if [ "$CFG_EGLFS_MALI" = "yes" ]; then fi if [ "$CFG_EGLFS_VIV" = "yes" ]; then QT_CONFIG="$QT_CONFIG eglfs_viv" + if [ "$CFG_EGLFS_VIV_WL" = "yes" ]; then + QT_CONFIG="$QT_CONFIG eglfs_viv_wl" + fi fi # enable openvg @@ -7299,6 +7308,7 @@ report_support " QPA backends:" report_support " DirectFB ............." "$CFG_DIRECTFB" report_support " EGLFS ................" "$CFG_EGLFS" report_support " EGLFS i.MX6 ........" "$CFG_EGLFS_VIV" +report_support " EGLFS i.MX6 Wayland." "$CFG_EGLFS_VIV_WL" report_support " EGLFS EGLDevice ...." "$CFG_EGLFS_EGLDEVICE" report_support " EGLFS GBM .........." "$CFG_EGLFS_GBM" report_support " EGLFS Mali ........." "$CFG_EGLFS_MALI" -- cgit v1.2.3 From 8c5acf6573783fc0f9ca6e7301db52db6efc7741 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20K=C3=BCmmel?= Date: Thu, 29 Oct 2015 14:59:59 +0100 Subject: configure: add link-time-optimization option Windows' configure.exe supports -ltcg since several years, this patch adds -ltcg to Unix's configure script. Change-Id: I3f39086c67c3f4cacd252f63de30e3cfc4aa22bb Reviewed-by: Oswald Buddenhagen --- configure | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'configure') diff --git a/configure b/configure index f60802a9b5..8f4aa8206d 100755 --- a/configure +++ b/configure @@ -703,6 +703,7 @@ CFG_OPENSSL=auto CFG_LIBPROXY=auto CFG_SECURETRANSPORT=auto CFG_PRECOMPILE=auto +CFG_LTCG=no CFG_SEPARATE_DEBUG_INFO=no CFG_REDUCE_EXPORTS=auto CFG_SSE2=auto @@ -1573,6 +1574,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + ltcg) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_LTCG="$VAL" + else + UNKNOWN_OPT=no + fi + ;; separate-debug-info) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_SEPARATE_DEBUG_INFO="$VAL" @@ -2641,6 +2649,9 @@ Additional options: * -no-pch ............ Do not use precompiled header support. -pch ............... Use precompiled header support. + * -no-ltcg Do not use Link Time Code Generation + -ltcg Use Link Time Code Generation. + -no-dbus ........... Do not compile the Qt D-Bus module. + -dbus-linked ....... Compile the Qt D-Bus module and link to libdbus-1. -dbus-runtime ...... Compile the Qt D-Bus module and dynamically load libdbus-1. @@ -6476,6 +6487,10 @@ if [ "$CFG_FORCE_ASSERTS" = "yes" ]; then QT_CONFIG="$QT_CONFIG force_asserts" fi +if [ "$CFG_LTCG" = "yes" ]; then + QMAKE_CONFIG="$QMAKE_CONFIG ltcg" +fi + if [ "$CFG_SANITIZERS" != "none" ]; then QTCONFIG_CONFIG="$QTCONFIG_CONFIG sanitizer" @@ -7232,6 +7247,7 @@ echo " Using C++ standard ..... $CFG_STDCXX" echo " Using gold linker....... $CFG_USE_GOLD_LINKER" echo " Using new DTAGS ........ $CFG_ENABLE_NEW_DTAGS" echo " Using PCH .............. $CFG_PRECOMPILE" +echo " Using LTCG ............. $CFG_LTCG" echo " Target compiler supports:" if [ "$CFG_ARCH" = "i386" -o "$CFG_ARCH" = "x86_64" ]; then echo " SSE2/SSE3/SSSE3 ...... ${CFG_SSE2}/${CFG_SSE3}/${CFG_SSSE3}" -- cgit v1.2.3