16 files changed, 14 insertions, 13 deletions
diff --git a/target/i386/meson.build b/target/i386/meson.build
index 284d52ab81..750471c9f3 100644
--- a/target/i386/meson.build
+++ b/target/i386/meson.build
@@ -5,19 +5,6 @@ i386_ss.add(files(
   'helper.c',
   'xsave_helper.c',
 ))
-i386_ss.add(when: 'CONFIG_TCG', if_true: files(
-  'bpt_helper.c',
-  'cc_helper.c',
-  'excp_helper.c',
-  'fpu_helper.c',
-  'int_helper.c',
-  'mem_helper.c',
-  'misc_helper.c',
-  'mpx_helper.c',
-  'seg_helper.c',
-  'smm_helper.c',
-  'svm_helper.c',
-  'translate.c'), if_false: files('tcg-stub.c'))
 i386_ss.add(when: 'CONFIG_SEV', if_true: files('sev.c'), if_false: files('sev-stub.c'))
 
 i386_softmmu_ss = ss.source_set()
@@ -32,6 +19,7 @@ subdir('kvm')
 subdir('hax')
 subdir('whpx')
 subdir('hvf')
+subdir('tcg')
 
 target_arch += {'i386': i386_ss}
 target_softmmu_arch += {'i386': i386_softmmu_ss}
diff --git a/target/i386/bpt_helper.c b/target/i386/tcg/bpt_helper.c
index e6cc2921e2..e6cc2921e2 100644
--- a/target/i386/bpt_helper.c
+++ b/target/i386/tcg/bpt_helper.c
diff --git a/target/i386/cc_helper.c b/target/i386/tcg/cc_helper.c
index 924dd3cd57..924dd3cd57 100644
--- a/target/i386/cc_helper.c
+++ b/target/i386/tcg/cc_helper.c
diff --git a/target/i386/cc_helper_template.h b/target/i386/tcg/cc_helper_template.h
index bb611feb04..bb611feb04 100644
--- a/target/i386/cc_helper_template.h
+++ b/target/i386/tcg/cc_helper_template.h
diff --git a/target/i386/excp_helper.c b/target/i386/tcg/excp_helper.c
index 191471749f..191471749f 100644
--- a/target/i386/excp_helper.c
+++ b/target/i386/tcg/excp_helper.c
diff --git a/target/i386/fpu_helper.c b/target/i386/tcg/fpu_helper.c
index 03b35443a6..03b35443a6 100644
--- a/target/i386/fpu_helper.c
+++ b/target/i386/tcg/fpu_helper.c
diff --git a/target/i386/int_helper.c b/target/i386/tcg/int_helper.c
index 4f89436b53..4f89436b53 100644
--- a/target/i386/int_helper.c
+++ b/target/i386/tcg/int_helper.c
diff --git a/target/i386/mem_helper.c b/target/i386/tcg/mem_helper.c
index 21ca3e3e88..21ca3e3e88 100644
--- a/target/i386/mem_helper.c
+++ b/target/i386/tcg/mem_helper.c
diff --git a/target/i386/tcg/meson.build b/target/i386/tcg/meson.build
new file mode 100644
index 0000000000..02794226c2
--- /dev/null
+++ b/target/i386/tcg/meson.build
@@ -0,0 +1,13 @@
+i386_ss.add(when: 'CONFIG_TCG', if_true: files(
+  'bpt_helper.c',
+  'cc_helper.c',
+  'excp_helper.c',
+  'fpu_helper.c',
+  'int_helper.c',
+  'mem_helper.c',
+  'misc_helper.c',
+  'mpx_helper.c',
+  'seg_helper.c',
+  'smm_helper.c',
+  'svm_helper.c',
+  'translate.c'), if_false: files('tcg-stub.c'))
diff --git a/target/i386/misc_helper.c b/target/i386/tcg/misc_helper.c
index ae259d9145..ae259d9145 100644
--- a/target/i386/misc_helper.c
+++ b/target/i386/tcg/misc_helper.c
diff --git a/target/i386/mpx_helper.c b/target/i386/tcg/mpx_helper.c
index fd966174b4..fd966174b4 100644
--- a/target/i386/mpx_helper.c
+++ b/target/i386/tcg/mpx_helper.c
diff --git a/target/i386/seg_helper.c b/target/i386/tcg/seg_helper.c
index e6ffa1f018..e6ffa1f018 100644
--- a/target/i386/seg_helper.c
+++ b/target/i386/tcg/seg_helper.c
diff --git a/target/i386/smm_helper.c b/target/i386/tcg/smm_helper.c
index d20e8edfdf..d20e8edfdf 100644
--- a/target/i386/smm_helper.c
+++ b/target/i386/tcg/smm_helper.c
diff --git a/target/i386/svm_helper.c b/target/i386/tcg/svm_helper.c
index 38931586e5..38931586e5 100644
--- a/target/i386/svm_helper.c
+++ b/target/i386/tcg/svm_helper.c
diff --git a/target/i386/tcg-stub.c b/target/i386/tcg/tcg-stub.c
index 8d45579ada..8d45579ada 100644
--- a/target/i386/tcg-stub.c
+++ b/target/i386/tcg/tcg-stub.c
diff --git a/target/i386/translate.c b/target/i386/tcg/translate.c
index e8f5f5803a..e8f5f5803a 100644
--- a/target/i386/translate.c
+++ b/target/i386/tcg/translate.c