Revert "toolchain: Fix compiling due to Stack Protector changes."
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 12 Jan 2014 08:45:12 +0000 (09:45 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 12 Jan 2014 08:45:12 +0000 (09:45 +0100)
This reverts commit 1dbe439b83315f413c94f7c1726cdd44d7f2f838.

lfs/gcc
lfs/glibc

diff --git a/lfs/gcc b/lfs/gcc
index 0264d37..a9f124b 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -97,9 +97,6 @@ else
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
-
-  # Disable stack protection in toolchain.
-  CFLAGS += -fno-stack-protector
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
index b09fcd6..9acbb11 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -281,21 +281,8 @@ 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)" ""