Merge 1eb2b69a8e into dd4ada7023

- Don't use -fstack-clash-protection (argument unused during compilation)
- Fix definition for ADDFLAGS/LDFLAGS for -lkvm

Signed-off-by: Laurent Cheylus <foxy@free.fr>

Makefile

@@ -91,10 +91,13 @@ $(error $(shell printf "\033[1;91mERROR: \033[97mCompiler too old. (Requires Cla
 endif
 
 #? Any flags added to TESTFLAGS must not contain whitespace for the testing to work
-override TESTFLAGS := -fexceptions -fstack-clash-protection -fcf-protection
+override TESTFLAGS := -fexceptions -fcf-protection
 ifneq ($(PLATFORM) $(ARCH),macos arm64)
 	override TESTFLAGS += -fstack-protector
 endif
+ifneq ($(PLATFORM_LC) $(CXX_IS_CLANG),openbsd true)
+	override TESTFLAGS += -fstack-clash-protection
+endif
 
 ifeq ($(STATIC),true)
 	ifeq ($(CXX_IS_CLANG) $(CLANG_WORKS),true true)
@@ -143,7 +146,11 @@ else ifeq ($(PLATFORM_LC),macos)
 else ifeq ($(PLATFORM_LC),openbsd)
 	PLATFORM_DIR := openbsd
 	THREADS	:= $(shell sysctl -n hw.ncpu || echo 1)
-	override ADDFLAGS += -lkvm -static-libstdc++
+	ifeq ($(CXX_IS_CLANG) $(CLANG_WORKS),true true)
+		override LDFLAGS += -lkvm
+	else
+		override ADDFLAGS += -lkvm -static-libstdc++
+	endif
 	export MAKE = gmake
 	SU_GROUP := wheel
 else

src/btop_menu.cpp

@@ -191,7 +191,7 @@ namespace Menu {
 		{"z", "Toggle totals reset for current network device"},
 		{"a", "Toggle auto scaling for the network graphs."},
 		{"y", "Toggle synced scaling mode for network graphs."},
-		{"f, /", "To enter a process filter."},
+		{"f, /", "To enter a process filter. Start with ! for regex."},
 		{"delete", "Clear any entered filter."},
 		{"c", "Toggle per-core cpu usage of processes."},
 		{"r", "Reverse sorting order in processes box."},

src/linux/btop_collect.cpp

@@ -158,9 +158,11 @@ namespace Gpu {
 
 	//? AMD data collection
 	namespace Rsmi {
+
+	//? RSMI defines, structs & typedefs
+	#define RSMI_DEVICE_NAME_BUFFER_SIZE 128
+
 	#if !defined(RSMI_STATIC)
-		//? RSMI defines, structs & typedefs
-        #define RSMI_DEVICE_NAME_BUFFER_SIZE 128
 		#define RSMI_MAX_NUM_FREQUENCIES_V5  32
 		#define RSMI_MAX_NUM_FREQUENCIES_V6  33
 		#define RSMI_STATUS_SUCCESS           0