Skip to content

Commit

Permalink
Revert "chibios: disable RWX segment warning on newer GNU lds (qmk#22007
Browse files Browse the repository at this point in the history
)" (qmk#22469)

This reverts commit de3c421.
  • Loading branch information
tzarc authored and christrotter committed Nov 28, 2023
1 parent 85f4579 commit b1ad21e
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 12 deletions.
11 changes: 3 additions & 8 deletions builddefs/common_rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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))))))
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion platforms/avr/platform.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions platforms/chibios/platform.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
#
Expand Down

0 comments on commit b1ad21e

Please sign in to comment.