mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-18 23:12:59 +02:00
Revert "Revert "toolchain: Fix compiling due to Stack Protector changes.""
This reverts commit 4ec728f840.
This commit is contained in:
3
lfs/gcc
3
lfs/gcc
@@ -97,6 +97,9 @@ else
|
||||
EXTRA_MAKE =
|
||||
EXTRA_INSTALL =
|
||||
endif
|
||||
|
||||
# Disable stack protection in toolchain.
|
||||
CFLAGS += -fno-stack-protector
|
||||
endif
|
||||
|
||||
ifeq "$(MACHINE_TYPE)" "arm"
|
||||
|
||||
13
lfs/glibc
13
lfs/glibc
@@ -297,8 +297,21 @@ endif
|
||||
cd $(DIR_SRC)/glibc-build && \
|
||||
CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
|
||||
$(DIR_APP)/configure $(EXTRA_CONFIG)
|
||||
|
||||
sed -i $(DIR_SRC)/glibc-build/config.make \
|
||||
-e "s/^build-pic-default=.*/build-pic-default=yes/"
|
||||
|
||||
# Build the glibc libraries without stack protection (as this is not supported)
|
||||
echo "build-programs=no" >> $(DIR_SRC)/glibc-build/configparms
|
||||
cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
|
||||
CFLAGS="$(CFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE" \
|
||||
CXXFLAGS="$(CXXFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE"
|
||||
|
||||
# Build the programs with hardening
|
||||
: > $(DIR_SRC)/glibc-build/configparms
|
||||
cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
|
||||
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
|
||||
|
||||
cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
|
||||
|
||||
ifeq "$(ROOT)" ""
|
||||
|
||||
Reference in New Issue
Block a user