[PATCH 0/3] Fix several build failures

[PATCH v2 0/3] Update to gdb-16.2

Re: [PATCH 0/5] Update to gdb-16.2

Lianbo Jiang

Friday, 24 January 2025 Fri, 24 Jan '25

4:37 a.m.

The patchset includes three patches: [1] [PATCH 1/3] Fix build failure in readline lib [2] [PATCH 2/3] tools.c: do not use keywords 'nullptr' as a variable in code [3] [PATCH 3/3] Fix build failure on 32bit machine(i686) Lianbo Jiang (3): Fix build failure in readline lib tools.c: do not use keywords 'nullptr' as a variable in code Fix build failure on 32bit machine(i686) gdb-10.2.patch | 88 +++++++++++++++++++++++++++++++++++++++++++++++-- gdb_interface.c | 4 +-- tools.c | 6 ++-- 3 files changed, 90 insertions(+), 8 deletions(-) -- 2.47.1

Show replies by date

Lianbo Jiang

Friday, 24 January Fri, 24 Jan

4:37 a.m.

New subject: [PATCH 1/3] Fix build failure in readline lib

This is a backported patch from gdb upstream, see the commit 425f843d58c5 ("Import GNU Readline 8.2"), and only backported patch related to compilation errors. Without the patch: signals.c: In function ‘_rl_handle_signal’: signals.c:62:36: error: ‘return’ with a value, in function returning void [-Wreturn-mismatch] 62 | # define SIGHANDLER_RETURN return (0) | ^ signals.c:290:3: note: in expansion of macro ‘SIGHANDLER_RETURN’ 290 | SIGHANDLER_RETURN; | ^~~~~~~~~~~~~~~~~ signals.c:178:1: note: declared here 178 | _rl_handle_signal (int sig) | ^~~~~~~~~~~~~~~~~ signals.c: In function ‘rl_sigwinch_handler’: signals.c:306:32: error: passing argument 2 of ‘rl_set_sighandler’ from incompatible pointer type [-Wincompatible-pointer-types] 306 | rl_set_sighandler (SIGWINCH, rl_sigwinch_handler, &dummy_winch); | ^~~~~~~~~~~~~~~~~~~ | | | void (*)(int) In file included from rldefs.h:31, from signals.c:37: signals.c:81:51: note: expected ‘void (*)(void)’ but argument is of type ‘void (*)(int)’ 81 | static SigHandler *rl_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *)); Note: the current build failure was observed on gcc (GCC) 15.0.0. Signed-off-by: Lianbo Jiang <lijiang(a)redhat.com> --- gdb-10.2.patch | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/gdb-10.2.patch b/gdb-10.2.patch index fd6fadb92f39..8f5d7db22840 100644 --- a/gdb-10.2.patch +++ b/gdb-10.2.patch @@ -16239,3 +16239,85 @@ exit 0 pc_p = true; } catch (const gdb_exception_error &ex) +--- gdb-10.2/readline/readline/signals.c.orig ++++ gdb-10.2/readline/readline/signals.c +@@ -48,23 +48,11 @@ + + #if defined (HANDLE_SIGNALS) + +-#if !defined (RETSIGTYPE) +-# if defined (VOID_SIGHANDLER) +-# define RETSIGTYPE void +-# else +-# define RETSIGTYPE int +-# endif /* !VOID_SIGHANDLER */ +-#endif /* !RETSIGTYPE */ +- +-#if defined (VOID_SIGHANDLER) +-# define SIGHANDLER_RETURN return +-#else +-# define SIGHANDLER_RETURN return (0) +-#endif ++#define SIGHANDLER_RETURN return + + /* This typedef is equivalent to the one for Function; it allows us + to say SigHandler *foo = signal (SIGKILL, SIG_IGN); */ +-typedef RETSIGTYPE SigHandler (); ++typedef void SigHandler (int); + + #if defined (HAVE_POSIX_SIGNALS) + typedef struct sigaction sighandler_cxt; +@@ -78,12 +66,12 @@ typedef struct { SigHandler *sa_handler; int sa_mask, sa_flags; } sighandler_cxt + # define SA_RESTART 0 + #endif + +-static SigHandler *rl_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *)); +-static void rl_maybe_set_sighandler PARAMS((int, SigHandler *, sighandler_cxt *)); +-static void rl_maybe_restore_sighandler PARAMS((int, sighandler_cxt *)); ++static SigHandler *rl_set_sighandler (int, SigHandler *, sighandler_cxt *); ++static void rl_maybe_set_sighandler (int, SigHandler *, sighandler_cxt *); ++static void rl_maybe_restore_sighandler (int, sighandler_cxt *); + +-static RETSIGTYPE rl_signal_handler PARAMS((int)); +-static RETSIGTYPE _rl_handle_signal PARAMS((int)); ++static void rl_signal_handler (int); ++static void _rl_handle_signal (int); + + /* Exported variables for use by applications. */ + +@@ -137,7 +125,7 @@ void *_rl_sigcleanarg; + /* Readline signal handler functions. */ + + /* Called from RL_CHECK_SIGNALS() macro */ +-RETSIGTYPE ++void + _rl_signal_handler (int sig) + { + _rl_caught_signal = 0; /* XXX */ +@@ -160,7 +148,7 @@ _rl_signal_handler (int sig) + SIGHANDLER_RETURN; + } + +-static RETSIGTYPE ++static void + rl_signal_handler (int sig) + { + if (_rl_interrupt_immediately) +@@ -174,7 +162,7 @@ rl_signal_handler (int sig) + SIGHANDLER_RETURN; + } + +-static RETSIGTYPE ++static void + _rl_handle_signal (int sig) + { + #if defined (HAVE_POSIX_SIGNALS) +@@ -291,7 +279,7 @@ _rl_handle_signal (int sig) + } + + #if defined (SIGWINCH) +-static RETSIGTYPE ++static void + rl_sigwinch_handler (int sig) + { + SigHandler *oh; -- 2.47.1

Lianbo Jiang

4:38 a.m.

New subject: [PATCH 2/3] tools.c: do not use keywords 'nullptr' as a variable in code

Without the patch: tools.c: In function ‘drop_core’: tools.c:6251:23: error: expected identifier or ‘(’ before ‘nullptr’ 6251 | volatile int *nullptr; | ^~~~~~~ tools.c:6259:17: error: lvalue required as left operand of assignment 6259 | nullptr = NULL; | ^ tools.c:6261:21: error: invalid type argument of unary ‘*’ (have ‘typeof (nullptr)’) 6261 | i = *nullptr; | ^~~~~~~~ make[6]: *** [Makefile:345: tools.o] Error 1 Note: this was observed on gcc version 15.0.1 Signed-off-by: Lianbo Jiang <lijiang(a)redhat.com> --- tools.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools.c b/tools.c index 85d8b6f0b630..c9305bef7c9c 100644 --- a/tools.c +++ b/tools.c @@ -6248,7 +6248,7 @@ lowest_bit_long(ulong val) void drop_core(char *s) { - volatile int *nullptr; + volatile int *ptr; int i ATTRIBUTE_UNUSED; if (s && ascii_string(s)) @@ -6256,9 +6256,9 @@ drop_core(char *s) kill((pid_t)pc->program_pid, 3); - nullptr = NULL; + ptr = NULL; while (TRUE) - i = *nullptr; + i = *ptr; } -- 2.47.1

Lianbo Jiang

4:38 a.m.

New subject: [PATCH 3/3] Fix build failure on 32bit machine(i686)

This issue was caused by commit 0f39e33d3504 with the following compilation error: frame.c: In function ‘CORE_ADDR frame_unwind_pc(frame_info*)’: frame.c:982:35: error: cannot convert ‘CORE_ADDR*’ {aka ‘long long unsigned int*’} to ‘ulong*’ {aka ‘long unsigned int*’} 982 | crash_decode_ptrauth_pc(&pc); | ^~~ | | | CORE_ADDR* {aka long long unsigned int*} frame.c:948:48: note: initializing argument 1 of ‘void crash_decode_ptrauth_pc(ulong*)’ 948 | extern "C" void crash_decode_ptrauth_pc(ulong* pc); | ~~~~~~~^~ Fixes: 0f39e33d3504 ("arm64: add pac mask to better support gdb stack unwind") Reported-by: Guanyou.Chen <chenguanyou(a)xiaomi.com> Signed-off-by: Lianbo Jiang <lijiang(a)redhat.com> --- gdb-10.2.patch | 6 +++--- gdb_interface.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gdb-10.2.patch b/gdb-10.2.patch index 8f5d7db22840..156df2ed78b5 100644 --- a/gdb-10.2.patch +++ b/gdb-10.2.patch @@ -55,7 +55,7 @@ exit 0 # your system doesn't have fcntl.h in /usr/include (which is where it # should be according to Posix). -DEFS = @DEFS@ -+DEFS = -DCRASH_MERGE @DEFS@ ++DEFS = -DCRASH_MERGE -DTARGET_${CRASH_TARGET} @DEFS@ GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config \ -DLOCALEDIR="\"$(localedir)\"" $(DEFS) @@ -16222,7 +16222,7 @@ exit 0 return NULL; } -+#ifdef CRASH_MERGE ++#if defined(CRASH_MERGE) && defined(ARM64) +extern "C" void crash_decode_ptrauth_pc(ulong* pc); +#endif + @@ -16233,7 +16233,7 @@ exit 0 try { pc = gdbarch_unwind_pc (prev_gdbarch, this_frame); -+#ifdef CRASH_MERGE ++#if defined(CRASH_MERGE) && defined(ARM64) + crash_decode_ptrauth_pc(&pc); +#endif pc_p = true; diff --git a/gdb_interface.c b/gdb_interface.c index e108d097ee5f..c2e99f5c156a 100644 --- a/gdb_interface.c +++ b/gdb_interface.c @@ -1084,12 +1084,12 @@ int crash_get_current_task_reg (int regno, const char *regname, } /* arm64 kernel lr maybe has patuh */ +#ifdef ARM64 void crash_decode_ptrauth_pc(ulong *pc); void crash_decode_ptrauth_pc(ulong *pc) { -#ifdef ARM64 struct machine_specific *ms = machdep->machspec; if (is_kernel_text(*pc | ms->CONFIG_ARM64_KERNELPACMASK)) *pc |= ms->CONFIG_ARM64_KERNELPACMASK; -#endif /* !ARM64 */ } +#endif /* !ARM64 */ -- 2.47.1

lijiang

Saturday, 25 January Sat, 25 Jan

7:26 p.m.

New subject: [PATCH 3/3] Fix build failure on 32bit machine(i686)

On Fri, Jan 24, 2025 at 6:38 PM Lianbo Jiang <lijiang(a)redhat.com> wrote:

...

Sorry, It should be: +DEFS = -DCRASH_MERGE -D${CRASH_TARGET} @DEFS@ Thanks Lianbo

...

GDB_CFLAGS = -I. -I$(srcdir) -I$(srcdir)/config \ -DLOCALEDIR="\"$(localedir)\"" $(DEFS) @@ -16222,7 +16222,7 @@ exit 0 return NULL; } -+#ifdef CRASH_MERGE ++#if defined(CRASH_MERGE) && defined(ARM64) +extern "C" void crash_decode_ptrauth_pc(ulong* pc); +#endif + @@ -16233,7 +16233,7 @@ exit 0 try { pc = gdbarch_unwind_pc (prev_gdbarch, this_frame); -+#ifdef CRASH_MERGE ++#if defined(CRASH_MERGE) && defined(ARM64) + crash_decode_ptrauth_pc(&pc); +#endif pc_p = true; diff --git a/gdb_interface.c b/gdb_interface.c index e108d097ee5f..c2e99f5c156a 100644 --- a/gdb_interface.c +++ b/gdb_interface.c @@ -1084,12 +1084,12 @@ int crash_get_current_task_reg (int regno, const char *regname, } /* arm64 kernel lr maybe has patuh */ +#ifdef ARM64 void crash_decode_ptrauth_pc(ulong *pc); void crash_decode_ptrauth_pc(ulong *pc) { -#ifdef ARM64 struct machine_specific *ms = machdep->machspec; if (is_kernel_text(*pc | ms->CONFIG_ARM64_KERNELPACMASK)) *pc |= ms->CONFIG_ARM64_KERNELPACMASK; -#endif /* !ARM64 */ } +#endif /* !ARM64 */ -- 2.47.1

Tao Liu

Sunday, 26 January Sun, 26 Jan

5:59 a.m.

Hi Lianbo, Thanks for the fix, I will take a look into the series shortly. Thanks, Tao Liu On Fri, Jan 24, 2025 at 11:38 PM Lianbo Jiang <lijiang(a)redhat.com> wrote:

...

Tao Liu

Tuesday, 4 February Tue, 4 Feb

3:32 a.m.

Hi Lianbo, Please checkout the "Update to gdb-16.2" patchset [1], which I have integrated this patchset into that one. Since the No1 patch is no longer needed after the gdb upgrade, in addition, the No3 patch also made some modification on gdb-10.2.patch, which is removed after the upgrade. All in all, the patchset looks good to me, so we can discuss it there. Thanks, Tao Liu [1]: https://www.mail-archive.com/devel@lists.crash-utility.osci.io/msg01347.html On Mon, Jan 27, 2025 at 12:59 AM Tao Liu <ltao(a)redhat.com> wrote:

...

Hi Lianbo, Thanks for the fix, I will take a look into the series shortly. Thanks, Tao Liu On Fri, Jan 24, 2025 at 11:38 PM Lianbo Jiang <lijiang(a)redhat.com> wrote: > > The patchset includes three patches: > [1] [PATCH 1/3] Fix build failure in readline lib > [2] [PATCH 2/3] tools.c: do not use keywords 'nullptr' as a variable in code > [3] [PATCH 3/3] Fix build failure on 32bit machine(i686) > > Lianbo Jiang (3): > Fix build failure in readline lib > tools.c: do not use keywords 'nullptr' as a variable in code > Fix build failure on 32bit machine(i686) > > gdb-10.2.patch | 88 +++++++++++++++++++++++++++++++++++++++++++++++-- > gdb_interface.c | 4 +-- > tools.c | 6 ++-- > 3 files changed, 90 insertions(+), 8 deletions(-) > > -- > 2.47.1 >

Tao Liu

Wednesday, 5 February Wed, 5 Feb

2:39 a.m.

Hi Lianbo, As we discussed, let's go with the separated patchsets of gdb 16.2 and this one. I will post another gdb 16.2 update patchset. As for this patchset, LGTM, so ack. Thanks, Tao Liu On Fri, Jan 24, 2025 at 11:38 PM Lianbo Jiang <lijiang(a)redhat.com> wrote:

...

lijiang

4:16 a.m.

On Wed, Feb 5, 2025 at 4:40 PM Tao Liu <ltao(a)redhat.com> wrote:

...

Hi Lianbo, As we discussed, let's go with the separated patchsets of gdb 16.2 and this one. I will post another gdb 16.2 update patchset. As for this

Ok, Thanks Tao.

...

patchset, LGTM, so ack.

Applied: [1] https://github.com/crash-utility/crash/commit/772fbb1022911410b5fb773fde3... [2] https://github.com/crash-utility/crash/commit/325a9d1b3b4ce76bf4556235c88... [3] https://github.com/crash-utility/crash/commit/2724bb1d0260f3886f8a3d53383... Lianbo

...

Thanks, Tao Liu On Fri, Jan 24, 2025 at 11:38 PM Lianbo Jiang <lijiang(a)redhat.com> wrote: > > The patchset includes three patches: > [1] [PATCH 1/3] Fix build failure in readline lib > [2] [PATCH 2/3] tools.c: do not use keywords 'nullptr' as a variable in code > [3] [PATCH 3/3] Fix build failure on 32bit machine(i686) > > Lianbo Jiang (3): > Fix build failure in readline lib > tools.c: do not use keywords 'nullptr' as a variable in code > Fix build failure on 32bit machine(i686) > > gdb-10.2.patch | 88 +++++++++++++++++++++++++++++++++++++++++++++++-- > gdb_interface.c | 4 +-- > tools.c | 6 ++-- > 3 files changed, 90 insertions(+), 8 deletions(-) > > -- > 2.47.1 >

days inactive

105

days old

devel@lists.crash-utility.osci.io

Manage subscription

8 comments

3 participants

tags (0)

participants (3)

Lianbo Jiang
lijiang
Tao Liu

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

[PATCH 0/3] Fix several build failures