sergiotarxz/nuttx
sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

toolchain/gcc: fix linker error if enable STACK_CANARIES/LTO at same time

Browse Source 
If -fstack-protector-all is enabled, gcc linker will need GCC
SSP(Stack Smashing Protector) support, Since the implement of SSP
is related to the OS, most of embedded toolchain does not provide
ssp support, so an error will be reported when linking:

enable CONFIG_LTO_FULL && CONFIG_STACK_CANARIES

arm-none-eabi/bin/ld: cannot find -lssp_nonshared: No such file or directory
arm-none-eabi/bin/ld: cannot find -lssp: No such file or directory

https://github.com/gcc-mirror/gcc/blob/master/gcc/gcc.cc#L983-L985

Since nuttx has already implemented SSP related hook functions,
so in this PR, we filter out this option in the link phase to ensure that
the implementation of lssp/lssp_nonshared will not be referenced

Signed-off-by: chao an <anchao@xiaomi.com>
This commit is contained in:
chao an 2023-07-20 17:07:55 +08:00 committed by Xiang Xiao
parent df9f700c28
commit 4b94dc3092
6 changed files with 42 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/src/Makefile
View File

@ -105,10 +105,18 @@ EXTRA_LIBS += $(wildcard $(APPDIR)$(DELIM)staging$(DELIM)*$(LIBEXT))
ifeq ($(CONFIG_ARM_TOOLCHAIN_ARMCLANG),)
ifeq ($(LD),$(CC))
ifeq ($(CONFIG_STACK_CANARIES),y)
# filter out ssp(Stack Smashing Protector) related flags:
# -fstack-protector
# -fstack-protector-all
# -fstack-protector-strong
# -fstack-protector-explicit
STRIPCFLAGS = $(filter -fstack-protector%,$(CFLAGS))
endif
LDSTARTGROUP ?= -Wl,--start-group
LDENDGROUP ?= -Wl,--end-group
LDFLAGS := $(addprefix -Xlinker ,$(LDFLAGS))
LDFLAGS += $(CFLAGS)
LDFLAGS += $(filter-out $(STRIPCFLAGS),$(CFLAGS))
else
LDSTARTGROUP ?= --start-group
LDENDGROUP ?= --end-group

10
arch/arm64/src/Makefile
View File

@ -87,10 +87,18 @@ EXTRA_LIBS += $(wildcard $(APPDIR)$(DELIM)staging$(DELIM)*$(LIBEXT))
# Override in Make.defs if linker is not 'ld'
ifeq ($(LD),$(CC))
ifeq ($(CONFIG_STACK_CANARIES),y)
# filter out ssp(Stack Smashing Protector) related flags:
# -fstack-protector
# -fstack-protector-all
# -fstack-protector-strong
# -fstack-protector-explicit
STRIPCFLAGS = $(filter -fstack-protector%,$(CFLAGS))
endif
LDSTARTGROUP ?= -Wl,--start-group
LDENDGROUP ?= -Wl,--end-group
LDFLAGS := $(addprefix -Xlinker ,$(LDFLAGS))
LDFLAGS += $(CFLAGS)
LDFLAGS += $(filter-out $(STRIPCFLAGS),$(CFLAGS))
else
LDSTARTGROUP ?= --start-group
LDENDGROUP ?= --end-group

10
arch/risc-v/src/Makefile
View File

@ -99,10 +99,18 @@ ARCHSCRIPT := $(call CONVERT_PATH,$(ARCHSCRIPT))
LDFLAGS += $(addprefix -T,$(addsuffix .tmp,$(ARCHSCRIPT))) $(EXTRALINKCMDS)
ifeq ($(LD),$(CC))
ifeq ($(CONFIG_STACK_CANARIES),y)
# filter out ssp(Stack Smashing Protector) related flags:
# -fstack-protector
# -fstack-protector-all
# -fstack-protector-strong
# -fstack-protector-explicit
STRIPCFLAGS = $(filter -fstack-protector%,$(CFLAGS))
endif
LDSTARTGROUP ?= -Wl,--start-group
LDENDGROUP ?= -Wl,--end-group
LDFLAGS := $(addprefix -Xlinker ,$(LDFLAGS))
LDFLAGS += $(CFLAGS)
LDFLAGS += $(filter-out $(STRIPCFLAGS),$(CFLAGS))
else
LDSTARTGROUP ?= --start-group
LDENDGROUP ?= --end-group

10
arch/xtensa/src/Makefile
View File

@ -98,10 +98,18 @@ EXTRA_LIBS := $(filter-out $(NAMEFULL_LIBS) $(NAMESPEC_LIBS),$(EXTRA_LIBS))
EXTRA_LIBS += $(wildcard $(APPDIR)$(DELIM)staging$(DELIM)*$(LIBEXT))
ifeq ($(LD),$(CC))
ifeq ($(CONFIG_STACK_CANARIES),y)
# filter out ssp(Stack Smashing Protector) related flags:
# -fstack-protector
# -fstack-protector-all
# -fstack-protector-strong
# -fstack-protector-explicit
STRIPCFLAGS = $(filter -fstack-protector%,$(CFLAGS))
endif
LDSTARTGROUP ?= -Wl,--start-group
LDENDGROUP ?= -Wl,--end-group
LDFLAGS := $(addprefix -Xlinker ,$(LDFLAGS))
LDFLAGS += $(CFLAGS)
LDFLAGS += $(filter-out $(STRIPCFLAGS),$(CFLAGS))
else
LDSTARTGROUP ?= --start-group
LDENDGROUP ?= --end-group

3
libs/libc/assert/CMakeLists.txt
View File

@ -24,4 +24,7 @@ if(CONFIG_STACK_CANARIES)
list(APPEND SRCS lib_stackchk.c)
endif()
set_source_files_properties(lib_assert.c PROPERTIES COMPILE_FLAGS -fno-lto)
set_source_files_properties(lib_stackchk.c PROPERTIES COMPILE_FLAGS -fno-lto)
target_sources(c PRIVATE ${SRCS})

3
libs/libc/assert/Make.defs
View File

@ -24,6 +24,9 @@ ifeq ($(CONFIG_STACK_CANARIES),y)
CSRCS += lib_stackchk.c
endif
assert/lib_assert.c_CFLAGS += -fno-lto
assert/lib_stackchk.c_CFLAGS += -fno-lto
# Add the assert directory to the build
DEPPATH += --dep-path assert