HardenedBSD/src 34ab832contrib/binutils Makefile.in, contrib/terminus ter-u32n.bdf ter-u32b.bdf

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        Makefile.inc1 (unresolved)
        share/man/man5/src.conf.5 (unresolved)
        targets/pseudo/bootstrap-tools/Makefile (unresolved)
        tools/build/options/WITH_OFED_EXTRA (deleted)
DeltaFile
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+52,834-0contrib/terminus/ter-u32n.bdf
+52,834-0contrib/terminus/ter-u32b.bdf
+0-49,485contrib/binutils/Makefile.in
+47,418-0contrib/terminus/ter-u28b.bdf
+47,418-0contrib/terminus/ter-u28n.bdf
+272,094-49,91725,491 files not shown
+3,013,181-3,285,38525,497 files

HardenedBSD/src c7ce6b0contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
DeltaFile
+0-111,817contrib/libstdc++/configure
+72,183-0lib/clang/liblldb/LLDBWrapLua.cpp
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+294,537-151,55460,534 files not shown
+10,288,584-10,879,88160,540 files

HardenedBSD/src 590ecd5contrib/binutils Makefile.in, contrib/binutils/bfd configure

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master
DeltaFile
+0-49,485contrib/binutils/Makefile.in
+0-22,860contrib/binutils/bfd/configure
+0-20,907contrib/binutils/gas/config/tc-arm.c
+0-17,032contrib/binutils/binutils/configure
+0-16,200contrib/binutils/gas/configure
+0-15,450contrib/binutils/gas/config/tc-mips.c
+0-141,9341,224 files not shown
+144-1,133,4961,230 files

HardenedBSD/src f000ccecontrib/binutils Makefile.in, contrib/binutils/bfd configure

Remove contrib/binutils, unused after r368667
DeltaFile
+0-49,485contrib/binutils/Makefile.in
+0-22,860contrib/binutils/bfd/configure
+0-20,907contrib/binutils/gas/config/tc-arm.c
+0-17,032contrib/binutils/binutils/configure
+0-16,200contrib/binutils/gas/configure
+0-15,450contrib/binutils/gas/config/tc-mips.c
+0-141,9341,076 files not shown
+0-1,110,8831,082 files

HardenedBSD/src 546114dcontrib/binutils Makefile.in, contrib/binutils/bfd configure

Remove contrib/binutils, unused after r368667
DeltaFile
+0-49,485contrib/binutils/Makefile.in
+0-22,860contrib/binutils/bfd/configure
+0-20,907contrib/binutils/gas/config/tc-arm.c
+0-17,032contrib/binutils/binutils/configure
+0-16,200contrib/binutils/gas/configure
+0-15,450contrib/binutils/gas/config/tc-mips.c
+0-141,9341,076 files not shown
+0-1,110,8831,082 files

HardenedBSD/src 6891637share/colldef zh_CN.GB18030.src zh_CN.UTF-8.src, sys/contrib/dev/iwm iwm-8265-22.fw.uu

Merge remote-tracking branch 'upstream/hardened/current/master' into hardened/current/safestack-arm64

Conflicts:
        lib/libclang_rt/Makefile (unresolved)
DeltaFile
+39,091-38,998share/colldef/zh_CN.GB18030.src
+35,281-35,290share/colldef/zh_CN.UTF-8.src
+29,823-29,813share/colldef/zh_CN.GBK.src
+40,270-0sys/contrib/dev/iwm/iwm-8265-22.fw.uu
+28,149-0sys/contrib/dev/liquidio/lio_23xx_nic.bin.uu
+13,278-13,184share/colldef/zh_TW.Big5.src
+185,892-117,2855,332 files not shown
+494,978-316,7495,338 files

HardenedBSD/src 7daed4fsys/contrib/dev/liquidio lio_23xx_nic.bin.uu, sys/dev/bnxt hsi_struct_def.h

MFH @ r323558.
DeltaFile
+148,660-148,574sys/dev/qlxgbe/ql_fw.c
+28,149-0sys/contrib/dev/liquidio/lio_23xx_nic.bin.uu
+14,241-1,432sys/dev/bnxt/hsi_struct_def.h
+11,974-0sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu
+0-11,363sys/dev/cxgbe/firmware/t6fw-1.16.45.0.bin.uu
+11,247-0sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu
+214,271-161,369960 files not shown
+277,029-213,502966 files

HardenedBSD/src b754c27 (r323560)sys/contrib/dev/liquidio lio_23xx_nic.bin.uu, sys/dev/bnxt hsi_struct_def.h

MFH @ r323558.
DeltaFile
+148,660-148,574sys/dev/qlxgbe/ql_fw.c
+28,149-0sys/contrib/dev/liquidio/lio_23xx_nic.bin.uu
+14,241-1,432sys/dev/bnxt/hsi_struct_def.h
+11,974-0sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu
+0-11,363sys/dev/cxgbe/firmware/t6fw-1.16.45.0.bin.uu
+11,247-0sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu
+214,271-161,369960 files not shown
+277,029-213,502966 files

HardenedBSD/src 4e1e61dsys/arm/freescale/imx imx6_ahci.c, sys/dev/iicbus nxprtc.c ds13rtc.c

Merge remote-tracking branch 'origin/hardened/11-stable/master' into hardened/11-stable/unstable
DeltaFile
+837-0sys/dev/iicbus/nxprtc.c
+629-0sys/dev/iicbus/ds13rtc.c
+348-176sys/net/if_vlan.c
+0-363sys/dev/iicbus/ds133x.c
+358-0sys/arm/freescale/imx/imx6_ahci.c
+354-0sys/dev/iicbus/isl12xx.c
+2,526-53966 files not shown
+3,310-1,40772 files

HardenedBSD/src 03929f3sys/arm/freescale/imx imx6_ahci.c, sys/dev/iicbus nxprtc.c ds13rtc.c

Merge remote-tracking branch 'origin/hardened/11-stable/master' into hardened/11-stable/master-libressl
DeltaFile
+837-0sys/dev/iicbus/nxprtc.c
+629-0sys/dev/iicbus/ds13rtc.c
+348-176sys/net/if_vlan.c
+0-363sys/dev/iicbus/ds133x.c
+358-0sys/arm/freescale/imx/imx6_ahci.c
+354-0sys/dev/iicbus/isl12xx.c
+2,526-53966 files not shown
+3,310-1,40772 files

HardenedBSD/src cc285f7sys/arm/freescale/imx imx6_ahci.c, sys/dev/iicbus nxprtc.c ds13rtc.c

Merge remote-tracking branch 'origin/freebsd/11-stable/master' into hardened/11-stable/master

Conflicts:
        release/amd64/make-memstick.sh (unresolved)
DeltaFile
+837-0sys/dev/iicbus/nxprtc.c
+629-0sys/dev/iicbus/ds13rtc.c
+348-176sys/net/if_vlan.c
+0-363sys/dev/iicbus/ds133x.c
+358-0sys/arm/freescale/imx/imx6_ahci.c
+354-0sys/dev/iicbus/isl12xx.c
+2,526-53966 files not shown
+3,314-1,40372 files

HardenedBSD/src 7c49d67contrib/binutils/opcodes i386-dis.c i386-tbl.h

MFC r323192:

  gnu binutils: FSGSBASE assembly/disassembly
DeltaFile
+30-15contrib/binutils/opcodes/i386-dis.c
+14-0contrib/binutils/opcodes/i386-tbl.h
+10-0contrib/binutils/opcodes/i386-opc.tbl
+3-1contrib/binutils/opcodes/i386-opc.h
+57-164 files

HardenedBSD/src 5be4ad9 (r323344)sys/dev/bnxt hsi_struct_def.h, sys/dev/cxgbe/firmware t6fw-1.16.59.0.bin.uu t6fw-1.16.45.0.bin.uu

MFhead at r323343
DeltaFile
+14,241-1,432sys/dev/bnxt/hsi_struct_def.h
+11,974-0sys/dev/cxgbe/firmware/t6fw-1.16.59.0.bin.uu
+0-11,363sys/dev/cxgbe/firmware/t6fw-1.16.45.0.bin.uu
+11,247-0sys/dev/cxgbe/firmware/t5fw-1.16.59.0.bin.uu
+0-10,824sys/dev/cxgbe/firmware/t5fw-1.16.45.0.bin.uu
+0-9,729sys/dev/cxgbe/firmware/t4fw-1.16.45.0.bin.uu
+37,462-33,348399 files not shown
+59,329-40,077405 files

HardenedBSD/src c9c61ccshare/misc pci_vendors, sys/arm/mv/armada38x armada38x_rtc.c rtc.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi
DeltaFile
+325-0sys/arm/mv/armada38x/armada38x_rtc.c
+0-319sys/arm/mv/armada38x/rtc.c
+193-0sys/dev/amdsmn/amdsmn.c
+110-82sys/dev/mpr/mpr_sas.c
+102-77sys/dev/mps/mps_sas.c
+141-12share/misc/pci_vendors
+871-490114 files not shown
+1,916-810120 files

HardenedBSD/src 07f78a4contrib/binutils/opcodes i386-dis.c i386-tbl.h, share/man/man4 amdsmn.4

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/unstable
DeltaFile
+193-0sys/dev/amdsmn/amdsmn.c
+64-0share/man/man4/amdsmn.4
+44-2sys/dev/amdtemp/amdtemp.c
+30-15contrib/binutils/opcodes/i386-dis.c
+32-0sys/dev/amdsmn/amdsmn.h
+14-0contrib/binutils/opcodes/i386-tbl.h
+377-1725 files not shown
+444-5631 files

HardenedBSD/src 6bbc5fbcontrib/binutils/opcodes i386-dis.c i386-tbl.h

gnu binutils: FSGSBASE assembly/disassembly

Enable the in-tree binutils to assemble and disassemble amd64 FSGSBASE
instructions (rdfsbase, rdgsbase, wrfsbase, wrgsbase), used in the base
system since r322763.

This gives one last gasp for in-tree gcc, and provides a small
enhancement for in-tree binutils objdump.

Reviewed by:    dim, kib
Approved by:    markj (mentor)
Sponsored by:   Dell EMC Isilon
Differential Revision:  https://reviews.freebsd.org/D12222
DeltaFile
+30-15contrib/binutils/opcodes/i386-dis.c
+14-0contrib/binutils/opcodes/i386-tbl.h
+10-0contrib/binutils/opcodes/i386-opc.tbl
+3-1contrib/binutils/opcodes/i386-opc.h
+57-164 files

HardenedBSD/src 1a11bb8 (r323192)contrib/binutils/opcodes i386-dis.c i386-tbl.h

gnu binutils: FSGSBASE assembly/disassembly

Enable the in-tree binutils to assemble and disassemble amd64 FSGSBASE
instructions (rdfsbase, rdgsbase, wrfsbase, wrgsbase), used in the base
system since r322763.

This gives one last gasp for in-tree gcc, and provides a small
enhancement for in-tree binutils objdump.

Reviewed by:    dim, kib
Approved by:    markj (mentor)
Sponsored by:   Dell EMC Isilon
Differential Revision:  https://reviews.freebsd.org/D12222
DeltaFile
+30-15contrib/binutils/opcodes/i386-dis.c
+14-0contrib/binutils/opcodes/i386-tbl.h
+10-0contrib/binutils/opcodes/i386-opc.tbl
+3-1contrib/binutils/opcodes/i386-opc.h
+57-164 files

HardenedBSD/src 947e8fdcontrib/binutils/opcodes i386-dis.c i386-tbl.h, share/man/man4 amdsmn.4

Merge remote-tracking branch 'origin/freebsd/current/master' into hardened/current/master

Conflicts:
        release/amd64/make-memstick.sh (unresolved)
DeltaFile
+193-0sys/dev/amdsmn/amdsmn.c
+64-0share/man/man4/amdsmn.4
+44-2sys/dev/amdtemp/amdtemp.c
+30-15contrib/binutils/opcodes/i386-dis.c
+32-0sys/dev/amdsmn/amdsmn.h
+14-0contrib/binutils/opcodes/i386-tbl.h
+377-1717 files not shown
+432-4123 files

HardenedBSD/src 00d5789contrib/ntp CommitLog, contrib/sqlite3 sqlite3.c

Create branch for bhyve graphics import.
DeltaFile
+0-250,654tools/tools/locale/etc/final-maps/map.UTF-8
+0-235,924share/dict/web2
+0-209,729contrib/ntp/CommitLog
+0-189,304contrib/sqlite3/sqlite3.c
+0-148,958sys/dev/qlxgbe/ql_fw.c
+0-131,072crypto/heimdal/lib/sqlite/sqlite3.c
+0-1,165,64169,516 files not shown
+19,947-30,627,90869,522 files

HardenedBSD/src ee7b057 (r270164)contrib/file ltmain.sh, sys/dev/cxgbe/firmware t5fw-1.11.27.0.bin.uu t4fw-1.11.27.0.bin.uu

Merge head from 7/28
DeltaFile
+10,713-0sys/dev/i40e/i40e_register_x710_int.h
+9,664-0contrib/file/ltmain.sh
+9,028-0sys/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu
+9,019-0sys/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu
+0-8,705sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
+0-8,417sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu
+38,424-17,1226,904 files not shown
+275,846-197,0416,910 files

HardenedBSD/src d7cd1d4contrib/file ltmain.sh, sys/dev/cxgbe/firmware t5fw-1.11.27.0.bin.uu t4fw-1.11.27.0.bin.uu

Merge head from 7/28
DeltaFile
+10,713-0sys/dev/i40e/i40e_register_x710_int.h
+9,664-0contrib/file/ltmain.sh
+9,028-0sys/dev/cxgbe/firmware/t5fw-1.11.27.0.bin.uu
+9,019-0sys/dev/cxgbe/firmware/t4fw-1.11.27.0.bin.uu
+0-8,705sys/dev/cxgbe/firmware/t4fw-1.9.12.0.bin.uu
+0-8,417sys/dev/cxgbe/firmware/t5fw-1.9.12.0.bin.uu
+38,424-17,1226,904 files not shown
+275,846-197,0416,910 files

HardenedBSD/src 6cec9ca (r266996)contrib/libyaml configure, contrib/ncurses configure

MFC @ r266724

An SVM update will follow this.
DeltaFile
+7,791-5,491contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html
+0-13,149contrib/libyaml/configure
+12,344-0sys/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu
+12,141-0sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu
+7,684-3,239contrib/ncurses/configure
+10,328-0sys/dev/i40e/i40e_register_x710_int.h
+50,288-21,87914,123 files not shown
+999,586-592,61614,129 files

HardenedBSD/src 95f7c2fcontrib/libyaml configure, contrib/ncurses configure

MFC @ r266724

An SVM update will follow this.
DeltaFile
+7,791-5,491contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html
+0-13,149contrib/libyaml/configure
+12,344-0sys/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu
+12,141-0sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu
+7,684-3,239contrib/ncurses/configure
+10,328-0sys/dev/i40e/i40e_register_x710_int.h
+50,288-21,87914,123 files not shown
+999,586-592,61614,129 files

HardenedBSD/src 414fdaf (r266517)contrib/ldns configure, contrib/ldns/m4 libtool.m4

IFC @266473
DeltaFile
+10,328-0sys/dev/i40e/i40e_register_x710_int.h
+8,001-0contrib/ldns/m4/libtool.m4
+3,600-3,381contrib/ldns/configure
+4,625-0sys/dev/i40e/i40e_common.c
+4,298-0sys/dev/i40e/if_i40e.c
+3,672-0sys/dev/mrsas/mrsas.c
+34,524-3,3812,924 files not shown
+252,264-60,2202,930 files

HardenedBSD/src a0199f3sys/dev/i40e i40e_register_x710_int.h i40e_common.c

Merge remote-tracking branch 'upstream/master' into hardened/current/aslr
DeltaFile
+10,328-0sys/dev/i40e/i40e_register_x710_int.h
+4,625-0sys/dev/i40e/i40e_common.c
+4,298-0sys/dev/i40e/if_i40e.c
+3,622-0sys/dev/i40e/i40e_register.h
+2,238-0sys/dev/i40e/i40e_adminq_cmd.h
+1,501-0sys/dev/i40e/i40e_txrx.c
+26,612-0128 files not shown
+35,330-755134 files

HardenedBSD/src e306e64contrib/binutils/opcodes i386-dis.c i386-tbl.h

Add support for the 'rdseed' instruction.
DeltaFile
+18-1contrib/binutils/opcodes/i386-dis.c
+3-0contrib/binutils/opcodes/i386-tbl.h
+1-0contrib/binutils/opcodes/i386-opc.tbl
+22-13 files

HardenedBSD/src 2ea2596 (r266391)contrib/binutils/opcodes i386-dis.c i386-tbl.h

Add support for the 'rdseed' instruction.
DeltaFile
+18-1contrib/binutils/opcodes/i386-dis.c
+3-0contrib/binutils/opcodes/i386-tbl.h
+1-0contrib/binutils/opcodes/i386-opc.tbl
+22-13 files

HardenedBSD/src 3b8f084 (r265044)contrib/atf configure, contrib/libyaml configure

Merge head
DeltaFile
+0-19,965contrib/atf/configure
+7,791-5,491contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html
+0-13,149contrib/libyaml/configure
+12,344-0sys/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu
+12,141-0sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu
+7,684-3,239contrib/ncurses/configure
+39,960-41,84415,633 files not shown
+1,046,736-689,80015,639 files

HardenedBSD/src 5e56815contrib/atf configure, contrib/libyaml configure

Merge head
DeltaFile
+0-19,965contrib/atf/configure
+7,791-5,491contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html
+0-13,149contrib/libyaml/configure
+12,344-0sys/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu
+12,141-0sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu
+7,684-3,239contrib/ncurses/configure
+39,960-41,84415,633 files not shown
+1,046,736-689,80015,639 files

HardenedBSD/src 84e51a1 (r264839)contrib/atf configure, contrib/libyaml configure

IFC @264767
DeltaFile
+0-19,965contrib/atf/configure
+7,791-5,491contrib/ncurses/doc/html/NCURSES-Programming-HOWTO.html
+0-13,149contrib/libyaml/configure
+12,344-0sys/contrib/dev/iwn/iwlwifi-135-6-18.168.6.1.fw.uu
+12,141-0sys/contrib/dev/iwn/iwlwifi-105-6-18.168.6.1.fw.uu
+7,684-3,239contrib/ncurses/configure
+39,960-41,84415,710 files not shown
+946,817-706,72515,716 files