Migrate libr/asm/arch/include ##arch

libr/anal/Makefile

@@ -5,7 +5,7 @@ EXTRA_CLEAN=doclean
 
 NAME=r_anal
 R2DEPS=r_util r_reg r_syscall r_search r_cons r_flag r_crypto r_arch r_esil
-CFLAGS:=-I.. -I$(LTOP)/asm/arch/include -DR2_PLUGIN_INCORE -Iarch -I$(TOP)/shlr $(CFLAGS)
+CFLAGS:=-I.. -I$(LTOP)/arch/include -DR2_PLUGIN_INCORE -Iarch -I$(TOP)/shlr $(CFLAGS)
 
 LDFLAGS+=${BN_LIBS}
 

libr/arch/Makefile

@@ -5,7 +5,7 @@ NAME=r_arch
 R2DEPS+=r_util r_reg r_esil r_crypto
 
 CFLAGS+=-DR2_PLUGIN_INCORE
-CFLAGS:=-I.. -I$(LTOP)/asm/arch/include -DR2_PLUGIN_INCORE -Iarch -I$(TOP)/shlr $(CFLAGS)
+CFLAGS:=-I.. -I$(LTOP)/arch/include -DR2_PLUGIN_INCORE -Iarch -I$(TOP)/shlr $(CFLAGS)
 LDFLAGS+=$(CS_LDFLAGS)
 
 .PHONY: pre

libr/arch/meson.build

@@ -190,7 +190,7 @@ r_arch_sources += [
 endif
 
 # must be deleted when anal refactor is done
-arch_inc = include_directories('../asm/arch/include')
+arch_inc = include_directories('../arch/include')
 
 r_arch = library('r_arch', r_arch_sources,
   include_directories: [platform_inc, arch_inc],

libr/arch/p/m68k_gnu/plugin.c

@@ -1,7 +1,7 @@
 /* radare - LGPL - Copyright 2016-2023 - pancake */
 
 #include <r_arch.h>
-#include "../../../asm/arch/include/opcode/m68k.h"
+#include "../../include/opcode/m68k.h"
 #include "disas-asm.h"
 
 typedef struct {

libr/arch/p/vax/vax.c

@@ -1,8 +1,8 @@
-/* radare - GPL - Copyright 2015-2022 - pancake, condret */
+/* radare - GPL - Copyright 2015-2023 - pancake, condret */
 
 #include <r_lib.h>
 #include <r_arch.h>
-#include "../../../asm/arch/include/disas-asm.h"
+#include "../../include/disas-asm.h"
 #include "vax.h"
 
 // XXX: this is just a PoC

libr/arch/p/xtensa.mk

@@ -8,7 +8,7 @@ STATIC_OBJ+=${OBJ_XTENSA}
 TARGET_XTENSA=arch_xtensa.${EXT_SO}
 
 ALL_TARGETS+=$(TARGET_XTENSA)
-CFLAGS+=-I$(LTOP)/asm/arch/include
+CFLAGS+=-I$(LTOP)/arch/include
 
 $(TARGET_XTENSA): $(OBJ_XTENSA)
 	$(CC) $(call libname,arch_xtensa) $(LDFLAGS) $(CFLAGS) -o arch_xtensa.$(EXT_SO) $(OBJ_XTENSA)