From b45e371ff71e6a321849ede22bcd606d2b42cebd Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 24 Apr 2017 19:31:37 +0100
Subject: [PATCH] gcc: Perform full bootstrap on ARM32

The build fails with various reasons and a full bootstrap
always succeeds. This takes a very long time so we try to
avoid it where ever possible.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---
 lfs/gcc | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/lfs/gcc b/lfs/gcc
index 6638ba07ea..fc95176404 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -41,6 +41,14 @@ CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
 CXXFLAGS  := $(CFLAGS)
 
+ifeq "$(BUILD_ARCH)" "armv7hl"
+	FULL_BOOTSTRAP = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+	FULL_BOOTSTRAP = 1
+endif
+
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
@@ -109,9 +117,15 @@ ifeq "$(PASS)" "2"
 	--enable-__cxa_atexit \
 	--enable-languages=c,c++ \
 	--disable-libstdcxx-pch \
-	--disable-bootstrap
+	--disable-libgomp
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
+
+  ifeq "$(FULL_BOOTSTRAP)" "1"
+	EXTRA_CONFIG += --enable-bootstrap
+  else
+	EXTRA_CONFIG += --disable-bootstrap
+  endif
 else
   # PASS=L # libstdc++-v3
   TARGET = $(DIR_INFO)/$(THISAPP)-libstdc++
-- 
2.39.5