diff options
| author | Nick Brassel <nick@tzarc.org> | 2023-11-14 09:41:12 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-13 22:41:12 +0000 |
| commit | 4c625d8286daba3540ce421cbb8100fac8d9e2c8 (patch) | |
| tree | 85b7b5edbdb990535eb0428512796f5b1b71e697 | |
| parent | 1efc79063c5bc5fae6766f7555738b122ef8988d (diff) | |
Revert "chibios: disable RWX segment warning on newer GNU lds (#22007)" (#22469)
This reverts commit de3c42125b661f62757f8ee4f6184c089340d3a0.
| -rw-r--r-- | builddefs/common_rules.mk | 11 | ||||
| -rw-r--r-- | platforms/avr/platform.mk | 4 | ||||
| -rw-r--r-- | platforms/chibios/platform.mk | 3 |
3 files changed, 6 insertions, 12 deletions
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 diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk index 8f8e01523f..aef449cadf 100644 --- a/platforms/avr/platform.mk +++ b/platforms/avr/platform.mk @@ -12,7 +12,9 @@ HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT) BIN = -COMPILEFLAGS += $(call cc-option, --param=min-pagesize=0) +ifeq ("$(shell echo "int main(){}" | $(CC) --param=min-pagesize=0 -x c - -o /dev/null 2>&1)", "") +COMPILEFLAGS += --param=min-pagesize=0 +endif COMPILEFLAGS += -funsigned-char COMPILEFLAGS += -funsigned-bitfields diff --git a/platforms/chibios/platform.mk b/platforms/chibios/platform.mk index 6c38aa16a7..081b001e6d 100644 --- a/platforms/chibios/platform.mk +++ b/platforms/chibios/platform.mk @@ -476,9 +476,6 @@ HEX = $(OBJCOPY) -O $(FORMAT) EEP = BIN = $(OBJCOPY) -O binary -# disable warning about RWX triggered by ChibiOS linker scripts -SHARED_LDFLAGS += $(call cc-option, -Wl$(,)--no-warn-rwx-segments) - ############################################################################## # Make targets # |