From 5ebc0e06bc7a2abc82ea4356d9174fc0995b1d5d Mon Sep 17 00:00:00 2001
From: JohnnyonFlame <johnnyonflame@hotmail.com>
Date: Sun, 14 Jul 2024 19:19:02 -0300
Subject: [PATCH] Fixes for GOA_CLONE aarch64 target

---
 CMakeLists.txt | 7 ++++++-
 src/gl/init.c  | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ca5636e29..6bef3f37a 100644
--- 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
index 47ad04764..02aff5819 100644
--- 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