70/74: Revert "gnu: gcc-4.7: Fix build with gcc-14."

[guix-commits]

janneke pushed a commit to branch core-packages-team
in repository guix.

commit c223e37964f44080da7101325413c317ac4d56e1
Author: Janneke Nieuwenhuizen <janneke@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                               |  7 ++----
 .../patches/gcc-4.7-ucontext-type-confusion.patch  | 25 ----------------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 57b98f8359..d95490ceb3 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1327,7 +1327,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/gcc-cross-gxx-include-dir.patch          \
   %D%/packages/patches/gcc-fix-texi2pod.patch                  \
   %D%/packages/patches/gcc-build-with-gcc-14.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 006f5638db..d1daa4bc36 100644
--- a/gnu/packages/gcc.scm
+++ b/gnu/packages/gcc.scm
@@ -177,9 +177,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-build-with-gcc-14.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 +201,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 <ekaitz@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
-