compat: arch-namespace certain includes

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

5 files changed, 8 insertions, 8 deletions

diff --git a/src/compat/Kbuild.include b/src/compat/Kbuild.include
index 974c0d3..04ffdeb 100644
--- a/src/compat/Kbuild.include
+++ b/src/compat/Kbuild.include
@@ -25,16 +25,16 @@ ccflags-y += -I$(src)/compat/dst_cache/include
 wireguard-y += compat/dst_cache/dst_cache.o
 endif
 
-ifeq ($(wildcard $(srctree)/arch/x86/include/asm/intel-family.h),)
-ccflags-y += -I$(src)/compat/intel-family/include
+ifeq ($(wildcard $(srctree)/arch/x86/include/asm/intel-family.h)$(CONFIG_X86),y)
+ccflags-y += -I$(src)/compat/intel-family-x86/include
 endif
 
-ifeq ($(wildcard $(srctree)/arch/x86/include/asm/fpu/api.h),)
-ccflags-y += -I$(src)/compat/fpu/include
+ifeq ($(wildcard $(srctree)/arch/x86/include/asm/fpu/api.h)$(CONFIG_X86),y)
+ccflags-y += -I$(src)/compat/fpu-x86/include
 endif
 
-ifeq ($(wildcard $(srctree)/arch/x86/include/asm/simd.h),)
-ccflags-y += -I$(src)/compat/simd/include
+ifeq ($(wildcard $(srctree)/arch/x86/include/asm/simd.h)$(CONFIG_X86),y)
+ccflags-y += -I$(src)/compat/simd-x86/include
 endif
 
 ifeq ($(wildcard $(srctree)/include/net/udp_tunnel.h),)
@@ -48,10 +48,10 @@ wireguard-y += compat/memneq/memneq.o
 endif
 
 ifeq ($(wildcard $(srctree)/arch/arm/include/asm/neon.h)$(CONFIG_ARM),y)
-ccflags-y += -I$(src)/compat/neon/include
+ccflags-y += -I$(src)/compat/neon-arm/include
 endif
 ifeq ($(wildcard $(srctree)/arch/arm64/include/asm/neon.h)$(CONFIG_ARM64),y)
-ccflags-y += -I$(src)/compat/neon/include
+ccflags-y += -I$(src)/compat/neon-arm/include
 endif
 
 ifeq ($(CONFIG_X86_64),y)
diff --git a/src/compat/fpu/include/asm/fpu/api.h b/src/compat/fpu-x86/include/asm/fpu/api.h
index f3f9117..f3f9117 100644
--- a/src/compat/fpu/include/asm/fpu/api.h
+++ b/src/compat/fpu-x86/include/asm/fpu/api.h
diff --git a/src/compat/intel-family/include/asm/intel-family.h b/src/compat/intel-family-x86/include/asm/intel-family.h
index 35a6bc4..35a6bc4 100644
--- a/src/compat/intel-family/include/asm/intel-family.h
+++ b/src/compat/intel-family-x86/include/asm/intel-family.h
diff --git a/src/compat/neon/include/asm/neon.h b/src/compat/neon-arm/include/asm/neon.h
index 980d831..980d831 100644
--- a/src/compat/neon/include/asm/neon.h
+++ b/src/compat/neon-arm/include/asm/neon.h
diff --git a/src/compat/simd/include/asm/simd.h b/src/compat/simd-x86/include/asm/simd.h
index f3f9117..f3f9117 100644
--- a/src/compat/simd/include/asm/simd.h
+++ b/src/compat/simd-x86/include/asm/simd.h