From 4c625d8286daba3540ce421cbb8100fac8d9e2c8 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 14 Nov 2023 09:41:12 +1100
Subject: Revert "chibios: disable RWX segment warning on newer GNU lds
 (#22007)" (#22469)

This reverts commit de3c42125b661f62757f8ee4f6184c089340d3a0.
---
 builddefs/common_rules.mk | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'builddefs/common_rules.mk')

diff --git a/builddefs/common_rules.mk b/builddefs/common_rules.mk
index ddd36409a7..52dccbe475 100644
--- a/builddefs/common_rules.mk
+++ b/builddefs/common_rules.mk
@@ -15,13 +15,6 @@ VPATH :=
 # Helper to return the distinct elements of a list
 uniq = $(if $1,$(firstword $1) $(call uniq,$(filter-out $(firstword $1),$1)))
 
-cc-option = $(shell \
-	if $(CC) $(1) -shared -o /dev/null -xc /dev/null > /dev/null 2>&1; \
-	then echo "$(1)"; else echo "$(2)"; fi)
-
-# helper to pass comma character to make functions
-, := ,
-
 # Convert all SRC to OBJ
 define OBJ_FROM_SRC
 $(patsubst %.c,$1/%.o,$(patsubst %.cpp,$1/%.o,$(patsubst %.cc,$1/%.o,$(patsubst %.S,$1/%.o,$(patsubst %.clib,$1/%.a,$($1_SRC))))))
@@ -73,7 +66,9 @@ CFLAGS += $(CDEFS)
 CFLAGS += -O$(OPT)
 # add color
 ifeq ($(COLOR),true)
-	CFLAGS+= $(call cc-option, -fdiagnostics-color)
+ifeq ("$(shell echo "int main(){}" | $(CC) -fdiagnostics-color -x c - -o /dev/null 2>&1)", "")
+	CFLAGS+= -fdiagnostics-color
+endif
 endif
 CFLAGS += -Wall
 CFLAGS += -Wstrict-prototypes
-- 
cgit v1.2.3