From 87d12f7f2178b1604635ec9beead5dc0a3fa74ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 5 Oct 2022 16:16:21 +0200 Subject: [PATCH] Fix build with SPARC Solaris MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I8969d7950f7c5b6164f87ab37f1089b7bc8cae8b Done-by: Petr Šumbera Pick-to: 6.4 Fixes: QTBUG-107178 Reviewed-by: Thiago Macieira --- src/corelib/global/qprocessordetection.h | 2 +- src/corelib/plugin/qelfparser_p.cpp | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index 15fda91c43..34d39512e9 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -294,7 +294,7 @@ */ #elif defined(__sparc__) # define Q_PROCESSOR_SPARC -# if defined(__sparc_v9__) +# if defined(__sparc_v9__) || defined(__sparcv9) # define Q_PROCESSOR_SPARC_V9 # endif # if defined(__sparc64__) diff --git a/src/corelib/plugin/qelfparser_p.cpp b/src/corelib/plugin/qelfparser_p.cpp index b0c23d58b6..2890e55311 100644 --- a/src/corelib/plugin/qelfparser_p.cpp +++ b/src/corelib/plugin/qelfparser_p.cpp @@ -128,10 +128,8 @@ struct ElfMachineCheck #elif defined(Q_PROCESSOR_SH) EM_SH #elif defined(Q_PROCESSOR_SPARC_V9) -# warning "Please confirm that this is correct for Linux and Solaris" EM_SPARCV9 #elif defined(Q_PROCESSOR_SPARC_64) -# warning "Please confirm that this is correct for Linux and Solaris" EM_SPARCV9 #elif defined(Q_PROCESSOR_SPARC) EM_SPARC