Merge pull request #465 from JohnnyonFlame/master

Fixes for GOA_CLONE aarch64 target
ptitSeb · Jul 15, 2024 · 4acb49c · 4acb49c
2 parents 4bba817 + 5ebc0e0
commit 4acb49c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -94,7 +94,12 @@ endif()
 # GOA_CLONE
 if(GOA_CLONE)
  add_definitions(-DGOA_CLONE)
- add_definitions(-mcpu=cortex-a35 -mfpu=neon-vfpv3 -march=armv8-a+crc+simd+crypto -mfloat-abi=hard -ftree-vectorize -fsingle-precision-constant -ffast-math)
+ if(NOT ${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64")
+ add_definitions(-mfpu=neon-vfpv3 -mfloat-abi=hard)
+ endif()
+ add_definitions(-mcpu=cortex-a35 -march=armv8-a+crc+simd+crypto -ftree-vectorize -fsingle-precision-constant -ffast-math)
+ set(NO_GBM OFF)
+ set(NOX11 ON)
  set(EGL_WRAPPER ON)
  set(GLX_STUBS ON)
 endif()

diff --git a/src/gl/init.c b/src/gl/init.c
@@ -33,7 +33,7 @@ void fpe_shader_reset_internals();
 
 globals4es_t globals4es = {0};
 
-#if defined(PANDORA) || defined(CHIP) || defined(GOA_CLONE)
+#if defined(PANDORA) || defined(CHIP) || (defined(GOA_CLONE) && !defined(__aarch64__))
 static void fast_math() {
  // enable Cortex A8 RunFast
  int v = 0;
@@ -390,7 +390,7 @@ void initialize_gl4es() {
  }
 
  if(IsEnvVarTrue("LIBGL_FASTMATH")) {
-#if defined(PANDORA) || defined(CHIP) || defined(GOA_CLONE)
+#if defined(PANDORA) || defined(CHIP) || (defined(GOA_CLONE) && !defined(__aarch64__))
  SHUT_LOGD("Enable FastMath for cortex-a8\n");
  fast_math();
 #else