Switch to a cleaner update, hopefully fix builds

This commit is contained in:
Michael Kolupaev 2024-06-20 22:59:36 +00:00
parent 8115926eb6
commit 06781efcb7
2 changed files with 11 additions and 4 deletions

2
contrib/zlib-ng vendored

@ -1 +1 @@
Subproject commit bfb184bb0fbdabe82f3a36d209e56c3e2c33866a Subproject commit c19ba056b7cc8029bb80f509956090c7ded58032

View File

@ -15,6 +15,7 @@ add_definitions(-DHAVE_VISIBILITY_INTERNAL)
add_definitions(-DHAVE_BUILTIN_CTZ) add_definitions(-DHAVE_BUILTIN_CTZ)
add_definitions(-DHAVE_BUILTIN_CTZLL) add_definitions(-DHAVE_BUILTIN_CTZLL)
add_definitions(-DHAVE_ATTRIBUTE_ALIGNED) add_definitions(-DHAVE_ATTRIBUTE_ALIGNED)
add_definitions(-DHAVE_POSIX_MEMALIGN)
set(ZLIB_ARCH_SRCS) set(ZLIB_ARCH_SRCS)
set(ZLIB_ARCH_HDRS) set(ZLIB_ARCH_HDRS)
@ -44,10 +45,16 @@ if(ARCH_AARCH64)
elseif(ARCH_PPC64LE) elseif(ARCH_PPC64LE)
set(ARCHDIR "${SOURCE_DIR}/arch/power") set(ARCHDIR "${SOURCE_DIR}/arch/power")
add_definitions(-DPOWER8)
add_definitions(-DPOWER_FEATURES) add_definitions(-DPOWER_FEATURES)
add_definitions(-DPOWER8_VSX) add_definitions(-DHAVE_SYS_AUXV_H)
add_definitions(-DPOWER8_VSX_CRC32)
if(POWER9)
add_definitions(-DPOWER9)
else()
add_definitions(-DPOWER8)
add_definitions(-DPOWER8_VSX)
add_definitions(-DPOWER8_VSX_CRC32)
endif()
list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/power_features.h) list(APPEND ZLIB_ARCH_HDRS ${ARCHDIR}/power_features.h)
list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/power_features.c) list(APPEND ZLIB_ARCH_SRCS ${ARCHDIR}/power_features.c)