We don't use TARGET_NAME anymore, remove and poison it globally.
The symbol is still defined in Makefiles by the configure script
(it is required by tests/tcg/).
Signed-off-by: Philippe Mathieu-Daudé <phi...@linaro.org>
---
meson.build | 4 +++-
include/exec/poison.h | 1 -
include/qemu/osdep.h | 2 ++
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meson.build b/meson.build
index 04d8c477644..eaae1da2e92 100644
--- a/meson.build
+++ b/meson.build
@@ -3347,7 +3347,9 @@ foreach target : target_dirs
# Note that TARGET_BASE_ARCH ends up in config-target.h but it is
# not used to select files from sourcesets.
config_target_data.set('TARGET_' + v.to_upper(), 1)
- elif k == 'TARGET_NAME' or k == 'CONFIG_QEMU_INTERP_PREFIX'
+ elif k == 'TARGET_NAME'
+ # do nothing
+ elif k == 'CONFIG_QEMU_INTERP_PREFIX'
config_target_data.set_quoted(k, v)
elif v == 'y'
config_target_data.set(k, 1)
diff --git a/include/exec/poison.h b/include/exec/poison.h
index f4283f693af..0c4ad04eb97 100644
--- a/include/exec/poison.h
+++ b/include/exec/poison.h
@@ -34,7 +34,6 @@
#pragma GCC poison TARGET_XTENSA
#pragma GCC poison TARGET_HAS_BFLT
-#pragma GCC poison TARGET_NAME
#pragma GCC poison TARGET_SUPPORTS_MTTCG
#pragma GCC poison TARGET_BIG_ENDIAN
#pragma GCC poison BSWAP_NEEDED
diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h
index 4397a906807..3167fda68e4 100644
--- a/include/qemu/osdep.h
+++ b/include/qemu/osdep.h
@@ -50,6 +50,8 @@
*/
#pragma GCC poison TARGET_WORDS_BIGENDIAN
+#pragma GCC poison TARGET_NAME
+
#include "qemu/compiler.h"
/* Older versions of C++ don't get definitions of various macros from
--
2.47.1
