Unify arch_shared_types.bf from the libsel

include/arch/arm/arch/32/mode/api/arch_shared_types.bf

@@ -1 +0,0 @@
-../../../../../../../libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/shared_types_32.bf

include/arch/arm/arch/32/mode/object/structures.bf

@@ -580,4 +580,4 @@ block dbg_wcr {
 }
 #endif /* CONFIG_HARDWARE_DEBUG_API */
 
-#include <mode/api/arch_shared_types.bf>
+#include <arch/api/shared_types.bf>

include/arch/arm/arch/api/shared_types.bf

@@ -0,0 +1 @@
+../../../../../libsel4/arch_include/arm/sel4/arch/shared_types.bf

include/arch/x86/arch/32/mode/api/arch_shared_types.bf

@@ -1 +0,0 @@
-../../../../../../../libsel4/sel4_arch_include/ia32/sel4/sel4_arch/shared_types_32.bf

include/arch/x86/arch/32/mode/object/structures.bf

@@ -572,4 +572,4 @@ block cr3 {
     padding                         12
 }
 
-#include <mode/api/arch_shared_types.bf>
+#include <arch/api/shared_types.bf>

include/arch/x86/arch/64/mode/api/arch_shared_types.bf

@@ -1 +0,0 @@
-../../../../../../../libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/shared_types_64.bf

include/arch/x86/arch/64/mode/object/structures.bf

@@ -632,4 +632,4 @@ block cr3 {
 }
 
 
-#include <mode/api/arch_shared_types.bf>
+#include <arch/api/shared_types.bf>

include/arch/x86/arch/api/shared_types.bf

@@ -0,0 +1 @@
+../../../../../libsel4/arch_include/x86/sel4/arch/shared_types.bf

libsel4/Makefile

@@ -103,7 +103,7 @@ include/sel4/%.pbf: ${SOURCE_DIR}/include/sel4/%.bf $(srctree)/include/generated
 include/sel4/sel4_arch/%.pbf: ${SOURCE_DIR}/sel4_arch_include/${SEL4_ARCH}/sel4/sel4_arch/types.bf $(srctree)/include/generated/autoconf.h
 	@echo " [PBF_GEN] $@"
 	@mkdir -p $(dir $@)
-	$(Q)${CPP} ${CPPFLAGS} -P $< > $@
+	$(Q)${CPP} ${CPPFLAGS} -I${SOURCE_DIR}/arch_include/${ARCH}/ -P $< > $@
 
 # Bitfield generator
 include/sel4/types_gen.h: \

libsel4/sel4_arch_include/aarch32/sel4/sel4_arch/types.bf

@@ -101,4 +101,4 @@ block DebugException {
 }
 #endif
 
-#include "shared_types_32.bf"
+#include <sel4/arch/shared_types.bf>

libsel4/sel4_arch_include/ia32/sel4/sel4_arch/shared_types_32.bf

@@ -1,24 +0,0 @@
---
--- Copyright 2016, Data61
--- Commonwealth Scientific and Industrial Research Organisation (CSIRO)
--- ABN 41 687 119 230
---
--- This software may be distributed and modified according to the terms of
--- the BSD 2-Clause license. Note that NO WARRANTY is provided.
--- See "LICENSE_BSD2.txt" for details.
---
--- @TAG(D61BSD)
---
-
-tagged_union seL4_Fault seL4_FaultType {
-    -- generic faults
-    tag NullFault 0
-    tag CapFault 1
-    tag UnknownSyscall 2
-    tag UserException 3
-#ifdef CONFIG_HARDWARE_DEBUG_API
-    tag DebugException 4
-#endif
-    -- arch specific faults
-    tag VMFault 5
-}

libsel4/sel4_arch_include/ia32/sel4/sel4_arch/types.bf

@@ -83,4 +83,4 @@ block DebugException {
 }
 #endif
 
-#include "shared_types_32.bf"
+#include <sel4/arch/shared_types.bf>

libsel4/sel4_arch_include/x86_64/sel4/sel4_arch/types.bf

@@ -91,4 +91,4 @@ block DebugException {
 }
 #endif
 
-#include "shared_types_64.bf"
+#include <sel4/arch/shared_types.bf>