[rtems-libbsd commit] Avoid pci_bus.c file rename

Sebastian Huber sebh at rtems.org
Wed Sep 30 13:56:49 UTC 2015


Module:    rtems-libbsd
Branch:    master
Commit:    7d460ce63093ee6e6bb8bc5314b3154a9f4d7025
Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=7d460ce63093ee6e6bb8bc5314b3154a9f4d7025

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Fri Sep 25 14:05:58 2015 +0200

Avoid pci_bus.c file rename

---

 freebsd/sys/{i386 => x86}/pci/pci_bus.c | 0
 libbsd.py                               | 9 +--------
 wscript                                 | 2 +-
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/freebsd/sys/i386/pci/pci_bus.c b/freebsd/sys/x86/pci/pci_bus.c
similarity index 100%
rename from freebsd/sys/i386/pci/pci_bus.c
rename to freebsd/sys/x86/pci/pci_bus.c
diff --git a/libbsd.py b/libbsd.py
index 22241eb..24d4606 100755
--- a/libbsd.py
+++ b/libbsd.py
@@ -1746,14 +1746,7 @@ def pci(mm):
         'i386',
         [
             'sys/i386/i386/legacy.c',
-        ],
-	mm.generator['source']()
-    )
-    mod.addTargetSourceCPUDependentSourceFiles(
-        [ 'i386' ],
-        'x86',
-        [
-		'sys/x86/pci/pci_bus.c',
+            'sys/x86/pci/pci_bus.c',
         ],
 	mm.generator['source']()
     )
diff --git a/wscript b/wscript
index 5b9e010..673479f 100644
--- a/wscript
+++ b/wscript
@@ -1065,7 +1065,7 @@ def build(bld):
     if bld.get_env()["RTEMS_ARCH"] == "i386":
         source += ['freebsd/sys/i386/i386/in_cksum.c',
                    'freebsd/sys/i386/i386/legacy.c',
-                   'freebsd/sys/i386/pci/pci_bus.c']
+                   'freebsd/sys/x86/pci/pci_bus.c']
     if bld.get_env()["RTEMS_ARCH"] == "lm32":
         source += ['freebsd/sys/lm32/lm32/in_cksum.c']
     if bld.get_env()["RTEMS_ARCH"] == "m32c":



More information about the vc mailing list