Commit e5bb3f7715 for qemu.org
commit e5bb3f77150c18fa69ba086eb653d36e49696ef5
Author: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Date: Thu Jan 8 21:31:30 2026 -0800
gdbstub/helpers.h: allow header to be called from common code
Target specific variants can't be used in common code, thus limit their
definition to COMPILING_PER_TARGET.
Signed-off-by: Pierrick Bouvier <pierrick.bouvier@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Message-ID: <20260109053158.2800705-2-pierrick.bouvier@linaro.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
diff --git a/include/gdbstub/helpers.h b/include/gdbstub/helpers.h
index b685afac43..197592036b 100644
--- a/include/gdbstub/helpers.h
+++ b/include/gdbstub/helpers.h
@@ -12,13 +12,12 @@
#ifndef _GDBSTUB_HELPERS_H_
#define _GDBSTUB_HELPERS_H_
-#ifndef COMPILING_PER_TARGET
-#error "gdbstub helpers should only be included by target specific code"
-#endif
-
#include "qemu/bswap.h"
#include "qemu/target-info.h"
+
+#ifdef COMPILING_PER_TARGET
#include "cpu-param.h"
+#endif
/*
* The GDB remote protocol transfers values in target byte order. As
@@ -102,6 +101,7 @@ static inline uint8_t *gdb_get_reg_ptr(GByteArray *buf, int len)
return buf->data + buf->len - len;
}
+#ifdef COMPILING_PER_TARGET
#if TARGET_LONG_BITS == 64
#define gdb_get_regl(buf, val) gdb_get_reg64(buf, val)
#define ldtul_p(addr) ldq_p(addr)
@@ -113,5 +113,6 @@ static inline uint8_t *gdb_get_reg_ptr(GByteArray *buf, int len)
#define ldtul_le_p(addr) ldl_le_p(addr)
#define ldtul_be_p(addr) ldl_be_p(addr)
#endif
+#endif /* COMPILING_PER_TARGET */
#endif /* _GDBSTUB_HELPERS_H_ */