[packages/gdb] attempt to fix x32 build

atler atler at pld-linux.org
Sun Nov 21 18:36:03 CET 2021


commit 9f79cb71831a38d9ec1d8f2e8607d55e8f43abee
Author: Jan Palus <atler at pld-linux.org>
Date:   Sun Nov 21 18:34:47 2021 +0100

    attempt to fix x32 build
    
    by effectively disabling following change on x32:
    
    https://sourceware.org/git/?p=binutils-gdb.git;a=commitdiff;h=d3d7d1b

 gdb.spec  |  2 ++
 x32.patch | 18 ++++++++++++++++++
 2 files changed, 20 insertions(+)
---
diff --git a/gdb.spec b/gdb.spec
index 23ed5ed..b0531fe 100644
--- a/gdb.spec
+++ b/gdb.spec
@@ -31,6 +31,7 @@ Source1:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-ma
 # Source1-md5:	2e8a48939ae282c12bbacdd54e398247
 Source3:	%{name}-gstack.man
 Patch0:		glibc2.34.patch
+Patch1:		x32.patch
 Patch100:	gdb-6.6-buildid-locate.patch
 Patch101:	gdb-6.6-buildid-locate-solib-missing-ids.patch
 Patch102:	gdb-6.6-buildid-locate-rpm.patch
@@ -192,6 +193,7 @@ GDB w postaci biblioteki statycznej.
 %{__rm} gdb/m2-exp.c gdb/p-exp.c
 
 %patch0 -p1
+%patch1 -p1
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..a7753d0
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,18 @@
+--- gdb-11.1/gdb/nat/amd64-linux-siginfo.c.orig	2021-07-03 19:41:10.000000000 +0200
++++ gdb-11.1/gdb/nat/amd64-linux-siginfo.c	2021-11-21 18:32:29.634785279 +0100
+@@ -330,6 +330,7 @@
+       to->cpt_si_pid = from_ptrace.cpt_si_pid;
+       to->cpt_si_uid = from_ptrace.cpt_si_uid;
+     }
++#ifndef __ILP32__
+   else if (to->si_code == SEGV_BNDERR
+ 	   && to->si_signo == SIGSEGV)
+     {
+@@ -337,6 +338,7 @@
+       to->cpt_si_lower = from_ptrace.cpt_si_lower;
+       to->cpt_si_upper = from_ptrace.cpt_si_upper;
+     }
++#endif
+   else if (to->si_code < 0)
+     {
+       to->cpt_si_pid = from_ptrace.cpt_si_pid;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/gdb.git/commitdiff/9f79cb71831a38d9ec1d8f2e8607d55e8f43abee



More information about the pld-cvs-commit mailing list