andreas pushed a commit to branch core-packages-team
in repository guix.
commit 8711b54f6b95c86103235b293604a53a76fce966
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Mon Dec 16 09:23:18 2024 +0100
Revert "gnu: gcc-4.7: Fix build with gcc-14."
Touching gcc-4.7 is best avoided as it causes a gcc-mesboot world build.
Also, gcc-4.7 didnt' build with gcc-11 either.
This reverts commit adea36d41ef106633cc74a5b054d8b7e323a8432.
---
gnu/local.mk | 1 -
gnu/packages/gcc.scm | 6 ++----
.../patches/gcc-4.7-ucontext-type-confusion.patch | 25 ----------------------
3 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index 3d64abac54..8b752625e5 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1356,7 +1356,6 @@ dist_patch_DATA =
\
%D%/packages/patches/gcc-cross-environment-variables.patch \
%D%/packages/patches/gcc-cross-gxx-include-dir.patch \
%D%/packages/patches/gcc-fix-texi2pod.patch \
- %D%/packages/patches/gcc-4.7-ucontext-type-confusion.patch \
%D%/packages/patches/gcc-4.8-libsanitizer-fix.patch \
%D%/packages/patches/gcc-4.9-inline.patch \
%D%/packages/patches/gcc-4.9-libsanitizer-fix.patch \
diff --git a/gnu/packages/gcc.scm b/gnu/packages/gcc.scm
index c8c9da5c3d..0dc9793980 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -178,8 +178,7 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
(base32
"10k2k71kxgay283ylbbhhs51cl55zn2q38vj5pk4k950qdnirrlj"))
(patches (search-patches "gcc-4-compile-with-gcc-5.patch"
- "gcc-fix-texi2pod.patch"
-
"gcc-4.7-ucontext-type-confusion.patch"))))
+ "gcc-fix-texi2pod.patch"))))
(build-system gnu-build-system)
;; Separate out the run-time support libraries because all the
@@ -203,8 +202,7 @@ where the OS part is overloaded to denote a specific
ABI---into GCC
;; incompatible with some earlier versions.
;; Force an earlier C++ standard while building.
(cond
- ((or (version-prefix? "4.7" version)
- (version-prefix? "4.8" version))
+ ((version-prefix? "4.8" version)
`(cons "CXX=g++ -std=c++03" ,flags))
((or (version-prefix? "4.9" version)
(version-prefix? "5" version))
diff --git a/gnu/packages/patches/gcc-4.7-ucontext-type-confusion.patch
b/gnu/packages/patches/gcc-4.7-ucontext-type-confusion.patch
deleted file mode 100644
index 406c5d2863..0000000000
--- a/gnu/packages/patches/gcc-4.7-ucontext-type-confusion.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From ef0d1ac2580b43535965eb4b31f077f355660215 Mon Sep 17 00:00:00 2001
-From: Ekaitz Zarraga <eka...@elenq.tech>
-Date: Wed, 30 Mar 2022 13:41:15 +0200
-Subject: [PATCH] Fix ucontext_t issue
-
----
- libgcc/config/i386/linux-unwind.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libgcc/config/i386/linux-unwind.h
b/libgcc/config/i386/linux-unwind.h
-index cd9a9a1e2b6..62ce4e44d54 100644
---- a/libgcc/config/i386/linux-unwind.h
-+++ b/libgcc/config/i386/linux-unwind.h
-@@ -53,7 +53,7 @@ x86_64_fallback_frame_state (struct _Unwind_Context *context,
- if (*(unsigned char *)(pc+0) == 0x48
- && *(unsigned long long *)(pc+1) == RT_SIGRETURN_SYSCALL)
- {
-- struct ucontext *uc_ = context->cfa;
-+ struct ucontext_t *uc_ = context->cfa;
- /* The void * cast is necessary to avoid an aliasing warning.
- The aliasing warning is correct, but should not be a problem
- because it does not alias anything. */
---
-2.46.0
-
