From bcdce02d9bc8150e1d191ed5ca9da45b7604964a Mon Sep 17 00:00:00 2001 From: Sebastian Huber Date: Tue, 21 Aug 2018 13:47:02 +0200 Subject: Update to FreeBSD head 2018-06-01 Git mirror commit fb63610a69b0eb7f69a201ba05c4c1a7a2739cf9. Update #3472. --- libbsd.py | 75 ++++++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 58 insertions(+), 17 deletions(-) (limited to 'libbsd.py') diff --git a/libbsd.py b/libbsd.py index 436652cb..dc6f5702 100644 --- a/libbsd.py +++ b/libbsd.py @@ -58,6 +58,7 @@ _defaults = { # 'include-paths': ['rtemsbsd/include', 'freebsd/sys', + 'freebsd/sys/contrib/ck/include', 'freebsd/sys/contrib/pf', 'freebsd/crypto', 'freebsd/sys/net', @@ -247,6 +248,7 @@ class rtems(builder.Module): 'rtems/rtems-kernel-chunk.c', 'rtems/rtems-kernel-configintrhook.c', 'rtems/rtems-kernel-delay.c', + 'rtems/rtems-kernel-epoch.c', 'rtems/rtems-kernel-get-file.c', 'rtems/rtems-kernel-init.c', 'rtems/rtems-kernel-irqs.c', @@ -354,6 +356,35 @@ class base(builder.Module): [ 'sys/bsm/audit.h', 'sys/bsm/audit_kevents.h', + 'sys/contrib/ck/include/ck_backoff.h', + 'sys/contrib/ck/include/ck_cc.h', + 'sys/contrib/ck/include/ck_epoch.h', + 'sys/contrib/ck/include/ck_limits.h', + 'sys/contrib/ck/include/ck_md.h', + 'sys/contrib/ck/include/ck_pr.h', + 'sys/contrib/ck/include/ck_queue.h', + 'sys/contrib/ck/include/ck_stack.h', + 'sys/contrib/ck/include/ck_stdbool.h', + 'sys/contrib/ck/include/ck_stddef.h', + 'sys/contrib/ck/include/ck_stdint.h', + 'sys/contrib/ck/include/ck_string.h', + 'sys/contrib/ck/include/gcc/aarch64/ck_f_pr.h', + 'sys/contrib/ck/include/gcc/aarch64/ck_pr.h', + 'sys/contrib/ck/include/gcc/arm/ck_f_pr.h', + 'sys/contrib/ck/include/gcc/arm/ck_pr.h', + 'sys/contrib/ck/include/gcc/ck_cc.h', + 'sys/contrib/ck/include/gcc/ck_f_pr.h', + 'sys/contrib/ck/include/gcc/ck_pr.h', + 'sys/contrib/ck/include/gcc/ppc64/ck_f_pr.h', + 'sys/contrib/ck/include/gcc/ppc64/ck_pr.h', + 'sys/contrib/ck/include/gcc/ppc/ck_f_pr.h', + 'sys/contrib/ck/include/gcc/ppc/ck_pr.h', + 'sys/contrib/ck/include/gcc/sparcv9/ck_f_pr.h', + 'sys/contrib/ck/include/gcc/sparcv9/ck_pr.h', + 'sys/contrib/ck/include/gcc/x86_64/ck_f_pr.h', + 'sys/contrib/ck/include/gcc/x86_64/ck_pr.h', + 'sys/contrib/ck/include/gcc/x86/ck_f_pr.h', + 'sys/contrib/ck/include/gcc/x86/ck_pr.h', 'sys/fs/devfs/devfs_int.h', 'sys/security/audit/audit.h', 'sys/security/mac/mac_framework.h', @@ -370,6 +401,7 @@ class base(builder.Module): 'sys/sys/capability.h', 'sys/sys/caprights.h', 'sys/sys/capsicum.h', + 'sys/sys/ck.h', 'sys/sys/condvar.h', 'sys/sys/conf.h', 'sys/sys/counter.h', @@ -479,6 +511,7 @@ class base(builder.Module): ) self.addKernelSpaceSourceFiles( [ + 'sys/contrib/ck/src/ck_epoch.c', 'sys/kern/init_main.c', 'sys/kern/kern_condvar.c', 'sys/kern/kern_conf.c', @@ -503,6 +536,7 @@ class base(builder.Module): 'sys/kern/subr_counter.c', 'sys/kern/subr_eventhandler.c', 'sys/kern/subr_firmware.c', + 'sys/kern/subr_gtaskqueue.c', 'sys/kern/subr_hash.c', 'sys/kern/subr_hints.c', 'sys/kern/subr_kobj.c', @@ -1647,10 +1681,8 @@ class net(builder.Module): 'sys/net/bpf_zerocopy.h', 'sys/net/bridgestp.h', 'sys/net/ethernet.h', - 'sys/net/fddi.h', 'sys/net/firewire.h', 'sys/net/ieee8023ad_lacp.h', - 'sys/net/if_arc.h', 'sys/net/if_arp.h', 'sys/net/if_bridgevar.h', 'sys/net/if_clone.h', @@ -1701,7 +1733,6 @@ class net(builder.Module): 'sys/net/if_edsc.c', 'sys/net/if_enc.c', 'sys/net/if_epair.c', - 'sys/net/if_fddisubr.c', 'sys/net/if_fwsubr.c', 'sys/net/if_gif.c', 'sys/net/if_gre.c', @@ -1727,7 +1758,6 @@ class net(builder.Module): 'sys/net/bpf.c', 'sys/net/bpf_filter.c', 'sys/net/bpf_jitter.c', - 'sys/net/if_arcsubr.c', 'sys/net/if_bridge.c', 'sys/net/if_ethersubr.c', 'sys/net/netisr.c', @@ -1773,6 +1803,7 @@ class netinet(builder.Module): 'sys/netinet/ip_mroute.h', 'sys/netinet/ip_options.h', 'sys/netinet/ip_var.h', + 'sys/netinet/netdump/netdump.h', 'sys/netinet/pim.h', 'sys/netinet/pim_var.h', 'sys/netinet/sctp_asconf.h', @@ -1802,6 +1833,7 @@ class netinet(builder.Module): 'sys/netinet/tcp_fastopen.h', 'sys/netinet/tcp_fsm.h', 'sys/netinet/tcp_hostcache.h', + 'sys/netinet/tcp_hpts.h', 'sys/netinet/tcpip.h', 'sys/netinet/tcp_log_buf.h', 'sys/netinet/tcp_lro.h', @@ -3964,45 +3996,54 @@ class contrib_libpcap(builder.Module): cflags = ['-D__FreeBSD__=1', '-DBSD=1', '-D_U_=__attribute__((unused))', + '-DPACKAGE_VERSION="libbsd"', '-DHAVE_LIMITS_H=1', '-DHAVE_INTTYPES=1', '-DHAVE_STDINT=1', '-DHAVE_STRERROR=1', + '-DHAVE_STRLCAT=1', '-DHAVE_STRLCPY=1', '-DHAVE_SNPRINTF=1', '-DHAVE_VSNPRINTF=1', '-DHAVE_SOCKADDR_SA_LEN=1', - #'-DHAVE_ZEROCOPY_BPF=1', - '-DHAVE_NET_IF_MEDIA_H=1', + '-DHAVE_NET_IF_MEDIA_H=1', '-DHAVE_SYS_IOCCOM_H=1'] self.addUserSpaceHeaderFiles( [ 'contrib/libpcap/arcnet.h', 'contrib/libpcap/atmuni31.h', + 'contrib/libpcap/diag-control.h', 'contrib/libpcap/ethertype.h', 'contrib/libpcap/extract.h', + 'contrib/libpcap/fmtutils.h', + 'contrib/libpcap/ftmacros.h', 'contrib/libpcap/gencode.h', 'contrib/libpcap/ieee80211.h', 'contrib/libpcap/llc.h', 'contrib/libpcap/nametoaddr.h', 'contrib/libpcap/nlpid.h', + 'contrib/libpcap/pcap/can_socketcan.h', 'contrib/libpcap/pcap-common.h', - 'contrib/libpcap/pcap-int.h', - 'contrib/libpcap/pcap-namedb.h', + 'contrib/libpcap/pcap/compiler-tests.h', + 'contrib/libpcap/pcap/funcattrs.h', 'contrib/libpcap/pcap.h', - 'contrib/libpcap/pcap/can_socketcan.h', - 'contrib/libpcap/pcap/export-defs.h', + 'contrib/libpcap/pcap-int.h', 'contrib/libpcap/pcap/ipnet.h', + 'contrib/libpcap/pcap-namedb.h', 'contrib/libpcap/pcap/namedb.h', 'contrib/libpcap/pcap/nflog.h', 'contrib/libpcap/pcap/pcap.h', + 'contrib/libpcap/pcap/pcap-inttypes.h', 'contrib/libpcap/pcap/sll.h', + 'contrib/libpcap/pcap-types.h', 'contrib/libpcap/pcap/usb.h', 'contrib/libpcap/portability.h', 'contrib/libpcap/ppp.h', - 'contrib/libpcap/sf-pcap-ng.h', 'contrib/libpcap/sf-pcap.h', + 'contrib/libpcap/sf-pcapng.h', 'contrib/libpcap/sunatmpos.h', + 'contrib/libpcap/varattrs.h', + 'contrib/libpcap/optimize.h', ] ) gen_cflags = cflags + ['-DNEED_YYPARSE_WRAPPER=1', @@ -4026,17 +4067,16 @@ class contrib_libpcap(builder.Module): 'contrib/libpcap/bpf_image.c', 'contrib/libpcap/etherent.c', 'contrib/libpcap/fad-getad.c', - 'contrib/libpcap/fad-helpers.c', + 'contrib/libpcap/fmtutils.c', 'contrib/libpcap/gencode.c', - 'contrib/libpcap/inet.c', - 'contrib/libpcap/pcap.c', + 'contrib/libpcap/nametoaddr.c', + 'contrib/libpcap/optimize.c', 'contrib/libpcap/pcap-bpf.c', + 'contrib/libpcap/pcap.c', 'contrib/libpcap/pcap-common.c', - 'contrib/libpcap/optimize.c', - 'contrib/libpcap/nametoaddr.c', 'contrib/libpcap/savefile.c', 'contrib/libpcap/sf-pcap.c', - 'contrib/libpcap/sf-pcap-ng.c', + 'contrib/libpcap/sf-pcapng.c', ], mm.generator['source'](cflags) ) @@ -4817,6 +4857,7 @@ class tests(builder.Module): def generate(self): mm = self.manager + self.addTest(mm.generator['test']('epoch01', ['test_main'])) self.addTest(mm.generator['test']('nfs01', ['test_main'], netTest = True)) self.addTest(mm.generator['test']('foobarclient', ['test_main'], runTest = False, netTest = True)) -- cgit v1.2.3