[Git][hardenedbsd/HardenedBSD][hardened/current/master] 7 commits: bsd.own.mk: Deorbit compat include of bsd.compiler.mk

[HardenedBSD Services (@hardenedbsd-services)]

HardenedBSD Services pushed to branch hardened/current/master at HardenedBSD / HardenedBSD


Commits:
0bebad8d by Mateusz Piotrowski at 2026-03-15T19:47:35+01:00
bsd.own.mk: Deorbit compat include of bsd.compiler.mk

Commit b946bedd09d3bd1 ("Previous versions of bsd.own.mk [...]")
mentions that bsd.own.mk included bsd.compiler.mk as a temporary
workaround and was destined to be removed in FreeBSD 12. Do that now.

PR: 203540
Reviewed by: bnovkov, imp
Approved by: bnovkov (mentor)
Differential Revision: https://reviews.freebsd.org/D55867

- - - - -
2e936698 by Ying Xu at 2026-03-15T22:38:42+03:30
rtlbtfw(8): Add support for Realtek 8852CE

Add the USB Vendor/Product ID (0x13d3:0x3612) for
the new Realtek 8852CE drive to make sure it works.

Signed-off-by: Ying Xu <fakesha...@gmail.com>
Reviewed by: pouria, wulf
Pull Request: https://github.com/freebsd/freebsd-src/pull/2071

- - - - -
424d3ca8 by Salman Sarray at 2026-03-15T23:02:06+03:30
backlight.8: Fix typo in man

Increment and decrement where swapped.

Signed-off-by: Salman Sarray <sal...@sarray.de>
Reviewed by: ziaee, Christos Longros <chris....@gmail.com>
Pull Request: https://github.com/freebsd/freebsd-src/pull/2072

- - - - -
73f37a69 by Mateusz Piotrowski at 2026-03-15T20:45:29+01:00
Revert "bsd.own.mk: Deorbit compat include of bsd.compiler.mk"

This reverts commit 0bebad8d072bb7abef1cea0d8c8d04d500913adf.

It might be that all that's needed to fix this is to add
".include <bsd.compiler.mk>" to some Makefiles. I'll look into it soon
but for now let's unbreak HEAD.

Approved by: bnovkov (mentor)
Differential Revision: https://reviews.freebsd.org/D55869

- - - - -
9976cff5 by Christos Longros at 2026-03-15T13:10:59-07:00
rge: use C style comments instead of C++

FreeBSD style(9) mandates C style comments. The initial import from
OpenBSD left several C++ style // comments in if_rge.c and if_rgevar.h.
Replace them with proper /* */ comments.

Also fix a malformed comment that mixed // with a closing */.

Signed-off-by: Christos Longros <chris....@gmail.com>

Reviewed by: adrian
Differential Revision: https://reviews.freebsd.org/D55743

- - - - -
5f659f2b by Olivier Certner at 2026-03-16T00:16:56+01:00
zfs: Fix build after merge of openzfs/zfs@f8e5af53e

The change causing it is the introduction of the test over __BMI2__ in
'module/zstd/lib/common/bitstream.h'.

This is a stop-gap commit whose content needs to be upstreamed (after
possibly having been improved).

Fixes: 8a62a2a5659d ("zfs: merge openzfs/zfs@f8e5af53e")
Sponsored by: The FreeBSD Foundation

- - - - -
c24fae99 by HardenedBSD Sync Services at 2026-03-15T18:04:35-06:00
Merge branch 'freebsd/current/main' into hardened/current/master

- - - - -


7 changed files:

- sys/dev/rge/if_rge.c
- sys/dev/rge/if_rgevar.h
- sys/modules/zfs/Makefile
- sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
- usr.bin/backlight/backlight.8
- usr.sbin/bluetooth/rtlbtfw/main.c
- usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf


Changes:

=====================================
sys/dev/rge/if_rge.c
=====================================
@@ -1125,7 +1125,7 @@ rge_init_locked(struct rge_softc *sc)
* causing this to be initialised both from the ioctl
* API and if_init() API.
*/
-// RGE_PRINT_ERROR(sc, "%s: called whilst running?\n", __func__);
+/* RGE_PRINT_ERROR(sc, "%s: called whilst running?\n", __func__); */
return;
}

@@ -2409,7 +2409,7 @@ rge_hash_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt)
{
uint32_t crc, *hashes = arg;

- // XXX TODO: validate this does addrlo? */
+ /* XXX TODO: validate this does addrlo? */
crc = ether_crc32_be(LLADDR(sdl), ETHER_ADDR_LEN) >> 26;
crc &= 0x3f;



=====================================
sys/dev/rge/if_rgevar.h
=====================================
@@ -123,7 +123,6 @@ struct rge_rx {
int rge_rxq_prodidx;
int rge_rxq_considx;

-// struct if_rxring rge_rx_ring;
bus_addr_t rge_rx_list_paddr;
bus_dmamap_t rge_rx_list_map;
struct rge_rx_desc *rge_rx_list;
@@ -137,7 +136,6 @@ struct rge_queues {
void *q_ihc;
int q_index;
char q_name[16];
-// pci_intr_handle_t q_ih;
struct rge_tx q_tx;
struct rge_rx q_rx;
};
@@ -171,8 +169,6 @@ struct rge_softc {
bus_dma_tag_t sc_dmat_rx_buf;
bus_dma_tag_t sc_dmat_stats_buf;

-// pci_chipset_tag_t sc_pc;
-// pcitag_t sc_tag;
struct ifmedia sc_media; /* media info */
enum rge_mac_type rge_type;



=====================================
sys/modules/zfs/Makefile
=====================================
@@ -450,28 +450,29 @@ CFLAGS.zprop_common.c= -Wno-cast-qual
CFLAGS.zrlock.c= -Wno-cast-qual

#zstd
-CFLAGS.entropy_common.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.error_private.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.fse_compress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE}
-CFLAGS.fse_decompress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.huf_compress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.huf_decompress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.xxhash.c+= -U__BMI__ -fno-tree-vectorize
+CFLAGS.entropy_common.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.error_private.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.fse_compress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE}
+CFLAGS.fse_decompress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.huf_compress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.huf_decompress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.xxhash.c+= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize
CFLAGS.xxhash.c+= ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_common.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_compress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_compress_literals.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_compress_sequences.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_compress_superblock.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE}
-CFLAGS.zstd_ddict.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_decompress.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_decompress_block.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_double_fast.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_fast.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_lazy.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_ldm.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
-CFLAGS.zstd_opt.c= -U__BMI__ -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_common.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_compress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_compress_literals.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_compress_sequences.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_compress_superblock.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL} ${NO_WUNUSED_BUT_SET_VARIABLE}
+CFLAGS.zstd_ddict.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_decompress.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_decompress_block.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_double_fast.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_fast.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_lazy.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_ldm.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_opt.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}
+CFLAGS.zstd_preSplit.c= -U__BMI__ -DZSTD_NO_INTRINSICS -fno-tree-vectorize ${NO_WBITWISE_INSTEAD_OF_LOGICAL}

.if ${MACHINE_ARCH} == "aarch64"
CFLAGS.entropy_common.c+= ${__ZFS_ZSTD_AARCH64_FLAGS}


=====================================
sys/netgraph/bluetooth/drivers/ubt/ng_ubt_rtl.c
=====================================
@@ -100,6 +100,7 @@ const STRUCT_USB_HOST_ID ubt_rtl_devs[] =
{ USB_VPI(0x13d3, 0x3587, 0) },
{ USB_VPI(0x13d3, 0x3586, 0) },
{ USB_VPI(0x13d3, 0x3592, 0) },
+ { USB_VPI(0x13d3, 0x3612, 0) },
{ USB_VPI(0x0489, 0xe122, 0) },

/* Realtek 8852BE Bluetooth devices */


=====================================
usr.bin/backlight/backlight.8
=====================================
@@ -73,10 +73,10 @@ A trailing
.Dq %
is valid.
.It Cm incr Ns | Ns Cm + Op Ar value
-Decrement the backlight level.
+Increment the backlight level.
If no value is specified a default of 10 percent is used.
.It Cm decr Ns | Ns Cm - Op Ar value
-Increment the backlight level.
+Decrement the backlight level.
If no value is specified a default of 10 percent is used.
.El
.Sh EXAMPLES


=====================================
usr.sbin/bluetooth/rtlbtfw/main.c
=====================================
@@ -83,6 +83,7 @@ static struct rtlbt_devid rtlbt_list[] = {
{ .vendor_id = 0x13d3, .product_id = 0x3587 },
{ .vendor_id = 0x13d3, .product_id = 0x3586 },
{ .vendor_id = 0x13d3, .product_id = 0x3592 },
+ { .vendor_id = 0x13d3, .product_id = 0x3612 },
{ .vendor_id = 0x0489, .product_id = 0xe122 },

/* Realtek 8852BE Bluetooth devices */


=====================================
usr.sbin/bluetooth/rtlbtfw/rtlbtfw.conf
=====================================
@@ -110,7 +110,7 @@ notify 100 {
match "subsystem" "DEVICE";
match "type" "ATTACH";
match "vendor" "0x13d3";
- match "product" "(0x3587|0x3586|0x3592)";
+ match "product" "(0x3587|0x3586|0x3592|0x3612)";
action "/usr/sbin/rtlbtfw -d $cdev -f /usr/local/share/rtlbt-firmware";
};
notify 100 {



View it on GitLab: https://git.hardenedbsd.org/hardenedbsd/HardenedBSD/-/compare/7ce8c7f3b8295e0fed3f041d6ab96b4f22e9eb95...c24fae9941a4a5036d500d75b883bce64b83a7b4

--
View it on GitLab: https://git.hardenedbsd.org/hardenedbsd/HardenedBSD/-/compare/7ce8c7f3b8295e0fed3f041d6ab96b4f22e9eb95...c24fae9941a4a5036d500d75b883bce64b83a7b4
You're receiving this email because of your account on git.hardenedbsd.org.