diff options
| -rw-r--r-- | configure.json | 2 | ||||
| -rw-r--r-- | mkspecs/common/ghs-base.conf | 13 | ||||
| -rw-r--r-- | mkspecs/common/ghs-integrity-armv7.conf | 2 | ||||
| -rw-r--r-- | src/corelib/global/qprocessordetection.h | 7 | ||||
| -rw-r--r-- | src/gui/configure.json | 1 |
5 files changed, 17 insertions, 8 deletions
diff --git a/configure.json b/configure.json index 51eab72df2..70b406b6a7 100644 --- a/configure.json +++ b/configure.json @@ -481,7 +481,7 @@ }, "use_gold_linker": { "label": "Using gold linker", - "condition": "!config.msvc && tests.use_gold_linker", + "condition": "!config.msvc && !config.integrity && tests.use_gold_linker", "output": [ "privateConfig", "useGoldLinker" ] }, "architecture": { diff --git a/mkspecs/common/ghs-base.conf b/mkspecs/common/ghs-base.conf index ad452ecc43..b6c9654725 100644 --- a/mkspecs/common/ghs-base.conf +++ b/mkspecs/common/ghs-base.conf @@ -17,7 +17,7 @@ QMAKE_CFLAGS_APP += QMAKE_CFLAGS_YACC += -Wno-unused -Wno-parentheses QMAKE_CFLAGS_HIDESYMS += -QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_implicit_include --link_once_templates -non_shared --exceptions --new_outside_of_constructor +QMAKE_CXXFLAGS += $$QMAKE_CFLAGS --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor QMAKE_CXXFLAGS_DEPS += $$QMAKE_CFLAGS_DEPS QMAKE_CXXFLAGS_WARN_ON += $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF += $$QMAKE_CFLAGS_WARN_OFF @@ -29,11 +29,14 @@ QMAKE_CXXFLAGS_STATIC_LIB += $$QMAKE_CFLAGS_STATIC_LIB QMAKE_CXXFLAGS_APP += $$QMAKE_CFLAGS_APP QMAKE_CXXFLAGS_YACC += $$QMAKE_CFLAGS_YACC QMAKE_CXXFLAGS_HIDESYMS += $$QMAKE_CFLAGS_HIDESYMS -QMAKE_CXXFLAGS_CXX11 += --c++11 --thread_local_storage +QMAKE_CXXFLAGS_CXX11 += --c++11 --thread_local_storage +QMAKE_CXXFLAGS_EXCEPTIONS_ON += --exceptions -QMAKE_LFLAGS += --no_commons -non_shared --link_once_templates --exceptions --stdle -QMAKE_LFLAGS_RELEASE += -Ospeed -Olink -uvfd +QMAKE_LFLAGS += --signed_fields --no_commons --no_implicit_include --link_once_templates -non_shared --new_outside_of_constructor +QMAKE_LFLAGS_DEBUG += -g -Omaxdebug +QMAKE_LFLAGS_RELEASE += -Ospeed -Olink -Omax -uvfd QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_LFLAGS_RELEASE -g +QMAKE_LFLAGS_CXX11 += --c++11 --thread_local_storage +QMAKE_LFLAGS_EXCEPTIONS_ON += --exceptions QMAKE_LIBS_CORE = -lposix -livfs -lsocket -lnet -ldl -QMAKE_LIBS_GUI = -lfbdev -lhiddev diff --git a/mkspecs/common/ghs-integrity-armv7.conf b/mkspecs/common/ghs-integrity-armv7.conf index f678edb958..0c39e8ccdf 100644 --- a/mkspecs/common/ghs-integrity-armv7.conf +++ b/mkspecs/common/ghs-integrity-armv7.conf @@ -14,4 +14,6 @@ QMAKE_CXX = cxintarm -bsp $$(INTEGRITY_BSP) -os_dir $$(INTEGRITY_D QMAKE_LINK = $$QMAKE_CXX QMAKE_AR = $$QMAKE_CXX -archive -o +QMAKE_LIBS_GUI = -lfbdev -lhiddev + load(qt_config) diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index 566d76d3d2..9fb3473ed3 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -107,14 +107,17 @@ # define Q_PROCESSOR_ARM __TARGET_ARCH_ARM # elif defined(_M_ARM) && _M_ARM > 1 # define Q_PROCESSOR_ARM _M_ARM -# elif defined(__ARM64_ARCH_8__) || defined(__aarch64__) +# elif defined(__ARM64_ARCH_8__) \ + || defined(__aarch64__) \ + || defined(__CORE_CORTEXAV8__) // GHS-specific for INTEGRITY # define Q_PROCESSOR_ARM 8 # elif defined(__ARM_ARCH_7__) \ || defined(__ARM_ARCH_7A__) \ || defined(__ARM_ARCH_7R__) \ || defined(__ARM_ARCH_7M__) \ || defined(__ARM_ARCH_7S__) \ - || defined(_ARM_ARCH_7) + || defined(_ARM_ARCH_7) \ + || defined(__CORE_CORTEXA__) // GHS-specific for INTEGRITY # define Q_PROCESSOR_ARM 7 # elif defined(__ARM_ARCH_6__) \ || defined(__ARM_ARCH_6J__) \ diff --git a/src/gui/configure.json b/src/gui/configure.json index 7efaaff505..f862b5866c 100644 --- a/src/gui/configure.json +++ b/src/gui/configure.json @@ -1098,6 +1098,7 @@ QMAKE_LIBDIR_OPENGL[_ES2] and QMAKE_LIBS_OPENGL[_ES2] in the mkspec for your pla }, "linuxfb", "mirclient", { + "type": "feature", "message": "INTEGRITY framebuffer", "condition": "config.integrity", "args": "integrityfb" |