b30ff9539f
Upstream commit: 4bdcc1963bc2b5ba5f8e319e402d9eb2cb6096c1 - manual: make setrlimit() description less ambiguous - manual/stdio: Clarify putc and putwc - malloc: add multi-threaded tests for aligned_alloc/calloc/malloc - malloc: avoid global locks in tst-aligned_alloc-lib.c - resolv: Track single-request fallback via _res._flags (bug 31476) - resolv: Do not wait for non-existing second DNS response after error (bug 30081) - resolv: Allow short error responses to match any query (bug 31890) - elf: Fix localplt.awk for DT_RELR-enabled builds (BZ 31978) - Fix usage of _STACK_GROWS_DOWN and _STACK_GROWS_UP defines [BZ 31989] - Linux: Make __rseq_size useful for feature detection (bug 31965) - elf: Make dl-rseq-symbols Linux only - nptl: fix potential merge of __rseq_* relro symbols - s390x: Fix segfault in wcsncmp [BZ #31934] - stdlib: fix arc4random fallback to /dev/urandom (BZ 31612) - math: Provide missing math symbols on libc.a (BZ 31781) - math: Fix isnanf128 static build (BZ 31774) - math: Fix i386 and m68k exp10 on static build (BZ 31775) - math: Fix i386 and m68k fmod/fmodf on static build (BZ 31488) - posix: Fix pidfd_spawn/pidfd_spawnp leak if execve fails (BZ 31695)
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
commit 3950cbd7a18b48c0f272ca41fa60cc135ff3175a
|
|
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
|
|
Date: Wed Mar 20 11:31:54 2024 -0300
|
|
|
|
math: Fix i386 and m68k exp10 on static build (BZ 31775)
|
|
|
|
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.
|
|
|
|
Reviewed-by: Aurelien Jarno <aurelien@aurel32.net>
|
|
(cherry picked from commit 1f09aae36aa185b8b1100dfa6b776442279bf580)
|
|
|
|
diff --git a/sysdeps/i386/fpu/w_exp10_compat.c b/sysdeps/i386/fpu/w_exp10_compat.c
|
|
index b53455386ed8e189..49a0e03385e4bfe3 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 <math/w_exp10_compat.c>
|
|
+#ifdef SHARED
|
|
+# define NO_COMPAT_NEEDED 1
|
|
+# include <math/w_exp10_compat.c>
|
|
+#else
|
|
+# include <math-type-macros-double.h>
|
|
+# include <w_exp10_template.c>
|
|
+#endif
|
|
diff --git a/sysdeps/m68k/m680x0/fpu/w_exp10_compat.c b/sysdeps/m68k/m680x0/fpu/w_exp10_compat.c
|
|
index 0d3e7186261041e3..350f2e4b4d37e569 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 <math/w_exp10_compat.c>
|
|
+#ifdef SHARED
|
|
+# define NO_COMPAT_NEEDED 1
|
|
+# include <math/w_exp10_compat.c>
|
|
+#else
|
|
+# include <math-type-macros-double.h>
|
|
+# include <w_exp10_template.c>
|
|
+#endif
|