mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 07:16:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
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.
This commit is contained in:
Janneke Nieuwenhuizen 2024-12-16 09:23:18 +01:00
parent 93e1174820
commit 83a21076d2
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
3 changed files with 2 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
gnu/local.mk
View file

@ -1338,7 +1338,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 \

6
gnu/packages/gcc.scm
View file

@ -177,8 +177,7 @@ (define-public gcc-4.7
(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
@ -202,8 +201,7 @@ (define-public gcc-4.7
;; 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))

25
gnu/packages/patches/gcc-4.7-ucontext-type-confusion.patch
View file

@ -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