1 files changed, 5 insertions, 14 deletions

diff --git a/src/buildvm.c b/src/host/buildvm.c
index 29cf7378..7dbf2cae 100644
--- a/src/buildvm.c
+++ b/src/host/buildvm.c
@@ -54,33 +54,24 @@ static int collect_reloc(BuildCtx *ctx, uint8_t *addr, int idx, int type);
 /* Avoid trouble if cross-compiling for an x86 target. Speed doesn't matter. */
 #define DASM_ALIGNED_WRITES     1
 
-/* Embed architecture-specific DynASM encoder and backend. */
-#if LJ_TARGET_X86
+/* Embed architecture-specific DynASM encoder. */
+#if LJ_TARGET_X86ORX64
 #include "../dynasm/dasm_x86.h"
-#include "buildvm_x86.h"
-#elif LJ_TARGET_X64
-#include "../dynasm/dasm_x86.h"
-#if LJ_ABI_WIN
-#include "buildvm_x64win.h"
-#else
-#include "buildvm_x64.h"
-#endif
 #elif LJ_TARGET_ARM
 #include "../dynasm/dasm_arm.h"
-#include "buildvm_arm.h"
 #elif LJ_TARGET_PPC
 #include "../dynasm/dasm_ppc.h"
-#include "buildvm_ppc.h"
 #elif LJ_TARGET_PPCSPE
 #include "../dynasm/dasm_ppc.h"
-#include "buildvm_ppcspe.h"
 #elif LJ_TARGET_MIPS
 #include "../dynasm/dasm_mips.h"
-#include "buildvm_mips.h"
 #else
 #error "No support for this architecture (yet)"
 #endif
 
+/* Embed generated architecture-specific backend. */
+#include "buildvm_arch.h"
+
 /* ------------------------------------------------------------------------ */
 
 void owrite(BuildCtx *ctx, const void *ptr, size_t sz)