[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1010330: gcc-12 fails to build a cross compiler: cross-fixes.diff no longer applies



Source: gcc-12
Version: 12-20220428-1
Tags: patch
User: helmutg@debian.org
Usertags: rebootstrap

Hi Matthias,

cross-fixes.diff no longer applies and that happens to break cross
compiler builds. Please find a patch attached for your convenience.

Helmut
diff --minimal -Nru gcc-12-12-20220428/debian/changelog gcc-12-12-20220428/debian/changelog
--- gcc-12-12-20220428/debian/changelog	2022-04-28 20:10:12.000000000 +0200
+++ gcc-12-12-20220428/debian/changelog	2022-04-29 06:54:13.000000000 +0200
@@ -1,3 +1,10 @@
+gcc-12 (12-20220428-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix application of cross-fixes.diff. (Closes: #-1)
+
+ -- Helmut Grohne <helmut@subdivi.de>  Fri, 29 Apr 2022 06:54:13 +0200
+
 gcc-12 (12-20220428-1) unstable; urgency=medium
 
   * New upstream snapshot, taken from the gcc-12 branch.
diff --minimal -Nru gcc-12-12-20220428/debian/patches/cross-fixes.diff gcc-12-12-20220428/debian/patches/cross-fixes.diff
--- gcc-12-12-20220428/debian/patches/cross-fixes.diff	2021-07-28 17:26:48.000000000 +0200
+++ gcc-12-12-20220428/debian/patches/cross-fixes.diff	2022-04-29 06:54:04.000000000 +0200
@@ -9,20 +9,16 @@
 
 --- a/src/libgcc/config/ia64/fde-glibc.c
 +++ b/src/libgcc/config/ia64/fde-glibc.c
-@@ -28,6 +28,7 @@
+@@ -28,8 +28,8 @@
  #ifndef _GNU_SOURCE
  #define _GNU_SOURCE 1
  #endif
 +#ifndef inhibit_libc
  #include "config.h"
+-ifndef inhibit_libc
  #include <stddef.h>
  #include <stdlib.h>
-@@ -159,3 +160,5 @@ _Unwind_FindTableEntry (void *pc, unw_wo
- 
-   return data.ret;
- }
-+
-+#endif
+ #include <link.h>
 --- a/src/libgcc/config/ia64/unwind-ia64.c
 +++ b/src/libgcc/config/ia64/unwind-ia64.c
 @@ -26,6 +26,7 @@

Reply to: