summaryrefslogtreecommitdiff
path: root/packages/glibc/2.28
diff options
context:
space:
mode:
authorAlexey Neyman <stilor@att.net>2022-02-14 08:11:42 (GMT)
committerGitHub <noreply@github.com>2022-02-14 08:11:42 (GMT)
commit681aaef1f1ff39c341fdc529e0db2c14639a58d8 (patch)
treece98c2b3d9648db065d27add325370392a35d584 /packages/glibc/2.28
parentba680a3e5b8c62a7c1554e71f6d09903dac95a2f (diff)
parent86c2982568de1ad4d4cc12a65b19231331484405 (diff)
Merge pull request #1674 from stilor/master
Updates to make `ct-ng build-all` pass
Diffstat (limited to 'packages/glibc/2.28')
-rw-r--r--packages/glibc/2.28/0001-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch18
-rw-r--r--packages/glibc/2.28/0002-Fix-build-with-GCC-10-when-long-double-double.patch9
2 files changed, 7 insertions, 20 deletions
diff --git a/packages/glibc/2.28/0001-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch b/packages/glibc/2.28/0001-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch
index b3c82e1..faface3 100644
--- a/packages/glibc/2.28/0001-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch
+++ b/packages/glibc/2.28/0001-x86-Assume-enable-cet-if-GCC-defaults-to-CET-BZ-2522.patch
@@ -10,16 +10,13 @@ references to _dl_cet_check and _dl_open_check.
(cherry picked from commit 9fb8139079ef0bb1aa33a4ae418cbb113b9b9da7)
---
- NEWS | 1 +
- configure | 23 ++++++++++++++++++++++-
- configure.ac | 9 ++++++++-
- 3 files changed, 31 insertions(+), 2 deletions(-)
+ configure | 23 ++++++++++++++++++++++-
+ configure.ac | 9 ++++++++-
+ 2 files changed, 30 insertions(+), 2 deletions(-)
-diff --git a/configure b/configure
-index fde57d63fe..c02753c0fe 100755
--- a/configure
+++ b/configure
-@@ -3762,11 +3762,32 @@ else
+@@ -3762,11 +3762,32 @@
fi
@@ -53,11 +50,9 @@ index fde57d63fe..c02753c0fe 100755
fi
-diff --git a/configure.ac b/configure.ac
-index 014e09a5d5..139554b94a 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -464,11 +464,18 @@ AC_ARG_ENABLE([mathvec],
+@@ -464,11 +464,18 @@
[build_mathvec=$enableval],
[build_mathvec=notset])
@@ -77,6 +72,3 @@ index 014e09a5d5..139554b94a 100644
# We keep the original values in `$config_*' and never modify them, so we
# can write them unchanged into config.make. Everything else uses
---
-2.20.1
-
diff --git a/packages/glibc/2.28/0002-Fix-build-with-GCC-10-when-long-double-double.patch b/packages/glibc/2.28/0002-Fix-build-with-GCC-10-when-long-double-double.patch
index ca0d8a7..6eeb460 100644
--- a/packages/glibc/2.28/0002-Fix-build-with-GCC-10-when-long-double-double.patch
+++ b/packages/glibc/2.28/0002-Fix-build-with-GCC-10-when-long-double-double.patch
@@ -25,14 +25,12 @@ irrelevant for other reasons).
Tested with build-many-glibcs.py for arm-linux-gnueabi (compilers and
glibcs builds), where it fixes the build that previously failed.
---
- math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++
+ math/Makefile | 122 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 122 insertions(+)
-diff --git a/math/Makefile b/math/Makefile
-index 84a8b94c74..0a5a40430e 100644
--- a/math/Makefile
+++ b/math/Makefile
-@@ -650,6 +650,128 @@ ifneq ($(long-double-fcts),yes)
+@@ -664,6 +664,128 @@
# We won't compile the `long double' code at all. Tell the `double' code
# to define aliases for the `FUNCl' names.
math-CPPFLAGS += -DNO_LONG_DOUBLE
@@ -161,6 +159,3 @@ index 84a8b94c74..0a5a40430e 100644
endif
# These files quiet sNaNs in a way that is optimized away without
---
-2.25.1
-