[From nobody Fri Jan 22 12:25:13 2021 Return-path: <uucp@wheatstone.g10code.de> Envelope-to: wk@wheatstone.g10code.de Delivery-date: Thu, 21 Jan 2021 21:00:08 +0100 Received: from uucp by wheatstone.g10code.de with local-rmail (Exim 4.92 #5 (Debian)) id 1l2g7k-0006qp-KU for <wk@wheatstone.g10code.de>; Thu, 21 Jan 2021 21:00:08 +0100 Received: from mail-qv1-xf32.google.com ([2607:f8b0:4864:20::f32]) by kerckhoffs.g10code.com with esmtps (Exim 4.89 #1 (Debian)) id 1l2g6A-0002Wu-7x; Thu, 21 Jan 2021 20:58:30 +0100 Received: by mail-qv1-xf32.google.com with SMTP id et9so1527492qvb.10; Thu, 21 Jan 2021 11:58:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version; bh=D+xeMieiD1rEocB/tvxucpNFJ5FGhg4xGofwur8qXPQ=; b=EqyCm/myYG0ZcIXIMuyp3Nh8EX7fYI3QzwyHIHzIyNDVLeLBfsOE/6egg3HHXkl+3B XbbcW6qRCP6KTTNcxjVA9nR9KOgZVYhtl9B6XgZ/VZdCfiA1/5f7ENEdAFV4WVK8jTTW 1nMsO7VM9BSEM5YWsy5eUia14g0/CVg14tWS17dLaomK+djZ6HtR0PBtYfpQFjlhqNRz nOm/S8k8MWFWvyCrP1UFo0l2ISfZFm9cPQA8d6EY51AfWgYYDmVqJypLH2efY7cVUb18 PJ1LcUt9lx3fmRbGRVJK6lP5mJl3DNOK4iOPwVMTB9ucHvyK/7tmkY6d4xCvyFQg0Cfr Pyow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version; bh=D+xeMieiD1rEocB/tvxucpNFJ5FGhg4xGofwur8qXPQ=; b=rSZ/6BHIV5bu9wJ3Qym1JQiKxHQrBbasWxSSi8cw9KPOIFti88vSudL/Qwd2U53Smt 0FwpKh5O5kSy7WJ/s/Gxi9aaC7A4aLWVRYmsR469iO6HPyW0Tv6ap+cM4QOJUxSviyiW 0SjNi22n2gLhyaf+EyJ6LpkskoTLF9fs/c71iETkSthlIK1rLp25aaqvgS6KaVH2crz6 jaTlIUgSEAQqVpZ3ebBXfverHfyV6WREL/OWJCfQd3m7s/8HcSpxrerOq4saPWFqpoCw CGZ9C/ABJ+KnZ7jhP8LW+N+G3qRdaiPlcEnWFQ0mUgWIw6WdY2Qags0dYfUH80iyOAUz 2A+Q== X-Gm-Message-State: AOAM530jF20T6y3hp3glQkszYH5BiScoBl25sazgPIwUaN2Lp1BDsDP8 3NfKUQT7YCc/UnMkBhxnoDwsGv2uz8k= X-Google-Smtp-Source: ABdhPJy6TxB1mEOIOXm6j4xWA4Cl+3YagnVHGzpU406rH3NfhRkZKQWbVmsR7OSC9PKXogbUBFnyyw== X-Received: by 2002:a05:6214:15c1:: with SMTP id p1mr1236128qvz.8.1611259108134; Thu, 21 Jan 2021 11:58:28 -0800 (PST) Received: from callisto (c-73-175-137-55.hsd1.pa.comcast.net. [73.175.137.55]) by smtp.gmail.com with ESMTPSA id x72sm1923764qka.51.2021.01.21.11.58.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Jan 2021 11:58:27 -0800 (PST) From: David Michael <fedora.dm0@gmail.com> To: gnupg-devel@gnupg.org Cc: wk@gnupg.org Subject: [PATCH libgcypt 2/2] cipher/poly1305: Fix 32-bit x86 compilation Date: Thu, 21 Jan 2021 14:58:26 -0500 Message-ID: <87ft2ugizh.fsf@gmail.com> X-Sender-Host: mail-qv1-xf32.google.com MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * cipher/poly1305.c [HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS]: Also conditionalize on whether __arm__ is defined. =2D- When building for i686, configure detects that the assembler can use the different architectures, so it defined everything under the HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS conditional block. Since that block is first and the following x86 block only defines UMUL_ADD_32 if it's not already defined, the lto-wrapper failed during linking with a pile of "no such instruction: umlal ..." errors. Gating on __arm__ prevents that initial defintion and fixes the errors. =2D-- cipher/poly1305.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cipher/poly1305.c b/cipher/poly1305.c index 6cb4d2b7..d9706ced 100644 =2D-- a/cipher/poly1305.c +++ b/cipher/poly1305.c @@ -289,7 +289,7 @@ static unsigned int poly1305_final (poly1305_context_t = *ctx, =20 #ifdef USE_MPI_32BIT =20 =2D#ifdef HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS +#if defined (__arm__) && defined (HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS) =20 /* HI:LO +=3D A * B (arm) */ #define UMUL_ADD_32(HI, LO, A, B) \ @@ -308,7 +308,7 @@ static unsigned int poly1305_final (poly1305_context_t = *ctx, : "r" (B0), "r" (B1), "r" (B2), "r" (B3), "r" (B4) \ : "cc" ) =20 =2D#endif /* HAVE_COMPATIBLE_GCC_ARM_PLATFORM_AS */ +#endif /* __arm__ */ =20 #if defined (__i386__) && __GNUC__ >=3D 4 =20 =2D-=20 2.26.2 ]