From patchwork Wed Mar 27 19:40:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 1916992 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=Xml/TaQx; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4V4cXD4Hpwz1yWr for ; Thu, 28 Mar 2024 06:42:52 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id C8F4D385EC57 for ; Wed, 27 Mar 2024 19:42:50 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pg1-x52d.google.com (mail-pg1-x52d.google.com [IPv6:2607:f8b0:4864:20::52d]) by sourceware.org (Postfix) with ESMTPS id A3032385843A for ; Wed, 27 Mar 2024 19:40:41 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org A3032385843A Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=linaro.org ARC-Filter: OpenARC Filter v1.0.0 sourceware.org A3032385843A Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::52d ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711568445; cv=none; b=Y5K0J1QYzlH+LZNay6MI2+2RJ+ZAjMh0MlGSKEdJyJv3IuLbqoaHWbh2JsGbS2R3dGm3NuibHWPMmKfzfLVIEzp4Ti6dFq+JTrXRstbX+2NpC/5aBxxpBrA+EJunm9Sbiaf5f3YSixeoZXYTYZUJ8vohZFyOTst8CrUOlrTI51c= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711568445; c=relaxed/simple; bh=wHbvmdicYImSDZMFciUEE4a81Gu6In5X3H4kMS5X25o=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=x/qWmQu5sU9UnvPHnF7pZQil2gmF4alfCQWM5fDh9EltJCow1zIjrXzO7nTgULpC2c62kTUru/cLeOcnPxbjT16ePS4F9f+7Eaeean5u55du/t2V7uuTwT/GeSHg7QSNcF3XfuyjYZTtA/lRuyp/K3DGuIvqzLsJOLIG2MMnQic= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pg1-x52d.google.com with SMTP id 41be03b00d2f7-5cdbc4334edso73058a12.3 for ; Wed, 27 Mar 2024 12:40:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711568440; x=1712173240; darn=sourceware.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DnjP5zBH6db4XAECtZPSD0FlQ9mZafYAi0YvzhHcxqE=; b=Xml/TaQx1qN4IaZ2Ypp5DTljZI0T2cTJnEyyMJI2DUAr74T7tIuQo63XaxmxibZJL2 66ZYdawo32+TC1VrZVR/H/7OMThaVbSUgFbsCC35GaU5O1g3D+9mT37Nv5rcBQqC39aU /xETC2/jXkvO6cJBNF78eEWemRDVuDdixRuHriHyXzV4yddd+sK5wyq84B6D10aaJvs5 KdbR/e0+BEQuLfInst8d4ZMgxAUCyLZ1y6uVq9MEbbWwmCxpYe5QdcLlM8DR1LS7j28B s0WT4QOrdnXSWA/RNRp/bscdFNHqhVPFwqcKrE2N8okWDvAqM3QMLobdC6H0nN9IQVcj rPPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711568440; x=1712173240; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DnjP5zBH6db4XAECtZPSD0FlQ9mZafYAi0YvzhHcxqE=; b=S3H/tJkGJlf19OilhkovGsfA39NNFN4jTZU8DSGqZDkQeuSsaTG03hRDGvX7YBnSJl EazktXIwNCk3RnunPeeubvS3sVfu2RI6cN5ju/l3bZHgDHufqg/CAv6w+oyRKwov4ZRe fHZjvzqXiPuk50AqQw1wPOUmyG4ZoSYEaxtRpbv5ktfTQ3BZ5aFqG3dk6vUNjgA9Qfjg LMdlj2yxJ2qDps1fpryyB2vdjo6+FRi+IlMDFBKVmYnnHiCEEHsQuxvH3RkN5jd/D6wb 5qDTAESnkmptzHVmgTomrkgoBHdoPK+aDcgS35TRRLtPuZTUOUsvQQfaPfYXIqSGhlFW Ie0w== X-Gm-Message-State: AOJu0YxhIKeruK+kj4bq6ay3W17YmV3YO3UttMDI4kkLqq9bM0WQ6TMs pHVPD+ZLF+Vaa7bsedrGJuEvoPBDBiT1na+VIGkZusHIHDDRAHRFQKTufFtqhf9NkyRtDnP+VP6 K X-Google-Smtp-Source: AGHT+IH0oqffNyL0N+6isy728TEAYuW+2kllsE+Gw+csBDTy2wbSCO7swZg9o2Tkg8nSs7n9HbZ+dA== X-Received: by 2002:a17:90b:4001:b0:29b:aee2:cc8f with SMTP id ie1-20020a17090b400100b0029baee2cc8fmr726245pjb.9.1711568439973; Wed, 27 Mar 2024 12:40:39 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:b18e:67c4:6248:3d8a:f386]) by smtp.gmail.com with ESMTPSA id p11-20020a17090a348b00b002a091be027esm2277357pjb.31.2024.03.27.12.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 12:40:39 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: Joseph Myers , Florian Weimer , "H . J . Lu" Subject: [PATCH v2 05/10] math: Fix i386 and m68k exp10 on static build Date: Wed, 27 Mar 2024 16:40:19 -0300 Message-Id: <20240327194024.1409677-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240327194024.1409677-1-adhemerval.zanella@linaro.org> References: <20240327194024.1409677-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: libc-alpha-bounces+incoming=patchwork.ozlabs.org@sourceware.org The commit 08ddd26814 removed the static exp10 on i386 and m68k with an empty w_exp10.c (required for the ABIs that uses the newly implementation). This patch fixes by adding the required symbols on the arch-specific w_exp{f}_compat.c implementation. Checked on i686-linux-gnu and with a build for m68k-linux-gnu. --- math/Makefile | 4 +++- sysdeps/i386/fpu/w_exp10_compat.c | 9 +++++++-- sysdeps/m68k/m680x0/fpu/w_exp10_compat.c | 9 +++++++-- 3 files changed, 17 insertions(+), 5 deletions(-) diff --git a/math/Makefile b/math/Makefile index 964bf2be71..f1d210797d 100644 --- a/math/Makefile +++ b/math/Makefile @@ -367,7 +367,9 @@ $(libm-test-c-narrow-obj): $(objpfx)libm-test%.c: libm-test%.inc \ $(PYTHON) gen-libm-test.py -c $< -a auto-libm-test-out$* -C $@ -libm-test-funcs-auto-static = +libm-test-funcs-auto-static = \ + exp10 \ + # libm-test-funcs-auto-static libm-test-funcs-noauto-static = \ fmod \ # libm-test-funcs-noauto-static diff --git a/sysdeps/i386/fpu/w_exp10_compat.c b/sysdeps/i386/fpu/w_exp10_compat.c index b53455386e..49a0e03385 100644 --- a/sysdeps/i386/fpu/w_exp10_compat.c +++ b/sysdeps/i386/fpu/w_exp10_compat.c @@ -1,3 +1,8 @@ /* i386 provides an optimized __ieee754_exp10. */ -#define NO_COMPAT_NEEDED 1 -#include +#ifdef SHARED +# define NO_COMPAT_NEEDED 1 +# include +#else +# include +# include +#endif diff --git a/sysdeps/m68k/m680x0/fpu/w_exp10_compat.c b/sysdeps/m68k/m680x0/fpu/w_exp10_compat.c index 0d3e718626..350f2e4b4d 100644 --- a/sysdeps/m68k/m680x0/fpu/w_exp10_compat.c +++ b/sysdeps/m68k/m680x0/fpu/w_exp10_compat.c @@ -1,3 +1,8 @@ /* m68k provides an optimized __ieee754_exp10. */ -#define NO_COMPAT_NEEDED 1 -#include +#ifdef SHARED +# define NO_COMPAT_NEEDED 1 +# include +#else +# include +# include +#endif