From patchwork Thu Mar 21 16:43:24 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: 1914555 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=b17HIu89; 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 4V0rs334Wzz1yWs for ; Fri, 22 Mar 2024 03:44:23 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id B668A38582A4 for ; Thu, 21 Mar 2024 16:44:20 +0000 (GMT) X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id EE206385841F for ; Thu, 21 Mar 2024 16:43:39 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EE206385841F 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 EE206385841F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2607:f8b0:4864:20::62e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711039422; cv=none; b=xM5cpnDrQdnfnAqAGZkUFfdy2ZqPzD+EuIOGq36+aSssj0vBCdJijlGm5QG1drdngQnzx4E7e1rKkP3rkzOE0GdVVdUGW/e5IO9oIUcObjn1FaULPXM+EZFTxp5BskcycMegYgEg6IcdZtjkSRRr2I9GxvB5x5TuNzfWGY1b0hw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1711039422; c=relaxed/simple; bh=D5RkfMc+vM701YUxI3GyXr+K6rzdCFue+1AsrrvFWFQ=; h=DKIM-Signature:From:To:Subject:Date:Message-Id:MIME-Version; b=XZKUC4N/Faolc63cX6RfRJRrzJZ5Etn1EOSUrRxufqiLeS4un5ridv7n5UZYeot43hu3Qf/tWKBmfsGaQGLBmagByh//5MRQj/cej4XezlHmekQvb9yM7H7psUlwJhXyWMXSe4b1lEOlB5Hgn9ws2VtJM7JKvJOBA6h1TqZAdi0= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-pl1-x62e.google.com with SMTP id d9443c01a7336-1e07cd7b798so4884375ad.2 for ; Thu, 21 Mar 2024 09:43:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711039418; x=1711644218; 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=ldGWTj5wNhEbNrMUzXACqwvCJbDUonQwXMVVQbV75Gk=; b=b17HIu89wA0trZCk+Vw/6h3DRfhiGkzyR93SAqZVJNUL6G5m9mQWzm4i9oBsrz+25I bHaBNatUOiZEwJK9Yxp+TQypF0y0ioKRgwZ7wSOOxZWMPq/bzlCxRs8Xdgc+/Q6VXWfU 2Kf51ZUqOLM0dYsZUqQnYICr0RNk7czSX+8wHtfj5/75pswqGdbUIKpuGpjpZsJyCtwq hxDPzU5xfu58QmGrD3waiurCHoOjn3F8wFBP4OtVHDxrtlS104/Ehe9e5j4oLitWDu2j DkSu2d+hlQkgcLjzm/TZacDocHnMWhPpkwc1hjQ8OfQHWQrThzO5LwlssUz8zBv0LuQU VjZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711039418; x=1711644218; 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=ldGWTj5wNhEbNrMUzXACqwvCJbDUonQwXMVVQbV75Gk=; b=YRNPvbH14Nw8n0VY8P9O8bueq4ff43YxiUBXwu74oeBfsK/K6eYKSqANYKrBYL8yl2 SryNMdavhHNtwgQpUcqUSZHftBJZD0hR4l6GozWkJY6dx2p4M91GrlJvmxXW4loDh5BL JSgV2cdvdhz1S8HBe/8w1kyO8EE/TKfbRphrZm5yUm/zPg65epdfJwsj8cuZTFTFZImx bsvKDhBS0YxFNsWTyFa/iO3oeI3b8867xmAi6xNFS5PYhe6sX+HBCPk5h5iv/C9XIyEP zani7wn+n4iGrOMHAZrFoPHL8OHj1UQhbOnJMi0ltTRYV6mqqh6hHNoWsHIAKci/BNkZ qmvQ== X-Gm-Message-State: AOJu0YwlGXqc0Btxm4h2+HZqVLTEOcic4VmJU7oWOjtXp6u1wQEytG5U Xi2i5+wGDhvrMvPqPDbwAuURYlH4FGA5LzPyFui0y3kRIlUEG4qd12LsTVX8NLl+zORyEVQlMaK S X-Google-Smtp-Source: AGHT+IHVuGzbFAcOaLoKd4eb9NyNN5n8hWCYNobGm0OEhEFMYK6FxPMEKDY/7OQENR6TwZvwg2pTuQ== X-Received: by 2002:a17:902:dacf:b0:1e0:26ac:8234 with SMTP id q15-20020a170902dacf00b001e026ac8234mr3205139plx.18.1711039418537; Thu, 21 Mar 2024 09:43:38 -0700 (PDT) Received: from mandiga.. ([2804:1b3:a7c3:1d04:42cc:aea4:27d6:375f]) by smtp.gmail.com with ESMTPSA id q1-20020a170902bd8100b001dd75d4b408sm18074pls.302.2024.03.21.09.43.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 21 Mar 2024 09:43:37 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Cc: "H . J . Lu" Subject: [PATCH v2 5/6] math: Fix i386 and m68k exp10 on static build Date: Thu, 21 Mar 2024 13:43:24 -0300 Message-Id: <20240321164325.539976-6-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240321164325.539976-1-adhemerval.zanella@linaro.org> References: <20240321164325.539976-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-12.5 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 and 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 fbb2987248..ad7fd25995 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