[rtems-libbsd commit] Add riscv support

Hesham Almatary heshamelmatary at gmail.com
Fri May 24 10:38:57 UTC 2019


Sounds great.

Should I assume rtems-libbsd should be built successfully yet?

I tried today (following fresh builds/installs, README instructions)
but I am getting a few complication errors:

Waf: Entering directory
`/local/scratch/hmka2/Coding/RTEMS/sandbox_riscv/rtems-libbsd/build/riscv-rtems5-rv64imafdc_medany-default'
[   9/1883] Compiling freebsd/sbin/pfctl/parse.c
[  10/1883] Compiling freebsd/contrib/expat/lib/xmlrole.c
[  11/1883] Compiling freebsd/contrib/expat/lib/xmlparse.c
[  12/1883] Compiling freebsd/contrib/expat/lib/xmltok_ns.c
[  13/1883] Compiling freebsd/contrib/expat/lib/xmltok_impl.c
[  14/1883] Compiling freebsd/contrib/expat/lib/xmltok.c
[  15/1883] Compiling freebsd/lib/libc/rpc/pmap_prot.c
[  16/1883] Compiling freebsd/lib/libc/net/getnetbynis.c
In file included from
/local/scratch/hmka2/Coding/RTEMS/sandbox_riscv/rtems/5/riscv-rtems5/include/sys/_types.h:25,
                 from
/local/scratch/hmka2/Coding/RTEMS/sandbox_riscv/rtems/5/lib/gcc/riscv-rtems5/9.1.0/include/stddef.h:54,
                 from
/local/scratch/hmka2/Coding/RTEMS/sandbox_riscv/rtems/5/riscv-rtems5/include/sys/cdefs.h:47,
                 from ../../rtemsbsd/include/machine/rtems-bsd-user-space.h:47,
                 from ../../freebsd/contrib/expat/lib/xmlrole.c:1:
/local/scratch/hmka2/Coding/RTEMS/sandbox_riscv/rtems/5/riscv-rtems5/include/sys/lock.h:32:14:
error: expected ';' before 'struct'
   32 | __BEGIN_DECLS
      |              ^
      |              ;
   33 |
   34 | struct timespec;
      | ~~~~~~
/local/scratch/hmka2/Coding/RTEMS/sandbox_riscv/rtems/5/riscv-rtems5/include/sys/lock.h:361:40:
error: unknown type name 'size_t'
  361 | int _Sched_Name_to_index(const char *, size_t);
      |                                        ^~~~~~
/local/scratch/hmka2/Coding/RTEMS/sandbox_riscv/rtems/5/riscv-rtems5/include/sys/lock.h:31:1:
note: 'size_t' is defined in header '<stddef.h>'; did you forget to
'#include <stddef.h>'?
   30 | #include <stddef.h>
  +++ |+#include <stddef.h>
   31 |
/local/scratch/hmka2/Coding/RTEMS/sandbox_riscv/rtems/5/riscv-rtems5/include/sys/lock.h:389:12:
error: expected ';' before 'typedef'
  389 | __END_DECLS
      |            ^
      |            ;


On Thu, 23 May 2019 at 07:13, Sebastian Huber <sebh at rtems.org> wrote:
>
> Module:    rtems-libbsd
> Branch:    5-freebsd-12
> Commit:    5cb01f277962d3127d364bf871f799b34e6b6be6
> Changeset: http://git.rtems.org/rtems-libbsd/commit/?id=5cb01f277962d3127d364bf871f799b34e6b6be6
>
> Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
> Date:      Thu May 23 07:59:52 2019 +0200
>
> Add riscv support
>
> ---
>
>  freebsd/sys/riscv/include/machine/in_cksum.h | 83 ++++++++++++++++++++++++++++
>  libbsd.py                                    |  2 +-
>  2 files changed, 84 insertions(+), 1 deletion(-)
>
> diff --git a/freebsd/sys/riscv/include/machine/in_cksum.h b/freebsd/sys/riscv/include/machine/in_cksum.h
> new file mode 100644
> index 0000000..d55b838
> --- /dev/null
> +++ b/freebsd/sys/riscv/include/machine/in_cksum.h
> @@ -0,0 +1,83 @@
> +/*-
> + * SPDX-License-Identifier: BSD-3-Clause
> + *
> + * Copyright (c) 1990 The Regents of the University of California.
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + *    notice, this list of conditions and the following disclaimer.
> + * 2. Redistributions in binary form must reproduce the above copyright
> + *    notice, this list of conditions and the following disclaimer in the
> + *    documentation and/or other materials provided with the distribution.
> + * 3. Neither the name of the University nor the names of its contributors
> + *    may be used to endorse or promote products derived from this software
> + *    without specific prior written permission.
> + *
> + * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
> + * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
> + * SUCH DAMAGE.
> + *
> + *     from tahoe:     in_cksum.c      1.2     86/01/05
> + *     from:           @(#)in_cksum.c  1.3 (Berkeley) 1/19/91
> + *     from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp
> + *     from: src/sys/alpha/include/in_cksum.h,v 1.7 2005/03/02 21:33:20 joerg
> + * $FreeBSD$
> + */
> +
> +#ifndef _MACHINE_IN_CKSUM_H_
> +#define        _MACHINE_IN_CKSUM_H_    1
> +
> +#include <sys/cdefs.h>
> +
> +#define        in_cksum(m, len)        in_cksum_skip(m, len, 0)
> +
> +#if defined(IPVERSION) && (IPVERSION == 4)
> +/*
> + * It it useful to have an Internet checksum routine which is inlineable
> + * and optimized specifically for the task of computing IP header checksums
> + * in the normal case (where there are no options and the header length is
> + * therefore always exactly five 32-bit words.
> + */
> +#ifdef __CC_SUPPORTS___INLINE
> +
> +static __inline void
> +in_cksum_update(struct ip *ip)
> +{
> +       int __tmpsum;
> +       __tmpsum = (int)ntohs(ip->ip_sum) + 256;
> +       ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16));
> +}
> +
> +#else
> +
> +#define        in_cksum_update(ip)                                             \
> +       do {                                                            \
> +               int __tmpsum;                                           \
> +               __tmpsum = (int)ntohs(ip->ip_sum) + 256;                \
> +               ip->ip_sum = htons(__tmpsum + (__tmpsum >> 16));        \
> +       } while(0)
> +
> +#endif
> +#endif
> +
> +#ifdef _KERNEL
> +#if defined(IPVERSION) && (IPVERSION == 4)
> +u_int in_cksum_hdr(const struct ip *ip);
> +#endif
> +u_short in_addword(u_short sum, u_short b);
> +u_short in_pseudo(u_int sum, u_int b, u_int c);
> +u_short in_cksum_skip(struct mbuf *m, int len, int skip);
> +#endif
> +
> +#endif /* _MACHINE_IN_CKSUM_H_ */
> diff --git a/libbsd.py b/libbsd.py
> index da3c630..3dd3308 100644
> --- a/libbsd.py
> +++ b/libbsd.py
> @@ -4775,7 +4775,7 @@ class in_cksum(builder.Module):
>          self.addCPUDependentFreeBSDSourceFiles(
>              [
>                  'arm', 'avr', 'bfin', 'h8300', 'lm32', 'm32c', 'm32r', 'm68k',
> -                'mips', 'nios2', 'sh', 'sparc', 'v850'
> +                'mips', 'nios2', 'riscv', 'sh', 'sparc', 'v850'
>              ],
>              [
>                  'sys/mips/mips/in_cksum.c',
>
> _______________________________________________
> vc mailing list
> vc at rtems.org
> http://lists.rtems.org/mailman/listinfo/vc

--
Hesham


More information about the vc mailing list