X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgcc;h=9cc6ce3359ae4e6e5f48853f8ec4f8337d32f3c3;hb=120d77b33cc106a67bfb7e88aee5ae115be18c97;hp=3c6cb63cd9012e23a942995d1869a19a571e9113;hpb=0c24d56d7c67b6c25250c4d50b83006cdddc9f93;p=ipfire-2.x.git

diff --git a/lfs/gcc b/lfs/gcc
index 3c6cb63cd9..9cc6ce3359 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007-2016  IPFire Team  <info@ipfire.org>                     #
+# Copyright (C) 2007-2017  IPFire Team  <info@ipfire.org>                     #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -36,12 +36,21 @@ DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -mfpu=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mtune=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
 CXXFLAGS  := $(CFLAGS)
 
-# Normal build or /tools build.
+ifeq "$(BUILD_ARCH)" "armv7hl"
+	FULL_BOOTSTRAP = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+	FULL_BOOTSTRAP = 1
+endif
+
+# Normal build or $(TOOLS_DIR) build.
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
@@ -62,10 +71,10 @@ ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \
-	--prefix=/tools \
+	--prefix=$(TOOLS_DIR) \
 	--with-sysroot=$(ROOT) \
-	--with-local-prefix=/tools \
-	--with-native-system-header-dir=/tools/include \
+	--with-local-prefix=$(TOOLS_DIR) \
+	--with-native-system-header-dir=$(TOOLS_DIR)/include \
 	--disable-nls \
 	--disable-shared \
 	--disable-decimal-float \
@@ -73,6 +82,7 @@ ifeq "$(PASS)" "1"
 	--disable-libatomic \
 	--disable-libmudflap \
 	--disable-libssp \
+	--disable-libmpx \
 	--disable-libgomp \
 	--disable-libquadmath \
 	--disable-libstdc++-v3 \
@@ -96,21 +106,21 @@ ifeq "$(PASS)" "2"
 	AR="$(CROSSTARGET)-ar" \
 	RANLIB="$(CROSSTARGET)-ranlib"
   EXTRA_CONFIG = \
-	--host=$(BUILDTARGET) \
 	--build=$(BUILDTARGET) \
-	--target=$(BUILDTARGET) \
-	--prefix=/tools \
-	--with-local-prefix=/tools \
-	--with-native-system-header-dir=/tools/include \
-	--enable-clocale=gnu \
-	--enable-shared \
-	--enable-threads=posix \
-	--enable-__cxa_atexit \
+	--prefix=$(TOOLS_DIR) \
+	--with-local-prefix=$(TOOLS_DIR) \
+	--with-native-system-header-dir=$(TOOLS_DIR)/include \
 	--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++
@@ -120,42 +130,38 @@ else
 	RANLIB="$(CROSSTARGET)-ranlib"
   EXTRA_CONFIG = \
 	--host=$(CROSSTARGET) \
-	--prefix=/tools \
+	--prefix=$(TOOLS_DIR) \
 	--with-sysroot=$(ROOT) \
 	--disable-shared \
 	--disable-nls \
 	--disable-libstdcxx-threads \
 	--disable-libstdcxx-pch \
-	--with-gxx-include-dir=/tools/$(CROSSTARGET)/include/c++/$(VER)
+	--with-gxx-include-dir=$(TOOLS_DIR)/$(CROSSTARGET)/include/c++/$(VER)
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
 endif
 endif
 
-ifeq "$(MACHINE)" "armv7hl"
+ifeq "$(BUILD_ARCH)" "armv7hl"
 	EXTRA_CONFIG += \
 		--with-float=hard
 endif
 
-ifeq "$(MACHINE)" "armv5tel"
+ifeq "$(BUILD_ARCH)" "armv5tel"
 	EXTRA_CONFIG += \
 		--with-float=soft \
 		--disable-sjlj-exceptions
 endif
 
-ifeq "$(MACHINE)" "i586"
+ifeq "$(BUILD_ARCH)" "i586"
 	EXTRA_CONFIG += \
 		--with-arch=i586 \
 		--with-tune=generic
 endif
 
-ifeq "$(MACHINE)" "x86_64"
-	EXTRA_CONFIG += \
-		--disable-multilib
-endif
-
 EXTRA_CONFIG += \
+	--disable-multilib \
 	--with-bugurl=http://bugtracker.ipfire.org \
 	--disable-libunwind-exceptions \
 	--enable-gnu-unique-object
@@ -228,18 +234,18 @@ ifeq "$(TOOLCHAIN)" "1"
 
 ifeq "$(PASS)" "2"
 	cd $(DIR_APP) && cat gcc/limitx.h gcc/glimits.h gcc/limity.h > \
-			`dirname $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name)`/include-fixed/limits.h
+			`dirname $$($(TOOLS_DIR)/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name)`/include-fixed/limits.h
 endif
 
 	for file in $$(find $(DIR_APP)/gcc/config -name linux64.h -o -name linux.h \
 			-o -name sysv4.h -o -name linux-eabi.h -o -name linux-elf.h -o -name aarch64-linux.h); do \
 		echo "Processing $${file}..."; \
 		sed -i $${file} \
-			-e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \
-			-e 's@/usr@/tools@g'; \
+			-e 's@/lib\(64\)\?\(32\)\?/ld@$(TOOLS_DIR)&@g' \
+			-e 's@/usr@$(TOOLS_DIR)@g'; \
 		echo '#undef STANDARD_STARTFILE_PREFIX_1' >> $${file}; \
 		echo '#undef STANDARD_STARTFILE_PREFIX_2' >> $${file}; \
-		echo '#define STANDARD_STARTFILE_PREFIX_1 "/tools/lib/"' >> $${file}; \
+		echo '#define STANDARD_STARTFILE_PREFIX_1 "$(TOOLS_DIR)/lib/"' >> $${file}; \
 		echo '#define STANDARD_STARTFILE_PREFIX_2 ""' >> $${file}; \
 	done
 endif
@@ -265,18 +271,18 @@ endif
 
 ifeq "$(TOOLCHAIN)" "1"
  ifeq "$(PASS)" "1"
-	ln -svf libgcc.a $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/')
+	ln -svf libgcc.a $$($(TOOLS_DIR)/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/')
  endif
 
  ifeq "$(PASS)" "2"
-	ln -svf gcc /tools/bin/cc
+	ln -svf gcc $(TOOLS_DIR)/bin/cc
 	# remove gdb python files from libdir
-	rm -rf /tools/lib/*-gdb.py
+	rm -rf $(TOOLS_DIR)/lib/*-gdb.py
  endif
 
  ifeq "$(PASS)" "L"
 	# Workaround for https://gcc.gnu.org/bugzilla/show_bug.cgi?id=70936
-	sed -e "s/^#include_next/#include/" -i /tools/$(CROSSTARGET)/include/c++/$(VER)/cstdlib
+	sed -e "s/^#include_next/#include/" -i $(TOOLS_DIR)/$(CROSSTARGET)/include/c++/$(VER)/cstdlib
  endif
 
 else # NON-TOOLCHAIN