David Gibson <da...@gibson.dropbear.id.au> writes:
> On Wed, Apr 14, 2021 at 01:09:19PM -0700, Richard Henderson wrote:
>> On 4/14/21 7:59 AM, Bruno Larsen (billionai) wrote:
>> > All the code related to gdb has been moved from translate_init.c.inc
>> > file to the gdbstub.c file, where it makes more sense.
>> >
>> > This new version puts the prototypes in internal.h, to not expose
>> > them unnecessarily.
>> >
>> > Signed-off-by: Bruno Larsen (billionai) <bruno.lar...@eldorado.org.br>
>> > Suggested-by: Fabiano Rosas <faro...@linux.ibm.com>
>> > ---
>> > target/ppc/gdbstub.c | 258 ++++++++++++++++++++++++++++++++
>> > target/ppc/internal.h | 5 +
>> > target/ppc/translate_init.c.inc | 254 +------------------------------
>> > 3 files changed, 264 insertions(+), 253 deletions(-)
>>
>> Reviewed-by: Richard Henderson <richard.hender...@linaro.org>
>
> Applied to ppc-for-6.1, thanks.
The prototypes moved to internal.h in v3 so gdbstub.c needs to include
it now. The linux-user build is breaking with:
$ ../configure --target-list=ppc64le-linux-user
$ make -j$(nproc)
(...)
[316/959] Compiling C object
libqemu-ppc64le-linux-user.fa.p/target_ppc_gdbstub.c.o
FAILED: libqemu-ppc64le-linux-user.fa.p/target_ppc_gdbstub.c.o
cc -Ilibqemu-ppc64le-linux-user.fa.p -I. -I.. -Itarget/ppc -I../target/ppc
-I../linux-user/host/x86_64 -Ilinux-user -I../linux-user -Ilinux-user/ppc
-I../linux-user/ppc -I../capstone/include/capstone -Itrace -Iqap
i -Iui/shader -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include
-fdiagnostics-color=auto -pipe -Wall -Winvalid-pch -Werror -std=gnu99 -O2 -g
-isystem /home/fabiano/kvm/qemu-patch-testing/linux-headers -isystem
linux-headers -iquote . -iquote /home/fabiano/kvm/qemu-patch-testing -iquote
/home/fabiano/kvm/qemu-patch-testing/include -iquote
/home/fabiano/kvm/qemu-patch-testing/disas/libvixl -iquote
/home/fabiano/kvm/qemu-
patch-testing/tcg/i386 -iquote /home/fabiano/kvm/qemu-patch-testing/accel/tcg
-pthread -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -m64 -mcx16 -D_GNU_SOURCE
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wstrict-prototypes
-Wredundant-decls -Wundef -Wwrite-strings -Wmissing-prototypes
-fno-strict-aliasing -fno-common -fwrapv -Wold-style-declaration
-Wold-style-definition -Wtype-limits -Wformat-security -Wformat-y2k -Winit-self
-Wig
nored-qualifiers -Wempty-body -Wnested-externs -Wendif-labels
-Wexpansion-to-defined -Wimplicit-fallthrough=2 -Wno-missing-include-dirs
-Wno-shift-negative-value -Wno-psabi -fstack-protector-strong -fPIC -isystem.
./linux-headers -isystemlinux-headers -DNEED_CPU_H
'-DCONFIG_TARGET="ppc64le-linux-user-config-target.h"'
'-DCONFIG_DEVICES="ppc64le-linux-user-config-devices.h"' -MD -MQ
libqemu-ppc64le-linux-user.fa.p/target_ppc
_gdbstub.c.o -MF libqemu-ppc64le-linux-user.fa.p/target_ppc_gdbstub.c.o.d -o
libqemu-ppc64le-linux-user.fa.p/target_ppc_gdbstub.c.o -c
../target/ppc/gdbstub.c
../target/ppc/gdbstub.c:615:8: error: no previous prototype for
‘ppc_gdb_arch_name’ [-Werror=missing-prototypes]
615 | gchar *ppc_gdb_arch_name(CPUState *cs)
| ^~~~~~~~~~~~~~~~~
../target/ppc/gdbstub.c:624:6: error: no previous prototype for ‘ppc_gdb_init’
[-Werror=missing-prototypes]
624 | void ppc_gdb_init(CPUState *cs, PowerPCCPUClass *pcc)
| ^~~~~~~~~~~~
cc1: all warnings being treated as errors
>> > +void ppc_gdb_init(CPUState *cs, PowerPCCPUClass *pcc)
>> > +{
>> > +
>> > + if (pcc->insns_flags & PPC_FLOAT) {
>>
>> Watch the extra blank lines.
>
> Fixed in my tree.
