aboutsummaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/NOTES19
-rw-r--r--sys/conf/files45
-rw-r--r--sys/conf/files.amd6423
-rw-r--r--sys/conf/files.arm1
-rw-r--r--sys/conf/files.arm6416
-rw-r--r--sys/conf/files.i3865
-rw-r--r--sys/conf/files.mips1
-rw-r--r--sys/conf/files.pc984
-rw-r--r--sys/conf/files.powerpc16
-rw-r--r--sys/conf/files.riscv6
-rw-r--r--sys/conf/kern.mk24
-rw-r--r--sys/conf/kern.post.mk4
-rw-r--r--sys/conf/ldscript.amd641
-rw-r--r--sys/conf/ldscript.arm1
-rw-r--r--sys/conf/ldscript.arm641
-rw-r--r--sys/conf/ldscript.i3861
-rw-r--r--sys/conf/ldscript.mips1
-rw-r--r--sys/conf/ldscript.mips.cfe1
-rw-r--r--sys/conf/ldscript.mips.mips641
-rw-r--r--sys/conf/ldscript.mips.octeon11
-rw-r--r--sys/conf/ldscript.powerpc1
-rw-r--r--sys/conf/ldscript.powerpc641
-rw-r--r--sys/conf/ldscript.riscv3
-rw-r--r--sys/conf/ldscript.sparc641
-rw-r--r--sys/conf/options3
-rw-r--r--sys/conf/options.powerpc1
26 files changed, 131 insertions, 51 deletions
diff --git a/sys/conf/NOTES b/sys/conf/NOTES
index 00cdd65c5120..dda8211d44a3 100644
--- a/sys/conf/NOTES
+++ b/sys/conf/NOTES
@@ -578,6 +578,17 @@ options COMPILING_LINT
#
options STACK
+#
+# The NUM_CORE_FILES option specifies the limit for the number of core
+# files generated by a particular process, when the core file format
+# specifier includes the %I pattern. Since we only have 1 character for
+# the core count in the format string, meaning the range will be 0-9, the
+# maximum value allowed for this option is 10.
+# This core file limit can be adjusted at runtime via the debug.ncores
+# sysctl.
+#
+options NUM_CORE_FILES=5
+
#####################################################################
# PERFORMANCE MONITORING OPTIONS
@@ -965,6 +976,8 @@ device lagg
# IPFIREWALL_NAT adds support for in kernel nat in ipfw, and it requires
# LIBALIAS.
#
+# IPFIREWALL_NAT64 adds support for in kernel NAT64 in ipfw.
+#
# IPFIREWALL_NPTV6 adds support for in kernel NPTv6 in ipfw.
#
# IPSTEALTH enables code to support stealth forwarding (i.e., forwarding
@@ -988,6 +1001,7 @@ options IPFIREWALL_VERBOSE #enable logging to syslogd(8)
options IPFIREWALL_VERBOSE_LIMIT=100 #limit verbosity
options IPFIREWALL_DEFAULT_TO_ACCEPT #allow everything by default
options IPFIREWALL_NAT #ipfw kernel nat support
+options IPFIREWALL_NAT64 #ipfw kernel NAT64 support
options IPFIREWALL_NPTV6 #ipfw kernel IPv6 NPT support
options IPDIVERT #divert sockets
options IPFILTER #ipfilter support
@@ -2398,15 +2412,10 @@ options SND_OLDSTEREO
# Miscellaneous hardware:
#
# scd: Sony CD-ROM using proprietary (non-ATAPI) interface
-# mcd: Mitsumi CD-ROM using proprietary (non-ATAPI) interface
# bktr: Brooktree bt848/848a/849a/878/879 video capture and TV Tuner board
# joy: joystick (including IO DATA PCJOY PC Card joystick)
# cmx: OmniKey CardMan 4040 pccard smartcard reader
-# Mitsumi CD-ROM
-device mcd
-hint.mcd.0.at="isa"
-hint.mcd.0.port="0x300"
# for the Sony CDU31/33A CDROM
device scd
hint.scd.0.at="isa"
diff --git a/sys/conf/files b/sys/conf/files
index 549c5659ff1f..40c5281b3baf 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -86,9 +86,9 @@ cam/cam_xpt.c optional scbus
cam/ata/ata_all.c optional scbus
cam/ata/ata_xpt.c optional scbus
cam/ata/ata_pmp.c optional scbus
-cam/nvme/nvme_all.c optional scbus
+cam/nvme/nvme_all.c optional scbus nvme !nvd
cam/nvme/nvme_da.c optional scbus nvme da !nvd
-cam/nvme/nvme_xpt.c optional scbus
+cam/nvme/nvme_xpt.c optional scbus nvme !nvd
cam/scsi/scsi_xpt.c optional scbus
cam/scsi/scsi_all.c optional scbus
cam/scsi/scsi_cd.c optional cd
@@ -284,6 +284,7 @@ compat/cloudabi/cloudabi_proc.c optional compat_cloudabi64
compat/cloudabi/cloudabi_random.c optional compat_cloudabi64
compat/cloudabi/cloudabi_sock.c optional compat_cloudabi64
compat/cloudabi/cloudabi_thread.c optional compat_cloudabi64
+compat/cloudabi/cloudabi_vdso.c optional compat_cloudabi64
compat/cloudabi64/cloudabi64_fd.c optional compat_cloudabi64
compat/cloudabi64/cloudabi64_module.c optional compat_cloudabi64
compat/cloudabi64/cloudabi64_poll.c optional compat_cloudabi64
@@ -1735,7 +1736,7 @@ iwm3160fw.fwo optional iwm3160fw | iwmfw \
no-implicit-rule \
clean "iwm3160fw.fwo"
iwm3160.fw optional iwm3160fw | iwmfw \
- dependency "$S/contrib/dev/iwm/iwm-3160-9.fw.uu" \
+ dependency "$S/contrib/dev/iwm/iwm-3160-16.fw.uu" \
compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwm3160.fw"
@@ -1749,7 +1750,7 @@ iwm7260fw.fwo optional iwm7260fw | iwmfw \
no-implicit-rule \
clean "iwm7260fw.fwo"
iwm7260.fw optional iwm7260fw | iwmfw \
- dependency "$S/contrib/dev/iwm/iwm-7260-9.fw.uu" \
+ dependency "$S/contrib/dev/iwm/iwm-7260-16.fw.uu" \
compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwm7260.fw"
@@ -1763,10 +1764,24 @@ iwm7265fw.fwo optional iwm7265fw | iwmfw \
no-implicit-rule \
clean "iwm7265fw.fwo"
iwm7265.fw optional iwm7265fw | iwmfw \
- dependency "$S/contrib/dev/iwm/iwm-7265-9.fw.uu" \
+ dependency "$S/contrib/dev/iwm/iwm-7265-16.fw.uu" \
compile-with "${NORMAL_FW}" \
no-obj no-implicit-rule \
clean "iwm7265.fw"
+iwm8000Cfw.c optional iwm8000Cfw | iwmfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwm8000C.fw:iwm8000Cfw -miwm8000Cfw -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwm8000Cfw.c"
+iwm8000Cfw.fwo optional iwm8000Cfw | iwmfw \
+ dependency "iwm8000C.fw" \
+ compile-with "${NORMAL_FWO}" \
+ no-implicit-rule \
+ clean "iwm8000Cfw.fwo"
+iwm8000C.fw optional iwm8000Cfw | iwmfw \
+ dependency "$S/contrib/dev/iwm/iwm-8000C-16.fw.uu" \
+ compile-with "${NORMAL_FW}" \
+ no-obj no-implicit-rule \
+ clean "iwm8000C.fw"
dev/iwn/if_iwn.c optional iwn
iwn1000fw.c optional iwn1000fw | iwnfw \
compile-with "${AWK} -f $S/tools/fw_stub.awk iwn1000.fw:iwn1000fw -miwn1000fw -c${.TARGET}" \
@@ -2003,8 +2018,6 @@ dev/malo/if_malohal.c optional malo
dev/malo/if_malo_pci.c optional malo pci
dev/mc146818/mc146818.c optional mc146818
dev/mca/mca_bus.c optional mca
-dev/mcd/mcd.c optional mcd isa nowerror
-dev/mcd/mcd_isa.c optional mcd isa nowerror
dev/md/md.c optional md
dev/mdio/mdio_if.m optional miiproxy | mdio
dev/mdio/mdio.c optional miiproxy | mdio
@@ -2031,6 +2044,7 @@ dev/mii/icsphy.c optional miibus | icsphy
dev/mii/ip1000phy.c optional miibus | ip1000phy
dev/mii/jmphy.c optional miibus | jmphy
dev/mii/lxtphy.c optional miibus | lxtphy
+dev/mii/micphy.c optional miibus fdt | micphy fdt
dev/mii/mii.c optional miibus | mii
dev/mii/mii_bitbang.c optional miibus | mii_bitbang
dev/mii/mii_physubr.c optional miibus | mii
@@ -3333,6 +3347,7 @@ kern/subr_disk.c standard
kern/subr_eventhandler.c standard
kern/subr_fattime.c standard
kern/subr_firmware.c optional firmware
+kern/subr_gtaskqueue.c standard
kern/subr_hash.c standard
kern/subr_hints.c standard
kern/subr_kdb.c standard
@@ -3733,9 +3748,11 @@ netinet/in_fib.c optional inet
netinet/in_gif.c optional gif inet | netgraph_gif inet
netinet/ip_gre.c optional gre inet
netinet/ip_id.c optional inet
+netinet/in_jail.c optional inet
netinet/in_mcast.c optional inet
netinet/in_pcb.c optional inet | inet6
netinet/in_pcbgroup.c optional inet pcbgroup | inet6 pcbgroup
+netinet/in_prot.c optional inet | inet6
netinet/in_proto.c optional inet | inet6
netinet/in_rmx.c optional inet
netinet/in_rss.c optional inet rss
@@ -3800,6 +3817,7 @@ netinet6/in6_cksum.c optional inet6
netinet6/in6_fib.c optional inet6
netinet6/in6_gif.c optional gif inet6 | netgraph_gif inet6
netinet6/in6_ifattach.c optional inet6
+netinet6/in6_jail.c optional inet6
netinet6/in6_mcast.c optional inet6
netinet6/in6_pcb.c optional inet6
netinet6/in6_pcbgroup.c optional inet6 pcbgroup
@@ -3852,6 +3870,7 @@ netpfil/ipfw/ip_dummynet.c optional inet dummynet
netpfil/ipfw/ip_dn_io.c optional inet dummynet
netpfil/ipfw/ip_dn_glue.c optional inet dummynet
netpfil/ipfw/ip_fw2.c optional inet ipfirewall
+netpfil/ipfw/ip_fw_bpf.c optional inet ipfirewall
netpfil/ipfw/ip_fw_dynamic.c optional inet ipfirewall
netpfil/ipfw/ip_fw_eaction.c optional inet ipfirewall
netpfil/ipfw/ip_fw_log.c optional inet ipfirewall
@@ -3862,6 +3881,18 @@ netpfil/ipfw/ip_fw_table_algo.c optional inet ipfirewall
netpfil/ipfw/ip_fw_table_value.c optional inet ipfirewall
netpfil/ipfw/ip_fw_iface.c optional inet ipfirewall
netpfil/ipfw/ip_fw_nat.c optional inet ipfirewall_nat
+netpfil/ipfw/nat64/ip_fw_nat64.c optional inet inet6 ipfirewall \
+ ipfirewall_nat64
+netpfil/ipfw/nat64/nat64lsn.c optional inet inet6 ipfirewall \
+ ipfirewall_nat64
+netpfil/ipfw/nat64/nat64lsn_control.c optional inet inet6 ipfirewall \
+ ipfirewall_nat64
+netpfil/ipfw/nat64/nat64stl.c optional inet inet6 ipfirewall \
+ ipfirewall_nat64
+netpfil/ipfw/nat64/nat64stl_control.c optional inet inet6 ipfirewall \
+ ipfirewall_nat64
+netpfil/ipfw/nat64/nat64_translate.c optional inet inet6 ipfirewall \
+ ipfirewall_nat64
netpfil/ipfw/nptv6/ip_fw_nptv6.c optional inet inet6 ipfirewall \
ipfirewall_nptv6
netpfil/ipfw/nptv6/nptv6.c optional inet inet6 ipfirewall \
diff --git a/sys/conf/files.amd64 b/sys/conf/files.amd64
index 5f138cf6ad1d..b9c6c67f9665 100644
--- a/sys/conf/files.amd64
+++ b/sys/conf/files.amd64
@@ -8,6 +8,18 @@
# dependency lines other than the first are silently ignored.
#
#
+cloudabi64_vdso.o optional compat_cloudabi64 \
+ dependency "$S/contrib/cloudabi/cloudabi_vdso_x86_64.c" \
+ compile-with "${CC} -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi64/cloudabi64_vdso.lds.s -D_KERNEL -I. -I$S -I$S/contrib/cloudabi -O2 -fomit-frame-pointer $S/contrib/cloudabi/cloudabi_vdso_x86_64.c -o ${.TARGET}" \
+ no-obj no-implicit-rule \
+ clean "cloudabi64_vdso.o"
+#
+cloudabi64_vdso_blob.o optional compat_cloudabi64 \
+ dependency "cloudabi64_vdso.o" \
+ compile-with "${OBJCOPY} --input-target binary --output-target elf64-x86-64-freebsd --binary-architecture i386 cloudabi64_vdso.o ${.TARGET}" \
+ no-implicit-rule \
+ clean "cloudabi64_vdso_blob.o"
+#
linux32_genassym.o optional compat_linux32 \
dependency "$S/amd64/linux32/linux32_genassym.c" \
compile-with "${CC} ${CFLAGS:N-fno-common} -c ${.IMPSRC}" \
@@ -123,7 +135,6 @@ amd64/amd64/machdep.c standard
amd64/amd64/mem.c optional mem
amd64/amd64/minidump_machdep.c standard
amd64/amd64/mp_machdep.c optional smp
-amd64/amd64/mp_watchdog.c optional mp_watchdog smp
amd64/amd64/mpboot.S optional smp
amd64/amd64/pmap.c standard
amd64/amd64/prof_machdep.c optional profiling-routine
@@ -217,6 +228,12 @@ dev/ipmi/ipmi_pci.c optional ipmi pci
dev/ipmi/ipmi_linux.c optional ipmi compat_linux32
dev/ixl/if_ixl.c optional ixl pci \
compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_main.c optional ixl pci \
+ compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_qmgr.c optional ixl pci \
+ compile-with "${NORMAL_C} -I$S/dev/ixl"
+dev/ixl/ixl_pf_iov.c optional ixl pci \
+ compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/if_ixlv.c optional ixlv pci \
compile-with "${NORMAL_C} -I$S/dev/ixl"
dev/ixl/ixlvc.c optional ixlv pci \
@@ -270,13 +287,14 @@ dev/hyperv/utilities/hv_kvp.c optional hyperv
dev/hyperv/utilities/hv_shutdown.c optional hyperv
dev/hyperv/utilities/hv_timesync.c optional hyperv
dev/hyperv/utilities/hv_util.c optional hyperv
-dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv
dev/hyperv/vmbus/hyperv.c optional hyperv
dev/hyperv/vmbus/hyperv_busdma.c optional hyperv
dev/hyperv/vmbus/vmbus.c optional hyperv
+dev/hyperv/vmbus/vmbus_br.c optional hyperv
dev/hyperv/vmbus/vmbus_chan.c optional hyperv
dev/hyperv/vmbus/vmbus_et.c optional hyperv
dev/hyperv/vmbus/vmbus_if.m optional hyperv
+dev/hyperv/vmbus/vmbus_xact.c optional hyperv
dev/hyperv/vmbus/amd64/hyperv_machdep.c optional hyperv
dev/hyperv/vmbus/amd64/vmbus_vector.S optional hyperv
dev/nfe/if_nfe.c optional nfe pci
@@ -621,6 +639,7 @@ x86/x86/mca.c standard
x86/x86/mptable.c optional mptable
x86/x86/mptable_pci.c optional mptable pci
x86/x86/mp_x86.c optional smp
+x86/x86/mp_watchdog.c optional mp_watchdog smp
x86/x86/msi.c optional pci
x86/x86/nexus.c standard
x86/x86/pvclock.c standard
diff --git a/sys/conf/files.arm b/sys/conf/files.arm
index 06800ae58966..559c9419f940 100644
--- a/sys/conf/files.arm
+++ b/sys/conf/files.arm
@@ -40,6 +40,7 @@ arm/arm/fusu.S standard
arm/arm/gdb_machdep.c optional gdb
arm/arm/generic_timer.c optional generic_timer
arm/arm/gic.c optional gic
+arm/arm/gic_fdt.c optional gic fdt
arm/arm/hdmi_if.m optional hdmi
arm/arm/identcpu.c standard
arm/arm/in_cksum.c optional inet | inet6
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 5bbd822c9160..31acaf9ce32f 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -1,6 +1,19 @@
# $FreeBSD$
+cloudabi64_vdso.o optional compat_cloudabi64 \
+ dependency "$S/contrib/cloudabi/cloudabi_vdso_aarch64.c" \
+ compile-with "${CC} -shared -nostdinc -nostdlib -Wl,-T$S/compat/cloudabi64/cloudabi64_vdso.lds.s -D_KERNEL -I. -I$S -I$S/contrib/cloudabi -O2 -fomit-frame-pointer $S/contrib/cloudabi/cloudabi_vdso_aarch64.c -o ${.TARGET}" \
+ no-obj no-implicit-rule \
+ clean "cloudabi64_vdso.o"
+#
+cloudabi64_vdso_blob.o optional compat_cloudabi64 \
+ dependency "cloudabi64_vdso.o" \
+ compile-with "${OBJCOPY} --input-target binary --output-target elf64-littleaarch64 --binary-architecture aarch64 cloudabi64_vdso.o ${.TARGET}" \
+ no-implicit-rule \
+ clean "cloudabi64_vdso_blob.o"
+#
arm/arm/generic_timer.c standard
-arm/arm/gic.c optional intrng
+arm/arm/gic.c standard
+arm/arm/gic_fdt.c optional fdt
arm/arm/pmu.c standard
arm64/acpica/acpi_machdep.c optional acpi
arm64/acpica/OsdEnvironment.c optional acpi
@@ -69,6 +82,7 @@ dev/psci/psci_arm64.S optional psci
dev/uart/uart_cpu_fdt.c optional uart fdt
dev/uart/uart_dev_pl011.c optional uart pl011
dev/usb/controller/dwc_otg_hisi.c optional dwcotg fdt soc_hisi_hi6220
+dev/usb/controller/generic_ehci.c optional ehci acpi
dev/usb/controller/generic_ohci.c optional ohci fdt
dev/usb/controller/generic_usb_if.m optional ohci fdt
dev/vnic/mrml_bridge.c optional vnic fdt
diff --git a/sys/conf/files.i386 b/sys/conf/files.i386
index 178d5a330406..516bf77f7446 100644
--- a/sys/conf/files.i386
+++ b/sys/conf/files.i386
@@ -246,13 +246,14 @@ dev/hyperv/utilities/hv_kvp.c optional hyperv
dev/hyperv/utilities/hv_shutdown.c optional hyperv
dev/hyperv/utilities/hv_timesync.c optional hyperv
dev/hyperv/utilities/hv_util.c optional hyperv
-dev/hyperv/vmbus/hv_ring_buffer.c optional hyperv
dev/hyperv/vmbus/hyperv.c optional hyperv
dev/hyperv/vmbus/hyperv_busdma.c optional hyperv
dev/hyperv/vmbus/vmbus.c optional hyperv
+dev/hyperv/vmbus/vmbus_br.c optional hyperv
dev/hyperv/vmbus/vmbus_chan.c optional hyperv
dev/hyperv/vmbus/vmbus_et.c optional hyperv
dev/hyperv/vmbus/vmbus_if.m optional hyperv
+dev/hyperv/vmbus/vmbus_xact.c optional hyperv
dev/hyperv/vmbus/i386/hyperv_machdep.c optional hyperv
dev/hyperv/vmbus/i386/vmbus_vector.S optional hyperv
dev/ichwd/ichwd.c optional ichwd
@@ -481,7 +482,6 @@ i386/i386/mem.c optional mem
i386/i386/minidump_machdep.c standard
i386/i386/mp_clock.c optional smp
i386/i386/mp_machdep.c optional smp
-i386/i386/mp_watchdog.c optional mp_watchdog smp
i386/i386/mpboot.s optional smp
i386/i386/perfmon.c optional perfmon
i386/i386/pmap.c standard
@@ -612,6 +612,7 @@ x86/x86/mca.c standard
x86/x86/mptable.c optional apic
x86/x86/mptable_pci.c optional apic pci
x86/x86/mp_x86.c optional smp
+x86/x86/mp_watchdog.c optional mp_watchdog smp
x86/x86/msi.c optional apic pci
x86/x86/nexus.c standard
x86/x86/stack_machdep.c optional ddb | stack
diff --git a/sys/conf/files.mips b/sys/conf/files.mips
index 0fe07953c24b..8d1cf7d5858c 100644
--- a/sys/conf/files.mips
+++ b/sys/conf/files.mips
@@ -86,6 +86,7 @@ crypto/blowfish/bf_enc.c optional crypto | ipsec
crypto/des/des_enc.c optional crypto | ipsec | netsmb
# AP common nvram interface MIPS specific, but maybe should be more generic
+dev/nvram2env/nvram2env_mips.c optional nvram2env
dev/nvram2env/nvram2env.c optional nvram2env
# hwpmc support
diff --git a/sys/conf/files.pc98 b/sys/conf/files.pc98
index ecb3d4a78789..8a7dc98689e5 100644
--- a/sys/conf/files.pc98
+++ b/sys/conf/files.pc98
@@ -168,7 +168,6 @@ i386/i386/mem.c optional mem
i386/i386/minidump_machdep.c standard
i386/i386/mp_clock.c optional smp
i386/i386/mp_machdep.c optional smp
-i386/i386/mp_watchdog.c optional mp_watchdog smp
i386/i386/mpboot.s optional smp
i386/i386/perfmon.c optional perfmon
i386/i386/pmap.c standard
@@ -269,9 +268,10 @@ x86/x86/io_apic.c optional apic
x86/x86/legacy.c standard
x86/x86/local_apic.c optional apic
x86/x86/mca.c standard
-x86/x86/mp_x86.c optional smp
x86/x86/mptable.c optional apic
x86/x86/mptable_pci.c optional apic pci
+x86/x86/mp_x86.c optional smp
+x86/x86/mp_watchdog.c optional mp_watchdog smp
x86/x86/msi.c optional apic pci
x86/x86/nexus.c standard
x86/x86/stack_machdep.c optional ddb | stack
diff --git a/sys/conf/files.powerpc b/sys/conf/files.powerpc
index dc5d52daa9d7..0a8a05db85a5 100644
--- a/sys/conf/files.powerpc
+++ b/sys/conf/files.powerpc
@@ -76,7 +76,7 @@ dev/syscons/scvtb.c optional sc
dev/tsec/if_tsec.c optional tsec
dev/tsec/if_tsec_fdt.c optional tsec fdt
dev/uart/uart_cpu_powerpc.c optional uart
-dev/usb/controller/ehci_fsl.c optional ehci mpc85xx | ehci qoriq_dpaa
+dev/usb/controller/ehci_fsl.c optional ehci mpc85xx
dev/vt/hw/ofwfb/ofwfb.c optional vt aim
kern/kern_clocksource.c standard
kern/subr_dummy_vdso_tc.c standard
@@ -135,16 +135,16 @@ powerpc/mikrotik/platform_rb.c optional mikrotik
powerpc/mpc85xx/atpic.c optional mpc85xx isa
powerpc/mpc85xx/ds1553_bus_fdt.c optional ds1553 fdt
powerpc/mpc85xx/ds1553_core.c optional ds1553
-powerpc/mpc85xx/fsl_sdhc.c optional mpc85xx sdhc | qoriq_dpaa sdhc
+powerpc/mpc85xx/fsl_sdhc.c optional mpc85xx sdhc
powerpc/mpc85xx/i2c.c optional iicbus fdt
powerpc/mpc85xx/isa.c optional mpc85xx isa
-powerpc/mpc85xx/lbc.c optional mpc85xx | qoriq_dpaa
-powerpc/mpc85xx/mpc85xx.c optional mpc85xx | qoriq_dpaa
+powerpc/mpc85xx/lbc.c optional mpc85xx
+powerpc/mpc85xx/mpc85xx.c optional mpc85xx
powerpc/mpc85xx/mpc85xx_gpio.c optional mpc85xx gpio
-powerpc/mpc85xx/platform_mpc85xx.c optional mpc85xx | qoriq_dpaa
-powerpc/mpc85xx/pci_mpc85xx.c optional pci mpc85xx | pci qoriq_dpaa
-powerpc/mpc85xx/pci_mpc85xx_pcib.c optional pci mpc85xx | pci qoriq_dpaa
-powerpc/mpc85xx/qoriq_gpio.c optional mpc85xx gpio | qoriq_dpaa gpio
+powerpc/mpc85xx/platform_mpc85xx.c optional mpc85xx
+powerpc/mpc85xx/pci_mpc85xx.c optional pci mpc85xx
+powerpc/mpc85xx/pci_mpc85xx_pcib.c optional pci mpc85xx
+powerpc/mpc85xx/qoriq_gpio.c optional mpc85xx gpio
powerpc/ofw/ofw_machdep.c standard
powerpc/ofw/ofw_pcibus.c optional pci
powerpc/ofw/ofw_pcib_pci.c optional pci
diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv
index fe30078f183f..e6908bed8ae2 100644
--- a/sys/conf/files.riscv
+++ b/sys/conf/files.riscv
@@ -19,9 +19,6 @@ libkern/flsl.c standard
libkern/flsll.c standard
libkern/memmove.c standard
libkern/memset.c standard
-riscv/htif/htif.c optional htif
-riscv/htif/htif_block.c optional htif
-riscv/htif/htif_console.c optional htif
riscv/riscv/autoconf.c standard
riscv/riscv/bcopy.c standard
riscv/riscv/bus_machdep.c standard
@@ -36,6 +33,7 @@ riscv/riscv/db_interface.c optional ddb
riscv/riscv/db_trace.c optional ddb
riscv/riscv/dump_machdep.c standard
riscv/riscv/elf_machdep.c standard
+riscv/riscv/exception.S standard
riscv/riscv/intr_machdep.c standard
riscv/riscv/in_cksum.c optional inet | inet6
riscv/riscv/identcpu.c standard
@@ -47,6 +45,8 @@ riscv/riscv/mem.c standard
riscv/riscv/nexus.c standard
riscv/riscv/ofw_machdep.c optional fdt
riscv/riscv/pmap.c standard
+riscv/riscv/riscv_console.c optional rcons
+riscv/riscv/sbi.S standard
riscv/riscv/stack_machdep.c optional ddb | stack
riscv/riscv/support.S standard
riscv/riscv/swtch.S standard
diff --git a/sys/conf/kern.mk b/sys/conf/kern.mk
index fe9d08c14862..05e62481952d 100644
--- a/sys/conf/kern.mk
+++ b/sys/conf/kern.mk
@@ -45,13 +45,23 @@ CLANG_NO_IAS34= -no-integrated-as
.if ${COMPILER_VERSION} >= 40800
# Catch-all for all the things that are in our tree, but for which we're
# not yet ready for this compiler.
-CWARNEXTRA?= -Wno-error=inline -Wno-error=enum-compare -Wno-error=unused-but-set-variable \
- -Wno-error=aggressive-loop-optimizations -Wno-error=maybe-uninitialized \
- -Wno-error=array-bounds -Wno-error=address \
- -Wno-error=cast-qual -Wno-error=sequence-point -Wno-error=attributes \
- -Wno-error=strict-overflow -Wno-error=overflow
+CWARNEXTRA?= -Wno-error=address \
+ -Wno-error=aggressive-loop-optimizations \
+ -Wno-error=array-bounds \
+ -Wno-error=attributes \
+ -Wno-error=cast-qual \
+ -Wno-error=enum-compare \
+ -Wno-error=inline \
+ -Wno-error=maybe-uninitialized \
+ -Wno-error=overflow \
+ -Wno-error=sequence-point \
+ -Wno-error=strict-overflow \
+ -Wno-error=unused-but-set-variable
.if ${COMPILER_VERSION} >= 60100
-CWARNEXTRA+= -Wno-error=nonnull-compare -Wno-error=shift-overflow=
+CWARNEXTRA+= -Wno-error=misleading-indentation \
+ -Wno-error=nonnull-compare \
+ -Wno-error=shift-overflow \
+ -Wno-error=tautological-compare
.endif
.else
# For gcc 4.2, eliminate the too-often-wrong warnings about uninitialized vars.
@@ -204,7 +214,7 @@ CFLAGS+= -fstack-protector
CFLAGS+= -gdwarf-2
.endif
-CFLAGS+= ${CWARNFLAGS} ${CWARNFLAGS.${.IMPSRC:T}}
+CFLAGS+= ${CWARNFLAGS:M*} ${CWARNFLAGS.${.IMPSRC:T}}
CFLAGS+= ${CFLAGS.${COMPILER_TYPE}} ${CFLAGS.${.IMPSRC:T}}
# Tell bmake not to mistake standard targets for things to be searched for
diff --git a/sys/conf/kern.post.mk b/sys/conf/kern.post.mk
index 4cb60c002b62..32ec5b1b445c 100644
--- a/sys/conf/kern.post.mk
+++ b/sys/conf/kern.post.mk
@@ -65,6 +65,10 @@ OSRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \
# Keep the related ports builds in the obj directory so that they are only rebuilt once per kernel build
WRKDIRPREFIX?= ${MAKEOBJDIRPREFIX}${SRC_BASE}/sys/${KERNCONF}
PORTSMODULESENV=\
+ env \
+ -u CC \
+ -u CXX \
+ -u CPP \
PATH=${PATH}:${LOCALBASE}/bin:${LOCALBASE}/sbin \
SRC_BASE=${SRC_BASE} \
OSVERSION=${OSRELDATE} \
diff --git a/sys/conf/ldscript.amd64 b/sys/conf/ldscript.amd64
index a9521d83cfc0..d445857e7742 100644
--- a/sys/conf/ldscript.amd64
+++ b/sys/conf/ldscript.amd64
@@ -149,7 +149,6 @@ SECTIONS
{
*(.data .data.* .gnu.linkonce.d.*)
KEEP (*(.gnu.linkonce.d.*personality*))
- SORT(CONSTRUCTORS)
}
.data1 : { *(.data1) }
_edata = .; PROVIDE (edata = .);
diff --git a/sys/conf/ldscript.arm b/sys/conf/ldscript.arm
index 353e36524a53..47535cc735df 100644
--- a/sys/conf/ldscript.arm
+++ b/sys/conf/ldscript.arm
@@ -76,7 +76,6 @@ SECTIONS
{
*(.data)
*(.gnu.linkonce.d*)
- CONSTRUCTORS
}
.data1 : { *(.data1) }
. = ALIGN(32 / 8);
diff --git a/sys/conf/ldscript.arm64 b/sys/conf/ldscript.arm64
index 4b38654536f8..86f66776322f 100644
--- a/sys/conf/ldscript.arm64
+++ b/sys/conf/ldscript.arm64
@@ -76,7 +76,6 @@ SECTIONS
{
*(.data)
*(.gnu.linkonce.d*)
- CONSTRUCTORS
}
.data1 : { *(.data1) }
. = ALIGN(32 / 8);
diff --git a/sys/conf/ldscript.i386 b/sys/conf/ldscript.i386
index 8617821977ba..01b056ceb045 100644
--- a/sys/conf/ldscript.i386
+++ b/sys/conf/ldscript.i386
@@ -137,7 +137,6 @@ SECTIONS
{
*(.data .data.* .gnu.linkonce.d.*)
KEEP (*(.gnu.linkonce.d.*personality*))
- SORT(CONSTRUCTORS)
}
.data1 : { *(.data1) }
_edata = .; PROVIDE (edata = .);
diff --git a/sys/conf/ldscript.mips b/sys/conf/ldscript.mips
index 232b79ff77ad..be50c3c2f638 100644
--- a/sys/conf/ldscript.mips
+++ b/sys/conf/ldscript.mips
@@ -184,7 +184,6 @@ SECTIONS
*(.data)
*(.data.*)
*(.gnu.linkonce.d.*)
- SORT(CONSTRUCTORS)
}
.data1 : { *(.data1) }
.eh_frame : { KEEP (*(.eh_frame)) }
diff --git a/sys/conf/ldscript.mips.cfe b/sys/conf/ldscript.mips.cfe
index db8a2b5d460e..34de41c7b41e 100644
--- a/sys/conf/ldscript.mips.cfe
+++ b/sys/conf/ldscript.mips.cfe
@@ -201,7 +201,6 @@ SECTIONS
*(.data)
*(.data.*)
*(.gnu.linkonce.d.*)
- SORT(CONSTRUCTORS)
} :data
.data1 : { *(.data1) }
.eh_frame : { KEEP (*(.eh_frame)) }
diff --git a/sys/conf/ldscript.mips.mips64 b/sys/conf/ldscript.mips.mips64
index 5032566bc976..7caffb6ea9ce 100644
--- a/sys/conf/ldscript.mips.mips64
+++ b/sys/conf/ldscript.mips.mips64
@@ -185,7 +185,6 @@ SECTIONS
*(.data)
*(.data.*)
*(.gnu.linkonce.d.*)
- SORT(CONSTRUCTORS)
}
.data1 : { *(.data1) }
.eh_frame : { KEEP (*(.eh_frame)) }
diff --git a/sys/conf/ldscript.mips.octeon1 b/sys/conf/ldscript.mips.octeon1
index 617e8362bdaf..e8f23b04dd74 100644
--- a/sys/conf/ldscript.mips.octeon1
+++ b/sys/conf/ldscript.mips.octeon1
@@ -28,7 +28,6 @@ SECTIONS {
_rwdata = .;
*(.data)
. = ALIGN(32);
- CONSTRUCTORS;
}
_gp = (. + 0x8000);
diff --git a/sys/conf/ldscript.powerpc b/sys/conf/ldscript.powerpc
index b190dc193b02..5e981fdbd8d7 100644
--- a/sys/conf/ldscript.powerpc
+++ b/sys/conf/ldscript.powerpc
@@ -63,7 +63,6 @@ SECTIONS
{
*(.data)
*(.gnu.linkonce.d*)
- CONSTRUCTORS
}
.data1 : { *(.data1) }
.got1 : { *(.got1) }
diff --git a/sys/conf/ldscript.powerpc64 b/sys/conf/ldscript.powerpc64
index 18349a51feac..23c93fd85fc0 100644
--- a/sys/conf/ldscript.powerpc64
+++ b/sys/conf/ldscript.powerpc64
@@ -63,7 +63,6 @@ SECTIONS
{
*(.data)
*(.gnu.linkonce.d*)
- CONSTRUCTORS
}
.data1 : { *(.data1) }
.toc1 : ALIGN(8) { *(.toc1) }
diff --git a/sys/conf/ldscript.riscv b/sys/conf/ldscript.riscv
index 31fd5df9ce4e..5fe32aea1782 100644
--- a/sys/conf/ldscript.riscv
+++ b/sys/conf/ldscript.riscv
@@ -6,7 +6,7 @@ SEARCH_DIR(/usr/lib);
SECTIONS
{
/* Read-only sections, merged into text segment: */
- . = kernbase + 0x100;
+ . = kernbase;
.text : AT(ADDR(.text) - kernbase)
{
*(.text)
@@ -63,7 +63,6 @@ SECTIONS
{
*(.data)
*(.gnu.linkonce.d*)
- CONSTRUCTORS
}
.data1 : { *(.data1) }
. = ALIGN(32 / 8);
diff --git a/sys/conf/ldscript.sparc64 b/sys/conf/ldscript.sparc64
index 84871c27303f..2c4f4be7e815 100644
--- a/sys/conf/ldscript.sparc64
+++ b/sys/conf/ldscript.sparc64
@@ -154,7 +154,6 @@ SECTIONS
*(.data)
*(.data.*)
*(.gnu.linkonce.d.*)
- SORT(CONSTRUCTORS)
}
.data1 : { *(.data1) }
.eh_frame : { KEEP (*(.eh_frame)) }
diff --git a/sys/conf/options b/sys/conf/options
index d54bff219b21..f115e7e14212 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -65,6 +65,7 @@ SYSCTL_DEBUG opt_sysctl.h
EARLY_PRINTF opt_global.h
TEXTDUMP_PREFERRED opt_ddb.h
TEXTDUMP_VERBOSE opt_ddb.h
+NUM_CORE_FILES opt_global.h
# Miscellaneous options.
ADAPTIVE_LOCKMGRS
@@ -417,6 +418,8 @@ IPFILTER_LOOKUP opt_ipfilter.h
IPFIREWALL opt_ipfw.h
IPFIREWALL_DEFAULT_TO_ACCEPT opt_ipfw.h
IPFIREWALL_NAT opt_ipfw.h
+IPFIREWALL_NAT64 opt_ipfw.h
+IPFIREWALL_NAT64_DIRECT_OUTPUT opt_ipfw.h
IPFIREWALL_NPTV6 opt_ipfw.h
IPFIREWALL_VERBOSE opt_ipfw.h
IPFIREWALL_VERBOSE_LIMIT opt_ipfw.h
diff --git a/sys/conf/options.powerpc b/sys/conf/options.powerpc
index 27f29524fdfa..4926947c7da7 100644
--- a/sys/conf/options.powerpc
+++ b/sys/conf/options.powerpc
@@ -21,7 +21,6 @@ GFB_NO_MODE_CHANGE opt_gfb.h
MPC85XX opt_platform.h
POWERMAC opt_platform.h
PS3 opt_platform.h
-QORIQ_DPAA opt_platform.h
MAMBO
PSERIES
PSIM