1*4882a593SmuzhiyunFrom c70df6bf52cdcdceb73ed965a28642177df32943 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Khem Raj <raj.khem@gmail.com> 3*4882a593SmuzhiyunDate: Sat, 13 Mar 2021 12:58:32 -0800 4*4882a593SmuzhiyunSubject: [PATCH] Qt3D: Add support to fix build on ppc64 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpstream-Status: Pending 7*4882a593SmuzhiyunSigned-off-by: Khem Raj <raj.khem@gmail.com> 8*4882a593Smuzhiyun--- 9*4882a593Smuzhiyun src/foundation/Qt3DSPreprocessor.h | 2 +- 10*4882a593Smuzhiyun src/foundation/Qt3DSSystem.cpp | 8 +++++++- 11*4882a593Smuzhiyun 2 files changed, 8 insertions(+), 2 deletions(-) 12*4882a593Smuzhiyun 13*4882a593Smuzhiyun--- a/src/foundation/Qt3DSPreprocessor.h 14*4882a593Smuzhiyun+++ b/src/foundation/Qt3DSPreprocessor.h 15*4882a593Smuzhiyun@@ -112,11 +112,11 @@ Platform define 16*4882a593Smuzhiyun #define QT3DS_VMX 17*4882a593Smuzhiyun #elif defined(__x86_64__) 18*4882a593Smuzhiyun #define QT3DS_X64 19*4882a593Smuzhiyun-#elif defined(__ppc__) 20*4882a593Smuzhiyun-#define QT3DS_PPC 21*4882a593Smuzhiyun-#elif defined(__ppc64__) 22*4882a593Smuzhiyun+#elif defined(__powerpc64__) 23*4882a593Smuzhiyun #define QT3DS_PPC 24*4882a593Smuzhiyun #define QT3DS_PPC64 25*4882a593Smuzhiyun+#elif defined(__ppc__) 26*4882a593Smuzhiyun+#define QT3DS_PPC 27*4882a593Smuzhiyun //# elif defined(__aarch64__) 28*4882a593Smuzhiyun //# define QT3DS_ARM_64 29*4882a593Smuzhiyun #else 30*4882a593Smuzhiyun--- a/src/foundation/Qt3DSSystem.cpp 31*4882a593Smuzhiyun+++ b/src/foundation/Qt3DSSystem.cpp 32*4882a593Smuzhiyun@@ -62,6 +62,10 @@ const char *qt3ds::foundation::System::g 33*4882a593Smuzhiyun const char *qt3ds::foundation::System::g_Processor = "x64"; 34*4882a593Smuzhiyun const char *qt3ds::foundation::System::g_BitWidth = "64"; 35*4882a593Smuzhiyun const char *qt3ds::foundation::System::g_FloatingPointModel = ""; 36*4882a593Smuzhiyun+#elif defined(QT3DS_PPC64) 37*4882a593Smuzhiyun+const char *qt3ds::foundation::System::g_Processor = "ppc64"; 38*4882a593Smuzhiyun+const char *qt3ds::foundation::System::g_BitWidth = "64"; 39*4882a593Smuzhiyun+const char *qt3ds::foundation::System::g_FloatingPointModel = ""; 40*4882a593Smuzhiyun #elif defined(QT3DS_ARM) 41*4882a593Smuzhiyun #if defined(__aarch64__) || defined(__ARM64__) 42*4882a593Smuzhiyun const char *qt3ds::foundation::System::g_Processor = "arm"; 43*4882a593Smuzhiyun@@ -79,7 +83,7 @@ const char *qt3ds::foundation::System::g 44*4882a593Smuzhiyun #endif 45*4882a593Smuzhiyun #endif 46*4882a593Smuzhiyun #else 47*4882a593Smuzhiyun-#error "Unknown Platform" 48*4882a593Smuzhiyun+//#error "Unknown Platform" 49*4882a593Smuzhiyun #endif 50*4882a593Smuzhiyun 51*4882a593Smuzhiyun #if defined(QT3DS_ARM) 52*4882a593Smuzhiyun@@ -97,8 +101,10 @@ const char *qt3ds::foundation::System::g 53*4882a593Smuzhiyun const char *qt3ds::foundation::System::g_GPUType = ""; 54*4882a593Smuzhiyun #elif defined(QT3DS_X64) 55*4882a593Smuzhiyun const char *qt3ds::foundation::System::g_GPUType = ""; 56*4882a593Smuzhiyun+#elif defined(QT3DS_PPC64) 57*4882a593Smuzhiyun+const char *qt3ds::foundation::System::g_GPUType = ""; 58*4882a593Smuzhiyun #else 59*4882a593Smuzhiyun-#error "Must define a processor type (QT3DS_ARM or QT3DS_X86)" 60*4882a593Smuzhiyun+//#error "Must define a processor type (QT3DS_ARM or QT3DS_X86)" 61*4882a593Smuzhiyun #endif 62*4882a593Smuzhiyun 63*4882a593Smuzhiyun namespace { 64*4882a593Smuzhiyun@@ -136,4 +142,4 @@ const char *System::getPlatformGLStr() 65*4882a593Smuzhiyun strcpy(text, str.c_str()); 66*4882a593Smuzhiyun } 67*4882a593Smuzhiyun return text; 68*4882a593Smuzhiyun-} 69*4882a593Smuzhiyun\ No newline at end of file 70*4882a593Smuzhiyun+} 71