builder.py: addTargetSourceCPUDependentSourceFiles

Avoid and delete this function.
This commit is contained in:
Sebastian Huber 2015-09-25 14:14:04 +02:00
parent df811cf76c
commit 40f7d5cf7d
3 changed files with 29 additions and 52 deletions

View File

@ -450,7 +450,8 @@ class Module:
RTEMSPathComposer(), NoConverter(), NoConverter(), RTEMSPathComposer(), NoConverter(), NoConverter(),
assertSourceFile, sourceFileFragmentComposer) assertSourceFile, sourceFileFragmentComposer)
def addCPUDependentSourceFiles(self, cpu, files, sourceFileFragmentComposer): def addCPUDependentSourceFiles(self, cpus, files, sourceFileFragmentComposer):
for cpu in cpus:
self.initCPUDependencies(cpu) self.initCPUDependencies(cpu)
self.cpuDependentSourceFiles[cpu] += \ self.cpuDependentSourceFiles[cpu] += \
self.addFiles(files, self.addFiles(files,
@ -458,16 +459,6 @@ class Module:
FromRTEMSToFreeBSDSourceConverter(), assertSourceFile, FromRTEMSToFreeBSDSourceConverter(), assertSourceFile,
sourceFileFragmentComposer) sourceFileFragmentComposer)
def addTargetSourceCPUDependentSourceFiles(self, targetCPUs, sourceCPU, files,
sourceFileFragmentComposer):
for cpu in targetCPUs:
self.initCPUDependencies(cpu)
self.cpuDependentSourceFiles[cpu] += \
self.addFiles(files,
TargetSourceCPUDependentPathComposer(cpu, sourceCPU),
FromFreeBSDToRTEMSSourceConverter(), NoConverter(),
assertSourceFile, sourceFileFragmentComposer)
def addTest(self, testFragementComposer): def addTest(self, testFragementComposer):
self.files += [File(testFragementComposer.testName, self.files += [File(testFragementComposer.testName,
PathComposer(), NoConverter(), NoConverter(), PathComposer(), NoConverter(), NoConverter(),

View File

@ -1743,7 +1743,7 @@ def pci(mm):
] ]
) )
mod.addCPUDependentSourceFiles( mod.addCPUDependentSourceFiles(
'i386', [ 'i386' ],
[ [
'sys/i386/i386/legacy.c', 'sys/i386/i386/legacy.c',
'sys/x86/pci/pci_bus.c', 'sys/x86/pci/pci_bus.c',
@ -2367,47 +2367,34 @@ def in_cksum(mm):
'sys/mips/include/in_cksum.h', 'sys/mips/include/in_cksum.h',
] ]
) )
mod.addTargetSourceCPUDependentSourceFiles(
[ 'arm', 'avr', 'bfin', 'h8300', 'lm32', 'm32c', 'm32r', 'm68k',
'nios2', 'sh', 'sparc', 'v850' ],
'mips',
[
'sys/mips/mips/in_cksum.c',
],
mm.generator['source']()
)
mod.addCPUDependentSourceFiles( mod.addCPUDependentSourceFiles(
'i386', [ 'i386' ],
[ [
'sys/i386/i386/in_cksum.c', 'sys/i386/i386/in_cksum.c',
], ],
mm.generator['source']() mm.generator['source']()
) )
mod.addCPUDependentSourceFiles( mod.addCPUDependentSourceFiles(
'mips', [ 'powerpc' ],
[
'sys/mips/mips/in_cksum.c',
],
mm.generator['source']()
)
mod.addCPUDependentSourceFiles(
'powerpc',
[ [
'sys/powerpc/powerpc/in_cksum.c', 'sys/powerpc/powerpc/in_cksum.c',
], ],
mm.generator['source']() mm.generator['source']()
) )
mod.addCPUDependentSourceFiles( mod.addCPUDependentSourceFiles(
'sparc', [ 'sparc64' ],
[ [
'sys/mips/mips/in_cksum.c', 'sys/sparc64/sparc64/in_cksum.c',
], ],
mm.generator['source']() mm.generator['source']()
) )
mod.addCPUDependentSourceFiles( mod.addCPUDependentSourceFiles(
'sparc64',
[ [
'sys/sparc64/sparc64/in_cksum.c', 'arm', 'avr', 'bfin', 'h8300', 'lm32', 'm32c', 'm32r', 'm68k',
'mips', 'nios2', 'sh', 'sparc', 'v850'
],
[
'sys/mips/mips/in_cksum.c',
], ],
mm.generator['source']() mm.generator['source']()
) )

25
wscript
View File

@ -1053,42 +1053,41 @@ def build(bld):
'rtemsbsd/telnetd/pty.c', 'rtemsbsd/telnetd/pty.c',
'rtemsbsd/telnetd/telnetd.c'] 'rtemsbsd/telnetd/telnetd.c']
if bld.get_env()["RTEMS_ARCH"] == "arm": if bld.get_env()["RTEMS_ARCH"] == "arm":
source += ['freebsd/sys/arm/arm/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "avr": if bld.get_env()["RTEMS_ARCH"] == "avr":
source += ['freebsd/sys/avr/avr/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "bfin": if bld.get_env()["RTEMS_ARCH"] == "bfin":
source += ['freebsd/sys/bfin/bfin/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "cflags": if bld.get_env()["RTEMS_ARCH"] == "cflags":
source += ['default'] source += ['default']
if bld.get_env()["RTEMS_ARCH"] == "h8300": if bld.get_env()["RTEMS_ARCH"] == "h8300":
source += ['freebsd/sys/h8300/h8300/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "i386": if bld.get_env()["RTEMS_ARCH"] == "i386":
source += ['freebsd/sys/i386/i386/in_cksum.c', source += ['freebsd/sys/i386/i386/in_cksum.c',
'freebsd/sys/i386/i386/legacy.c', 'freebsd/sys/i386/i386/legacy.c',
'freebsd/sys/x86/pci/pci_bus.c'] 'freebsd/sys/x86/pci/pci_bus.c']
if bld.get_env()["RTEMS_ARCH"] == "lm32": if bld.get_env()["RTEMS_ARCH"] == "lm32":
source += ['freebsd/sys/lm32/lm32/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "m32c": if bld.get_env()["RTEMS_ARCH"] == "m32c":
source += ['freebsd/sys/m32c/m32c/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "m32r": if bld.get_env()["RTEMS_ARCH"] == "m32r":
source += ['freebsd/sys/m32r/m32r/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "m68k": if bld.get_env()["RTEMS_ARCH"] == "m68k":
source += ['freebsd/sys/m68k/m68k/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "mips": if bld.get_env()["RTEMS_ARCH"] == "mips":
source += ['freebsd/sys/mips/mips/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "nios2": if bld.get_env()["RTEMS_ARCH"] == "nios2":
source += ['freebsd/sys/nios2/nios2/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "powerpc": if bld.get_env()["RTEMS_ARCH"] == "powerpc":
source += ['freebsd/sys/powerpc/powerpc/in_cksum.c'] source += ['freebsd/sys/powerpc/powerpc/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "sh": if bld.get_env()["RTEMS_ARCH"] == "sh":
source += ['freebsd/sys/sh/sh/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "sparc": if bld.get_env()["RTEMS_ARCH"] == "sparc":
source += ['freebsd/sys/mips/mips/in_cksum.c', source += ['freebsd/sys/mips/mips/in_cksum.c']
'freebsd/sys/sparc/sparc/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "sparc64": if bld.get_env()["RTEMS_ARCH"] == "sparc64":
source += ['freebsd/sys/sparc64/sparc64/in_cksum.c'] source += ['freebsd/sys/sparc64/sparc64/in_cksum.c']
if bld.get_env()["RTEMS_ARCH"] == "v850": if bld.get_env()["RTEMS_ARCH"] == "v850":
source += ['freebsd/sys/v850/v850/in_cksum.c'] source += ['freebsd/sys/mips/mips/in_cksum.c']
bld.stlib(target = "bsd", bld.stlib(target = "bsd",
features = "c cxx", features = "c cxx",
cflags = cflags, cflags = cflags,