On Fri, Feb 27, 2026 at 3:44 AM Philippe Mathieu-Daudé <[email protected]> wrote:
> All GDB XML files are in the gdb-xml/ directory. No need to be > so verbose in TARGET_XML_FILES, let meson prepend the directory. > > Except meson.build lines, this is a mechanical change done running: > > $ sed -i -e s,gdb-xml/,,g $(git grep -l gdb-xml configs/targets/) > > Signed-off-by: Philippe Mathieu-Daudé <[email protected]> > Reviewed-by: Warner Losh <[email protected]> This looks fine, and should work with the modified meson. One observation... diff --git a/configs/targets/aarch64-bsd-user.mak > b/configs/targets/aarch64-bsd-user.mak > index 7f42e060477..3a839b301e4 100644 > --- a/configs/targets/aarch64-bsd-user.mak > +++ b/configs/targets/aarch64-bsd-user.mak > @@ -1,4 +1,4 @@ > TARGET_ARCH=aarch64 > TARGET_BASE_ARCH=arm > -TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml > gdb-xml/aarch64-pauth.xml gdb-xml/aarch64-sme2.xml > +TARGET_XML_FILES= aarch64-core.xml aarch64-fpu.xml aarch64-pauth.xml > aarch64-sme2.xml > This seems to be missing aarch64-mte.xml that linux-user has. I have a patch in my queue to fix this since it leads to an instant assertion in some cases. When are you landing these changes so I can plan? Otherwise we'll collide when we submit the pull requests. The patch came in as a pull request on the upstream blitz... > TARGET_LONG_BITS=64 > diff --git a/configs/targets/aarch64-linux-user.mak > b/configs/targets/aarch64-linux-user.mak > index bf328b3b80c..ddfacc092dd 100644 > --- a/configs/targets/aarch64-linux-user.mak > +++ b/configs/targets/aarch64-linux-user.mak > @@ -1,6 +1,6 @@ > TARGET_ARCH=aarch64 > TARGET_BASE_ARCH=arm > -TARGET_XML_FILES= gdb-xml/aarch64-core.xml gdb-xml/aarch64-fpu.xml > gdb-xml/aarch64-pauth.xml gdb-xml/aarch64-mte.xml gdb-xml/aarch64-sme2.xml > +TARGET_XML_FILES= aarch64-core.xml aarch64-fpu.xml aarch64-pauth.xml > aarch64-mte.xml aarch64-sme2.xml > TARGET_HAS_BFLT=y > CONFIG_SEMIHOSTING=y > CONFIG_ARM_COMPATIBLE_SEMIHOSTING=y Warner
