[PATCH 2/3] i386: Add to build

[Jan Sommer]

---
 libbsd.py     | 7 +++++--
 waf_libbsd.py | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/libbsd.py b/libbsd.py
index bd24cd61..3823c03f 100644
--- a/libbsd.py
+++ b/libbsd.py
@@ -1556,6 +1556,8 @@ class dev_nic(builder.Module):
                 'sys/i386/include/specialreg.h',
                 'sys/i386/include/md_var.h',
                 'sys/i386/include/intr_machdep.h',
+                'sys/x86/include/intr_machdep.h',
+                'sys/x86/include/metadata.h',
                 'sys/i386/include/cpufunc.h',
                 'sys/mips/include/cpufunc.h',
                 'sys/mips/include/cpuregs.h',
@@ -2742,7 +2744,8 @@ class pci(builder.Module):
         self.addCPUDependentFreeBSDHeaderFiles(
             [
                 'sys/i386/include/_bus.h',
-                'sys/i386/include/legacyvar.h',
+                'sys/i386/include/bus.h',
+                'sys/x86/include/legacyvar.h',
                 'sys/x86/include/bus.h',
                 'sys/x86/include/pci_cfgreg.h',
             ]
@@ -2750,7 +2753,7 @@ class pci(builder.Module):
         self.addCPUDependentFreeBSDSourceFiles(
             [ 'i386' ],
             [
-                'sys/i386/i386/legacy.c',
+                'sys/x86/x86/legacy.c',
                 'sys/x86/pci/pci_bus.c',
             ],
             mm.generator['source']()
diff --git a/waf_libbsd.py b/waf_libbsd.py
index 46237c21..84f22b76 100644
--- a/waf_libbsd.py
+++ b/waf_libbsd.py
@@ -197,7 +197,7 @@ class Builder(builder.ModuleManager):
         if 'cpu-include-paths' in config:
             cpu = bld.get_env()['RTEMS_ARCH']
             if cpu == "i386":
-                cpu = 'x86'
+                includes += ['freebsd/sys/x86/include']
             for i in config['cpu-include-paths']:
                 includes += [i.replace('@CPU@', cpu)]
         if 'include-paths' in config:
-- 
2.17.1