From c5738ca19e4c7bc85dbd178b84cc7a17d1aff4d8 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sat, 29 Aug 2020 08:49:19 -0700 Subject: [PATCH] cmake: Remove outdated ARMV7 define. Was not used anymore, but was defined incorrectly in some armv8 files. --- cmake/Toolchains/beagleboard.cmake | 1 - cmake/Toolchains/generic.armv7.cmake | 2 -- cmake/Toolchains/raspberry.armv7.cmake | 1 - cmake/Toolchains/raspberry.armv8.cmake | 1 - cmake/Toolchains/vero4k.armv8.cmake | 1 - 5 files changed, 6 deletions(-) diff --git a/cmake/Toolchains/beagleboard.cmake b/cmake/Toolchains/beagleboard.cmake index 310d13f071..a8648f26f6 100644 --- a/cmake/Toolchains/beagleboard.cmake +++ b/cmake/Toolchains/beagleboard.cmake @@ -1,4 +1,3 @@ -set(ARMV7 ON) set(USING_FBDEV ON) set(ARCH_FLAGS "-march=armv7-a -mfpu=neon -mcpu=cortex-a8") diff --git a/cmake/Toolchains/generic.armv7.cmake b/cmake/Toolchains/generic.armv7.cmake index 65a60943f4..a87da96179 100644 --- a/cmake/Toolchains/generic.armv7.cmake +++ b/cmake/Toolchains/generic.armv7.cmake @@ -1,5 +1,3 @@ -set(ARMV7 ON) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9") set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -march=armv7-a -mfpu=neon -mcpu=cortex-a9") diff --git a/cmake/Toolchains/raspberry.armv7.cmake b/cmake/Toolchains/raspberry.armv7.cmake index b9a8b46a65..8fa4dc6888 100644 --- a/cmake/Toolchains/raspberry.armv7.cmake +++ b/cmake/Toolchains/raspberry.armv7.cmake @@ -38,5 +38,4 @@ if(NOT PPSSPP_PI_MODEL4) set(USING_FBDEV ON) endif() set(USING_GLES2 ON) -set(ARMV7 ON) set(USE_WAYLAND_WSI OFF) diff --git a/cmake/Toolchains/raspberry.armv8.cmake b/cmake/Toolchains/raspberry.armv8.cmake index c1c8f5fd02..1bac90de9f 100644 --- a/cmake/Toolchains/raspberry.armv8.cmake +++ b/cmake/Toolchains/raspberry.armv8.cmake @@ -38,5 +38,4 @@ if(NOT PPSSPP_PI_MODEL4) set(USING_FBDEV ON) endif() set(USING_GLES2 ON) -set(ARMV7 ON) set(USE_WAYLAND_WSI OFF) diff --git a/cmake/Toolchains/vero4k.armv8.cmake b/cmake/Toolchains/vero4k.armv8.cmake index 28720127b3..9ce852199a 100644 --- a/cmake/Toolchains/vero4k.armv8.cmake +++ b/cmake/Toolchains/vero4k.armv8.cmake @@ -17,6 +17,5 @@ set(EGL_LIBRARIES /opt/vero3/lib/libEGL.so) set(USING_GLES2 ON) set(USING_EGL ON) set(USING_FBDEV ON) -set(ARMV7 ON) set(FORCED_CPU armv7) set(USING_X11_VULKAN OFF CACHE BOOL "" FORCE)