From 4ec728f840372f61d61c5019d766f453231eb706 Mon Sep 17 00:00:00 2001
From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 12 Jan 2014 09:45:12 +0100
Subject: [PATCH] Revert "toolchain: Fix compiling due to Stack Protector
 changes."

This reverts commit 1dbe439b83315f413c94f7c1726cdd44d7f2f838.
---
 lfs/gcc   |  3 ---
 lfs/glibc | 13 -------------
 2 files changed, 16 deletions(-)

diff --git a/lfs/gcc b/lfs/gcc
index 0264d37f8..a9f124b8c 100644
--- 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"
diff --git a/lfs/glibc b/lfs/glibc
index b09fcd66c..9acbb111b 100644
--- 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)" ""
-- 
2.39.2