From 248903f9e0207ec682aaaac9cd2284b4052e13e4 Mon Sep 17 00:00:00 2001 From: Anders Jenbo Date: Wed, 20 Dec 2023 18:00:33 +0100 Subject: [PATCH] Lower optimizations for Amiga because of compiler bugs --- .github/workflows/amiga-m68k.yml | 2 +- CMake/platforms/amiga.cmake | 6 +++--- Packaging/amiga/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/amiga-m68k.yml b/.github/workflows/amiga-m68k.yml index 38188ce93..aef428b5b 100644 --- a/.github/workflows/amiga-m68k.yml +++ b/.github/workflows/amiga-m68k.yml @@ -41,7 +41,7 @@ jobs: -B build \ -G Ninja \ -DCMAKE_BUILD_TYPE=Release \ - -DM68K_COMMON="-s -fbbb=- -ffast-math" \ + -DM68K_COMMON="-s -ffast-math" \ -DM68K_CPU=68040 \ -DM68K_FPU=hard diff --git a/CMake/platforms/amiga.cmake b/CMake/platforms/amiga.cmake index 68fb0fe6c..290fb2207 100644 --- a/CMake/platforms/amiga.cmake +++ b/CMake/platforms/amiga.cmake @@ -8,9 +8,9 @@ set(SDL1_VIDEO_MODE_BPP 8) set(DEVILUTIONX_SYSTEM_BZIP2 OFF) set(DEVILUTIONX_SYSTEM_ZLIB OFF) -# Lower the optimization level to O2 because there are issues with O3. -set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2") -set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O2") +# Lower the optimization level to O1 because there are issues with O2 and O3. +set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O1") +set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O1") # `fseeko` fails to link on Amiga. add_definitions(-Dfseeko=fseek) diff --git a/Packaging/amiga/Dockerfile b/Packaging/amiga/Dockerfile index f44c32d91..f97c13d83 100644 --- a/Packaging/amiga/Dockerfile +++ b/Packaging/amiga/Dockerfile @@ -9,5 +9,5 @@ CMD cmake -S. -Bbuild-amiga -DCPACK=ON \ -DCMAKE_BUILD_TYPE=Release \ -DM68K_CPU=68040 \ -DM68K_FPU=hard \ - -DM68K_COMMON="-s -fbbb=- -ffast-math" && \ + -DM68K_COMMON="-s -ffast-math" && \ cmake --build build-amiga -j $(nproc)