--- Makefile.am.orig 2026-03-04 13:56:50 UTC +++ Makefile.am @@ -62,12 +62,6 @@ endif other_tests += ${other_tests_x86_64} endif -if CPU_AARCH64 -ARCH=-Daarch64 -libisal_la_SOURCES += ${lsrc_aarch64} -other_tests += ${other_tests_aarch64} -endif - if CPU_PPC64LE ARCH=-Dppc64le libisal_la_SOURCES += ${lsrc_ppc64le} @@ -123,9 +117,6 @@ endif if USE_NASM as_filter = ${srcdir}/tools/nasm-filter.sh endif -if CPU_AARCH64 - as_filter = $(CC) -D__ASSEMBLY__ -endif if CPU_RISCV64 as_filter = $(CC) -D__ASSEMBLY__ endif @@ -135,11 +126,7 @@ AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${A EXTRA_DIST += tools/nasm-cet-filter.sh AM_CFLAGS = ${my_CFLAGS} ${INCLUDE} $(src_include) ${ARCH} ${D} -if CPU_AARCH64 -AM_CCASFLAGS = ${AM_CFLAGS} -else AM_CCASFLAGS = ${asm_args} ${INCLUDE} ${src_include} ${DEFS} ${D} -endif if CPU_RISCV64 AM_CCASFLAGS = ${AM_CFLAGS} endif --- configure.ac.orig 2026-03-04 13:56:50 UTC +++ configure.ac @@ -26,14 +26,11 @@ AS_CASE([$host_cpu], AS_CASE([$host_cpu], [x86_64], [CPU="x86_64"], [amd64], [CPU="x86_64"], - [aarch64], [CPU="aarch64"], - [arm64], [CPU="aarch64"], [powerpc64le], [CPU="ppc64le"], [ppc64le], [CPU="ppc64le"], [riscv64], [CPU="riscv64"], ) AM_CONDITIONAL([CPU_X86_64], [test "$CPU" = "x86_64"]) -AM_CONDITIONAL([CPU_AARCH64], [test "$CPU" = "aarch64"]) AM_CONDITIONAL([CPU_PPC64LE], [test "$CPU" = "ppc64le"]) AM_CONDITIONAL([CPU_RISCV64], [test "$CPU" = "riscv64"]) AM_CONDITIONAL([CPU_UNDEFINED], [test "x$CPU" = "x"])