[rtems-libbsd commit] builder.py: addTargetSourceCPUDependentSourceFiles

[Joel Sherrill]

On 10/1/2015 2:38 PM, Chris Johns wrote:
> On 2/10/2015 8:33 am, Sebastian Huber wrote:
>> Why do you think it is wrong?
>
> Because the check is for 'arm' and the file is 'mips'.

If I recall correctly, the MIPS version is the most generic
version and it is used for architectures which don't have
their own.

But with this change, that should be checked to be sure
and comments added.

> Chris
>
>>
>> The background for this change is that we need an explicit one-to-one mapping of libbsd and original FreeBSD files.
>>
>> ----- Chris Johns <chrisj at rtems.org> schrieb:
>>> On 1/10/2015 2:56 am, Sebastian Huber wrote:
>>>> diff --git a/wscript b/wscript
>>>> index 673479f..88334e4 100644
>>>> --- a/wscript
>>>> +++ b/wscript
>>>> @@ -1053,42 +1053,41 @@ def build(bld):
>>>>                 'rtemsbsd/telnetd/pty.c',
>>>>                 'rtemsbsd/telnetd/telnetd.c']
>>>>       if bld.get_env()["RTEMS_ARCH"] == "arm":
>>>> -        source += ['freebsd/sys/arm/arm/in_cksum.c']
>>>> +        source += ['freebsd/sys/mips/mips/in_cksum.c']
>>>
>>> This looks wrong and checking git it is wrong.
>>>
>>>>       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":
>>>> -        source += ['freebsd/sys/bfin/bfin/in_cksum.c']
>>>> +        source += ['freebsd/sys/mips/mips/in_cksum.c']
>>>>       if bld.get_env()["RTEMS_ARCH"] == "cflags":
>>>>           source += ['default']
>>>>       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":
>>>>           source += ['freebsd/sys/i386/i386/in_cksum.c',
>>>>                      'freebsd/sys/i386/i386/legacy.c',
>>>>                      'freebsd/sys/x86/pci/pci_bus.c']
>>>>       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":
>>>> -        source += ['freebsd/sys/m32c/m32c/in_cksum.c']
>>>> +        source += ['freebsd/sys/mips/mips/in_cksum.c']
>>>>       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":
>>>> -        source += ['freebsd/sys/m68k/m68k/in_cksum.c']
>>>> +        source += ['freebsd/sys/mips/mips/in_cksum.c']
>>>>       if bld.get_env()["RTEMS_ARCH"] == "mips":
>>>>           source += ['freebsd/sys/mips/mips/in_cksum.c']
>>>>       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":
>>>>           source += ['freebsd/sys/powerpc/powerpc/in_cksum.c']
>>>>       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":
>>>> -        source += ['freebsd/sys/mips/mips/in_cksum.c',
>>>> -                   'freebsd/sys/sparc/sparc/in_cksum.c']
>>>> +        source += ['freebsd/sys/mips/mips/in_cksum.c']
>>>>       if bld.get_env()["RTEMS_ARCH"] == "sparc64":
>>>>           source += ['freebsd/sys/sparc64/sparc64/in_cksum.c']
>>>>       if bld.get_env()["RTEMS_ARCH"] == "v850":
>>>> -        source += ['freebsd/sys/v850/v850/in_cksum.c']
>>>> +        source += ['freebsd/sys/mips/mips/in_cksum.c']
>>>
>>> They all seem wrong which is a puzzling as to how this builds.
>>>
>>> Chris
>>> _______________________________________________
>>> devel mailing list
>>> devel at rtems.org
>>> http://lists.rtems.org/mailman/listinfo/devel
>>
> _______________________________________________
> devel mailing list
> devel at rtems.org
> http://lists.rtems.org/mailman/listinfo/devel
>

-- 
Joel Sherrill, Ph.D.             Director of Research & Development
joel.sherrill at OARcorp.com        On-Line Applications Research
Ask me about RTEMS: a free RTOS  Huntsville AL 35805
Support Available                (256) 722-9985