mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

exec: Remove accel/tcg/ from include paths

Browse Source 
When TCG is enabled, the accel/tcg/ include path is added to the
project global include search list. This accel/tcg/ directory
contains a header named "internal.h" which, while intented to
be internal to accel/tcg/, is accessible by all files compiled
when TCG is enabled. This might lead to problem with other
directories using the same "internal.h" header name:

  $ git ls-files | fgrep /internal.h
  accel/tcg/internal.h
  include/hw/ide/internal.h
  target/hexagon/internal.h
  target/mips/internal.h
  target/ppc/internal.h
  target/s390x/internal.h

As we don't need to expose accel/tcg/ internals to the rest of
the code base, simplify by removing it from the include search
list, and include the accel/tcg/ public headers relative to the
project root search path (which is already in the generic include
search path).

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Claudio Fontana <cfontana@suse.de>
Message-Id: <20210413081008.3409459-1-f4bug@amsat.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2021-04-13 10:10:08 +02:00 committed by Richard Henderson
parent 8f860d2633
commit db647703ba
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/exec/helper-gen.h
View File

@ -81,8 +81,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
#include "helper.h" #include "helper.h"
#include "trace/generated-helpers.h" #include "trace/generated-helpers.h"
#include "trace/generated-helpers-wrappers.h" #include "trace/generated-helpers-wrappers.h"
#include "tcg-runtime.h" #include "accel/tcg/tcg-runtime.h"
#include "plugin-helpers.h" #include "accel/tcg/plugin-helpers.h"
#undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_0
#undef DEF_HELPER_FLAGS_1 #undef DEF_HELPER_FLAGS_1

4
include/exec/helper-proto.h
View File

@ -39,8 +39,8 @@ dh_ctype(ret) HELPER(name) (dh_ctype(t1), dh_ctype(t2), dh_ctype(t3), \
#include "helper.h" #include "helper.h"
#include "trace/generated-helpers.h" #include "trace/generated-helpers.h"
#include "tcg-runtime.h" #include "accel/tcg/tcg-runtime.h"
#include "plugin-helpers.h" #include "accel/tcg/plugin-helpers.h"
#undef IN_HELPER_PROTO #undef IN_HELPER_PROTO

4
include/exec/helper-tcg.h
View File

@ -60,8 +60,8 @@
#include "helper.h" #include "helper.h"
#include "trace/generated-helpers.h" #include "trace/generated-helpers.h"
#include "tcg-runtime.h" #include "accel/tcg/tcg-runtime.h"
#include "plugin-helpers.h" #include "accel/tcg/plugin-helpers.h"
#undef str #undef str
#undef DEF_HELPER_FLAGS_0 #undef DEF_HELPER_FLAGS_0

1
meson.build
View File

@ -258,7 +258,6 @@ if not get_option('tcg').disabled()
tcg_arch = 'riscv' tcg_arch = 'riscv'
endif endif
add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tcg_arch, add_project_arguments('-iquote', meson.current_source_dir() / 'tcg' / tcg_arch,
'-iquote', meson.current_source_dir() / 'accel/tcg',
language: ['c', 'cpp', 'objc']) language: ['c', 'cpp', 'objc'])
accelerators += 'CONFIG_TCG' accelerators += 'CONFIG_TCG'