diff options
author | Philippe Mathieu-Daudé <philmd@linaro.org> | 2023-12-05 22:45:37 +0100 |
---|---|---|
committer | Philippe Mathieu-Daudé <philmd@linaro.org> | 2024-04-26 17:03:05 +0200 |
commit | d25ddb3f543dda8189b19dafd0b9a972c331fade (patch) | |
tree | 5d4c940361efc903b4c1c64390747b5cfc2496f5 | |
parent | 827238668e7dc44e43e71a3e12b605881fe6887e (diff) |
exec/user: Do not include 'cpu.h' in 'abitypes.h'
"exec/user/abitypes.h" requires:
- "exec/cpu-defs.h" (TARGET_LONG_BITS)
- "exec/tswap.h" (tswap32)
In order to avoid "cpu.h", pick the minimum required headers.
Assert this user-specific header is only included from user
emulation.
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20231212123401.37493-20-philmd@linaro.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
-rw-r--r-- | include/exec/user/abitypes.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/exec/user/abitypes.h b/include/exec/user/abitypes.h index 731f345ff5..3ec1969368 100644 --- a/include/exec/user/abitypes.h +++ b/include/exec/user/abitypes.h @@ -1,7 +1,12 @@ #ifndef EXEC_USER_ABITYPES_H #define EXEC_USER_ABITYPES_H -#include "cpu.h" +#ifndef CONFIG_USER_ONLY +#error Cannot include this header from system emulation +#endif + +#include "exec/cpu-defs.h" +#include "exec/tswap.h" #include "user/tswap-target.h" #ifdef TARGET_ABI32 |