Merge pull request #3610 from cmitu/lzdoom-armed

lzdoom: fix the build for RPI1/ARMv6 platforms

Author: joolswills

scriptmodules/ports/lzdoom.sh

@@ -27,16 +27,19 @@ function depends_lzdoom() {
 
 function sources_lzdoom() {
     gitPullOrClone
+    if isPlatform "arm"; then
+        # patch the CMake build file to remove the ARMv8 options, we handle `gcc`'s CPU flags ourselves
+        applyPatch "$md_data/01_remove_cmake_arm_options.diff"
+        # patch the 21.06 version of LZMA-SDK to disable the CRC32 ARMv8 intrinsics forced for ARM CPUs
+        applyPatch "$md_data/02_lzma_sdk_dont_force_arm_crc32.diff"
+    fi
 }
 
 function build_lzdoom() {
     rm -rf release
     mkdir -p release
     cd release
-    local params=(-DCMAKE_INSTALL_PREFIX="$md_inst" -DCMAKE_BUILD_TYPE=Release)
-    if isPlatform "armv8"; then
-        params+=(-DUSE_ARMV8=On)
-    fi
+    local params=(-DCMAKE_INSTALL_PREFIX="$md_inst" -DPK3_QUIET_ZIPDIR=ON -DCMAKE_BUILD_TYPE=Release)
     # Note: `-funsafe-math-optimizations` should be avoided, see: https://forum.zdoom.org/viewtopic.php?f=7&t=57781
     cmake "${params[@]}" ..
     make

scriptmodules/ports/lzdoom/01_remove_cmake_arm_options.diff

@@ -0,0 +1,21 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 5b3e777..0bce388 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -334,16 +334,6 @@ if( ZD_CMAKE_COMPILER_IS_GNUCXX_COMPATIBLE )
+ 	set( CMAKE_C_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -ffp-contract=off ${CMAKE_C_FLAGS}" )
+ 	set( CMAKE_CXX_FLAGS "-Wall -Wextra -Wno-unused -Wno-unused-parameter -Wno-missing-field-initializers -ffp-contract=off ${CMAKE_CXX_FLAGS}" )
+ 
+-	# ARM processors (Raspberry Pi, et al) - enable ARM NEON support.
+-	if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
+-		set (USE_ARMV8 0 CACHE BOOL "Use ARMv8 instructions - Raspberry Pi 3")
+-		if (USE_ARMV8)
+-			set( CMAKE_CXX_FLAGS "-mcpu=cortex-a53 -mfpu=neon-fp-armv8 -mtune=cortex-a53 -mhard-float -DNO_SSE ${CMAKE_CXX_FLAGS}" )
+-		else ()
+-			set( CMAKE_CXX_FLAGS "-mcpu=cortex-a7 -mfpu=neon-vfpv4 -mtune=cortex-a7 -mhard-float -DNO_SSE ${CMAKE_CXX_FLAGS}" )
+-		endif ()
+-	endif ()
+-
+ 	if( NOT X64 AND NOT CAN_DO_MFPMATH )
+ 		set( CMAKE_C_FLAGS "-DNO_SSE ${CMAKE_C_FLAGS}" )
+ 		set( CMAKE_CXX_FLAGS "-DNO_SSE ${CMAKE_CXX_FLAGS}" )

scriptmodules/ports/lzdoom/02_lzma_sdk_dont_force_arm_crc32.diff

@@ -0,0 +1,17 @@
+diff --git a/libraries/lzma/C/7zCrc.c b/libraries/lzma/C/7zCrc.c
+index f186324..f3ae7be 100644
+--- a/libraries/lzma/C/7zCrc.c
++++ b/libraries/lzma/C/7zCrc.c
+@@ -83,12 +83,6 @@ UInt32 MY_FAST_CALL CrcUpdateT1(UInt32 v, const void *data, size_t size, const U
+     #endif
+   #elif (defined(__clang__) && (__clang_major__ >= 3)) \
+      || (defined(__GNUC__) && (__GNUC__ > 4))
+-      #if !defined(__ARM_FEATURE_CRC32)
+-        #define __ARM_FEATURE_CRC32 1
+-          #if (!defined(__clang__) || (__clang_major__ > 3)) // fix these numbers
+-            #define ATTRIB_CRC __attribute__((__target__("arch=armv8-a+crc")))
+-          #endif
+-      #endif
+       #if defined(__ARM_FEATURE_CRC32)
+         #define USE_ARM64_CRC
+         #include <arm_acle.h>