diff --git a/libretroBuildSystem/Makefile.libretro b/libretroBuildSystem/Makefile.libretro index 427a611..9f9eba2 100644 --- a/libretroBuildSystem/Makefile.libretro +++ b/libretroBuildSystem/Makefile.libretro @@ -144,6 +144,7 @@ ifeq ($(platform),ios-arm64) else CC = cc -arch armv7 -isysroot $(IOSSDK) EMU_OPTIMIZE_FOR_ARM = 1 + EMU_NEW_ASM_SYNTAX = 1 endif LD = armv7-apple-darwin11-ld diff --git a/qtBuildSystem/Mu/Mu.pro b/qtBuildSystem/Mu/Mu.pro index fdafe10..053ed71 100644 --- a/qtBuildSystem/Mu/Mu.pro +++ b/qtBuildSystem/Mu/Mu.pro @@ -86,7 +86,7 @@ INCLUDEPATH += $$PWD/qt-common/include # only use with ARMv4<->7, ARMv8 is its own architecture optimize_for_arm{ DEFINES += EMU_OPTIMIZE_FOR_ARM - SOURCES += ../../src/m68k/cyclone/CycloneClang.S + SOURCES += ../../src/m68k/cyclone/CycloneNew.S }else{ SOURCES += ../../src/m68k/musashi/m68kcpu.c \ ../../src/m68k/musashi/m68kdasm.c \ diff --git a/src/m68k/cyclone/CycloneClang.S b/src/m68k/cyclone/CycloneNew.S similarity index 100% rename from src/m68k/cyclone/CycloneClang.S rename to src/m68k/cyclone/CycloneNew.S diff --git a/src/m68k/cyclone/CycloneGcc.S b/src/m68k/cyclone/CycloneOld.S similarity index 100% rename from src/m68k/cyclone/CycloneGcc.S rename to src/m68k/cyclone/CycloneOld.S diff --git a/src/makefile.all b/src/makefile.all index 2b996c4..6f40e80 100644 --- a/src/makefile.all +++ b/src/makefile.all @@ -15,10 +15,10 @@ EMU_SOURCES_C := $(EMU_PATH)/emulator.c \ #only use with ARMv4<->7, ARMv8 is its own architecture ifeq ($(EMU_OPTIMIZE_FOR_ARM), 1) EMU_DEFINES += -DEMU_OPTIMIZE_FOR_ARM - ifeq ($(EMU_COMPILER_CLANG), 1) - EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/CycloneClang.S + ifeq ($(EMU_NEW_ASM_SYNTAX), 1) + EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/CycloneNew.S else - EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/CycloneGcc.S + EMU_SOURCES_ASM += $(EMU_PATH)/m68k/cyclone/CycloneOld.S endif else EMU_SOURCES_C += $(EMU_PATH)/m68k/musashi/m68kops.c \