| Message ID | 20230105164320.2164095-22-alex.bennee@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | gdbstub: re-organise to for better compilation behaviour | expand |
On 1/5/23 08:43, Alex Bennée wrote: > Now we have removed any target specific bits from the core gdbstub > code we only need to build it twice. We have to jump a few meson hoops > to manually define the CONFIG_USER_ONLY symbol but it seems to work. > > Signed-off-by: Alex Bennée <alex.bennee@linaro.org> > --- > gdbstub/gdbstub.c | 3 +-- > gdbstub/user-target.c | 2 +- > gdbstub/meson.build | 32 ++++++++++++++++++++++++++++---- > 3 files changed, 30 insertions(+), 7 deletions(-) > > diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c > index 57bbda3505..0dbb9f5338 100644 > --- a/gdbstub/gdbstub.c > +++ b/gdbstub/gdbstub.c > @@ -39,7 +39,6 @@ > > #include "sysemu/hw_accel.h" > #include "sysemu/runstate.h" > -#include "exec/exec-all.h" > #include "exec/tb-flush.h" > #include "exec/hwaddr.h" > #include "sysemu/replay.h" > @@ -1611,7 +1610,7 @@ static const GdbCmdParseEntry gdb_gen_query_table[] = { > .cmd_startswith = 1, > .schema = "s:l,l0" > }, > -#if defined(CONFIG_USER_ONLY) && defined(CONFIG_LINUX_USER) > +#if defined(CONFIG_USER_ONLY) && defined(CONFIG_LINUX) > { > .handler = gdb_handle_query_xfer_auxv, > .cmd = "Xfer:auxv:read::", > diff --git a/gdbstub/user-target.c b/gdbstub/user-target.c > index 83e04e1c23..46f5729999 100644 > --- a/gdbstub/user-target.c > +++ b/gdbstub/user-target.c > @@ -235,7 +235,7 @@ static inline int target_memory_rw_debug(CPUState *cpu, target_ulong addr, > } > > > -#if defined(CONFIG_LINUX_USER) > +#if defined(CONFIG_LINUX) > void gdb_handle_query_xfer_auxv(GArray *params, void *user_ctx) > { > TaskState *ts; > diff --git a/gdbstub/meson.build b/gdbstub/meson.build > index 56c40c25ef..193c20203d 100644 > --- a/gdbstub/meson.build > +++ b/gdbstub/meson.build > @@ -4,13 +4,37 @@ > # types such as hwaddr. > # > > -specific_ss.add(files('gdbstub.c')) > +# We need to build the core gdb code via a library to be able to tweak > +# cflags so: > > -# These have to built to the target ABI > -specific_ss.add(files('syscalls.c')) > +gdb_user_ss = ss.source_set() > +gdb_softmmu_ss = ss.source_set() > > -softmmu_ss.add(files('softmmu.c')) > +# We build two versions of gdbstub, one for each mode > +gdb_user_ss.add(files('gdbstub.c')) > +gdb_softmmu_ss.add(files('gdbstub.c')) > + > +gdb_user_ss = gdb_user_ss.apply(config_host, strict: false) > +gdb_softmmu_ss = gdb_softmmu_ss.apply(config_host, strict: false) > + > +libgdb_user = static_library('gdb_user', gdb_user_ss.sources(), > + name_suffix: 'fa', > + c_args: '-DCONFIG_USER_ONLY') > + > +libgdb_softmmu = static_library('gdb_softmmu', gdb_softmmu_ss.sources(), > + name_suffix: 'fa') > + > +gdb_user = declare_dependency(link_whole: libgdb_user) > +user_ss.add(gdb_user) > +gdb_softmmu = declare_dependency(link_whole: libgdb_softmmu) > +softmmu_ss.add(gdb_softmmu) > + > +# The rest of the mode specific code can be added directly > user_ss.add(files('user.c')) > +softmmu_ss.add(files('softmmu.c')) > + > +# These have to built to the target ABI > +specific_ss.add(files('syscalls.c')) It seems weird to put one file into a library and other files directly into the user/softmmu source sets. Why not just put everything except user-target.c into the corresponding libraries? > # and BSD? > specific_ss.add(when: 'CONFIG_LINUX_USER', if_true: files('user-target.c')) Definitely "and BSD". I can't see how this will link at all, missing e.g. gdb_handle_query_offsets. r~
diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 57bbda3505..0dbb9f5338 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -39,7 +39,6 @@ #include "sysemu/hw_accel.h" #include "sysemu/runstate.h" -#include "exec/exec-all.h" #include "exec/tb-flush.h" #include "exec/hwaddr.h" #include "sysemu/replay.h" @@ -1611,7 +1610,7 @@ static const GdbCmdParseEntry gdb_gen_query_table[] = { .cmd_startswith = 1, .schema = "s:l,l0" }, -#if defined(CONFIG_USER_ONLY) && defined(CONFIG_LINUX_USER) +#if defined(CONFIG_USER_ONLY) && defined(CONFIG_LINUX) { .handler = gdb_handle_query_xfer_auxv, .cmd = "Xfer:auxv:read::", diff --git a/gdbstub/user-target.c b/gdbstub/user-target.c index 83e04e1c23..46f5729999 100644 --- a/gdbstub/user-target.c +++ b/gdbstub/user-target.c @@ -235,7 +235,7 @@ static inline int target_memory_rw_debug(CPUState *cpu, target_ulong addr, } -#if defined(CONFIG_LINUX_USER) +#if defined(CONFIG_LINUX) void gdb_handle_query_xfer_auxv(GArray *params, void *user_ctx) { TaskState *ts; diff --git a/gdbstub/meson.build b/gdbstub/meson.build index 56c40c25ef..193c20203d 100644 --- a/gdbstub/meson.build +++ b/gdbstub/meson.build @@ -4,13 +4,37 @@ # types such as hwaddr. # -specific_ss.add(files('gdbstub.c')) +# We need to build the core gdb code via a library to be able to tweak +# cflags so: -# These have to built to the target ABI -specific_ss.add(files('syscalls.c')) +gdb_user_ss = ss.source_set() +gdb_softmmu_ss = ss.source_set() -softmmu_ss.add(files('softmmu.c')) +# We build two versions of gdbstub, one for each mode +gdb_user_ss.add(files('gdbstub.c')) +gdb_softmmu_ss.add(files('gdbstub.c')) + +gdb_user_ss = gdb_user_ss.apply(config_host, strict: false) +gdb_softmmu_ss = gdb_softmmu_ss.apply(config_host, strict: false) + +libgdb_user = static_library('gdb_user', gdb_user_ss.sources(), + name_suffix: 'fa', + c_args: '-DCONFIG_USER_ONLY') + +libgdb_softmmu = static_library('gdb_softmmu', gdb_softmmu_ss.sources(), + name_suffix: 'fa') + +gdb_user = declare_dependency(link_whole: libgdb_user) +user_ss.add(gdb_user) +gdb_softmmu = declare_dependency(link_whole: libgdb_softmmu) +softmmu_ss.add(gdb_softmmu) + +# The rest of the mode specific code can be added directly user_ss.add(files('user.c')) +softmmu_ss.add(files('softmmu.c')) + +# These have to built to the target ABI +specific_ss.add(files('syscalls.c')) # and BSD? specific_ss.add(when: 'CONFIG_LINUX_USER', if_true: files('user-target.c'))
Now we have removed any target specific bits from the core gdbstub code we only need to build it twice. We have to jump a few meson hoops to manually define the CONFIG_USER_ONLY symbol but it seems to work. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> --- gdbstub/gdbstub.c | 3 +-- gdbstub/user-target.c | 2 +- gdbstub/meson.build | 32 ++++++++++++++++++++++++++++---- 3 files changed, 30 insertions(+), 7 deletions(-)