dev-libs/libgcrypt: backport fix for arm asm

Noticed Alpine pull this in earlier.

Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 307 insertions, 0 deletions

diff --git a/dev-libs/libgcrypt/files/libgcrypt-1.11.0-arm.patch b/dev-libs/libgcrypt/files/libgcrypt-1.11.0-arm.patch
new file mode 100644
index 000000000000..e288d9c5afd3
--- /dev/null
+++ b/dev-libs/libgcrypt/files/libgcrypt-1.11.0-arm.patch
@@ -0,0 +1,127 @@
+https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commit;h=9c93b4607adcf9b3efd53aba43e2d33bf5aef9df
+
+From 9c93b4607adcf9b3efd53aba43e2d33bf5aef9df Mon Sep 17 00:00:00 2001
+From: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+Date: Sun, 4 Aug 2024 18:04:49 +0300
+Subject: [PATCH] mpi/ec-inline: reduce register pressure on 32-bit ARM
+
+* mpi/ec-inline.h [HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS] (ADD4_LIMB32)
+(ADD6_LIMB32, SUB4_LIMB32, SUB6_LIMB32): Reuse input registers
+as output (use just two unique operators).
+--
+
+This fixes building ec-nist.c with GCC-14 on 32-bit ARM.
+
+GnuPG-bug-id: 7226
+Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi>
+--- a/mpi/ec-inline.h
++++ b/mpi/ec-inline.h
+@@ -836,18 +836,18 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo)
+ #ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS
+ 
+ #define ADD4_LIMB32(A3, A2, A1, A0, B3, B2, B1, B0, C3, C2, C1, C0) \
+-  __asm__ ("adds %3, %7, %11\n" \
+-	   "adcs %2, %6, %10\n" \
+-	   "adcs %1, %5, %9\n" \
+-	   "adc  %0, %4, %8\n" \
++  __asm__ ("adds %3, %3, %11\n" \
++	   "adcs %2, %2, %10\n" \
++	   "adcs %1, %1, %9\n" \
++	   "adc  %0, %0, %8\n" \
+ 	   : "=r" (A3), \
+ 	     "=&r" (A2), \
+ 	     "=&r" (A1), \
+ 	     "=&r" (A0) \
+-	   : "r" ((mpi_limb_t)(B3)), \
+-	     "r" ((mpi_limb_t)(B2)), \
+-	     "r" ((mpi_limb_t)(B1)), \
+-	     "r" ((mpi_limb_t)(B0)), \
++	   : "0" ((mpi_limb_t)(B3)), \
++	     "1" ((mpi_limb_t)(B2)), \
++	     "2" ((mpi_limb_t)(B1)), \
++	     "3" ((mpi_limb_t)(B0)), \
+ 	     "Ir" ((mpi_limb_t)(C3)), \
+ 	     "Ir" ((mpi_limb_t)(C2)), \
+ 	     "Ir" ((mpi_limb_t)(C1)), \
+@@ -857,18 +857,18 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo)
+ #define ADD6_LIMB32(A5, A4, A3, A2, A1, A0, B5, B4, B3, B2, B1, B0, \
+ 		    C5, C4, C3, C2, C1, C0) do { \
+     mpi_limb_t __carry6_32; \
+-    __asm__ ("adds %3, %7, %10\n" \
+-	     "adcs %2, %6, %9\n" \
+-	     "adcs %1, %5, %8\n" \
+-	     "adc  %0, %4, %4\n" \
++    __asm__ ("adds %3, %3, %10\n" \
++	     "adcs %2, %2, %9\n" \
++	     "adcs %1, %1, %8\n" \
++	     "adc  %0, %0, %0\n" \
+ 	     : "=r" (__carry6_32), \
+ 	       "=&r" (A2), \
+ 	       "=&r" (A1), \
+ 	       "=&r" (A0) \
+-	     : "r" ((mpi_limb_t)(0)), \
+-	       "r" ((mpi_limb_t)(B2)), \
+-	       "r" ((mpi_limb_t)(B1)), \
+-	       "r" ((mpi_limb_t)(B0)), \
++	     : "0" ((mpi_limb_t)(0)), \
++	       "1" ((mpi_limb_t)(B2)), \
++	       "2" ((mpi_limb_t)(B1)), \
++	       "3" ((mpi_limb_t)(B0)), \
+ 	       "Ir" ((mpi_limb_t)(C2)), \
+ 	       "Ir" ((mpi_limb_t)(C1)), \
+ 	       "Ir" ((mpi_limb_t)(C0)) \
+@@ -878,18 +878,18 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo)
+   } while (0)
+ 
+ #define SUB4_LIMB32(A3, A2, A1, A0, B3, B2, B1, B0, C3, C2, C1, C0) \
+-  __asm__ ("subs %3, %7, %11\n" \
+-	   "sbcs %2, %6, %10\n" \
+-	   "sbcs %1, %5, %9\n" \
+-	   "sbc  %0, %4, %8\n" \
++  __asm__ ("subs %3, %3, %11\n" \
++	   "sbcs %2, %2, %10\n" \
++	   "sbcs %1, %1, %9\n" \
++	   "sbc  %0, %0, %8\n" \
+ 	   : "=r" (A3), \
+ 	     "=&r" (A2), \
+ 	     "=&r" (A1), \
+ 	     "=&r" (A0) \
+-	   : "r" ((mpi_limb_t)(B3)), \
+-	     "r" ((mpi_limb_t)(B2)), \
+-	     "r" ((mpi_limb_t)(B1)), \
+-	     "r" ((mpi_limb_t)(B0)), \
++	   : "0" ((mpi_limb_t)(B3)), \
++	     "1" ((mpi_limb_t)(B2)), \
++	     "2" ((mpi_limb_t)(B1)), \
++	     "3" ((mpi_limb_t)(B0)), \
+ 	     "Ir" ((mpi_limb_t)(C3)), \
+ 	     "Ir" ((mpi_limb_t)(C2)), \
+ 	     "Ir" ((mpi_limb_t)(C1)), \
+@@ -899,18 +899,17 @@ LIMB64_HILO(mpi_limb_t hi, mpi_limb_t lo)
+ #define SUB6_LIMB32(A5, A4, A3, A2, A1, A0, B5, B4, B3, B2, B1, B0, \
+ 		    C5, C4, C3, C2, C1, C0) do { \
+     mpi_limb_t __borrow6_32; \
+-    __asm__ ("subs %3, %7, %10\n" \
+-	     "sbcs %2, %6, %9\n" \
+-	     "sbcs %1, %5, %8\n" \
+-	     "sbc  %0, %4, %4\n" \
++    __asm__ ("subs %3, %3, %9\n" \
++	     "sbcs %2, %2, %8\n" \
++	     "sbcs %1, %1, %7\n" \
++	     "sbc  %0, %0, %0\n" \
+ 	     : "=r" (__borrow6_32), \
+ 	       "=&r" (A2), \
+ 	       "=&r" (A1), \
+ 	       "=&r" (A0) \
+-	     : "r" ((mpi_limb_t)(0)), \
+-	       "r" ((mpi_limb_t)(B2)), \
+-	       "r" ((mpi_limb_t)(B1)), \
+-	       "r" ((mpi_limb_t)(B0)), \
++	     : "1" ((mpi_limb_t)(B2)), \
++	       "2" ((mpi_limb_t)(B1)), \
++	       "3" ((mpi_limb_t)(B0)), \
+ 	       "Ir" ((mpi_limb_t)(C2)), \
+ 	       "Ir" ((mpi_limb_t)(C1)), \
+ 	       "Ir" ((mpi_limb_t)(C0)) \
+-- 
+2.30.2
diff --git a/dev-libs/libgcrypt/libgcrypt-1.11.0-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.11.0-r1.ebuild
new file mode 100644
index 000000000000..7e0c4133725f
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.11.0-r1.ebuild
@@ -0,0 +1,180 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/gnupg.asc
+inherit autotools flag-o-matic linux-info multilib-minimal toolchain-funcs verify-sig
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="https://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+SRC_URI+=" verify-sig? ( mirror://gnupg/${PN}/${P}.tar.bz2.sig )"
+
+LICENSE="LGPL-2.1+ GPL-2+ MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="+asm doc +getentropy static-libs"
+IUSE+=" cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_arm_sve"
+IUSE+=" cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 cpu_flags_ppc_vsx3"
+IUSE+=" cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_avx512f cpu_flags_x86_padlock cpu_flags_x86_sha cpu_flags_x86_sse4_1"
+
+# Build system only has --disable-arm-crypto-support right now
+# If changing this, update src_configure logic too.
+# ARM CPUs seem to, right now, support all-or-nothing for crypto extensions,
+# but this looks like it might change in future. This is just a safety check
+# in case people somehow do have a CPU which only supports some. They must
+# for now disable them all if that's the case.
+REQUIRED_USE="
+	cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 )
+	cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )
+	cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 )
+	cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
+"
+
+RDEPEND="
+	>=dev-libs/libgpg-error-1.49[${MULTILIB_USEDEP}]
+	getentropy? (
+		kernel_linux? (
+			elibc_glibc? ( >=sys-libs/glibc-2.25 )
+			elibc_musl? ( >=sys-libs/musl-1.1.20 )
+		)
+	)
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? ( virtual/texi2dvi )
+	verify-sig? ( sec-keys/openpgp-keys-gnupg )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+	"${FILESDIR}"/${PN}-powerpc-darwin.patch
+	"${FILESDIR}"/${P}-s390x.patch
+	"${FILESDIR}"/${P}-o-flag-munging.patch
+	"${FILESDIR}"/${P}-arm.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} == buildonly ]]; then
+		return
+	fi
+	if use kernel_linux && use getentropy; then
+		unset KV_FULL
+		get_running_version
+		if [[ -n ${KV_FULL} ]] && kernel_is -lt 3 17; then
+			eerror "The getentropy function requires the getrandom syscall."
+			eerror "This was introduced in Linux 3.17."
+			eerror "Your system is currently running Linux ${KV_FULL}."
+			eerror "Disable the 'getentropy' USE flag or upgrade your kernel."
+			die "Kernel is too old for getentropy"
+		fi
+	fi
+}
+
+pkg_setup() {
+	:
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# Sensitive to optimisation; parts of the codebase are built with
+	# -O0 already. Don't risk it with UB.
+	strip-flags
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == powerpc* ]] ; then
+		# ./configure does a lot of automagic, prevent that
+		# generic ppc32+ppc64 altivec
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec=no
+		use cpu_flags_ppc_altivec || local -x gcry_cv_cc_ppc_altivec_cflags=no
+		# power8 vector extension, aka arch 2.07 ISA, also checked below via ppc-crypto-support
+		use cpu_flags_ppc_vsx2 || local -x gcry_cv_gcc_inline_asm_ppc_altivec=no
+		# power9 vector extension, aka arch 3.00 ISA
+		use cpu_flags_ppc_vsx3 || local -x gcry_cv_gcc_inline_asm_ppc_arch_3_00=no
+	fi
+
+	# Workaround for GCC < 11.3 bug
+	# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=commitdiff;h=0b399721ce9709ae25f9d2050360c5ab2115ae29
+	# https://dev.gnupg.org/T5581
+	# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102124
+	if use arm64 && tc-is-gcc && (($(gcc-major-version) == 11)) &&
+		(($(gcc-minor-version) <= 2)) && (($(gcc-micro-version) == 0)) ; then
+		append-flags -fno-tree-loop-vectorize
+	fi
+
+	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+
+	local myeconfargs=(
+		CC_FOR_BUILD="$(tc-getBUILD_CC)"
+
+		--enable-noexecstack
+		$(use_enable cpu_flags_arm_neon neon-support)
+		# See REQUIRED_USE comment above
+		$(use_enable cpu_flags_arm_aes arm-crypto-support)
+		$(use_enable cpu_flags_arm_sve sve-support)
+		$(use_enable cpu_flags_ppc_vsx2 ppc-crypto-support)
+		$(use_enable cpu_flags_x86_aes aesni-support)
+		$(use_enable cpu_flags_x86_avx avx-support)
+		$(use_enable cpu_flags_x86_avx2 avx2-support)
+		$(use_enable cpu_flags_x86_avx512f avx512-support)
+		$(use_enable cpu_flags_x86_padlock padlock-support)
+		$(use_enable cpu_flags_x86_sha shaext-support)
+		$(use_enable cpu_flags_x86_sse4_1 sse41-support)
+		# required for sys-power/suspend[crypt], bug 751568
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		$(use asm || echo "--disable-asm")
+
+		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
+	)
+
+	if use kernel_linux; then
+		# --enable-random=getentropy requires getentropy/getrandom.
+		# --enable-random=linux enables legacy code that tries getrandom
+		# and falls back to reading /dev/random.
+		myeconfargs+=( --enable-random=$(usex getentropy getentropy linux) )
+	fi
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" \
+		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_test() {
+	# t-secmem and t-sexp need mlock which requires extra privileges; nspawn
+	# at least disallows that by default.
+	local -x GCRYPT_IN_ASAN_TEST=1
+
+	default
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	find "${ED}" -type f -name '*.la' -delete || die
+}