X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgcc;h=ea8ef60f041e0802ff7e853f684d1f48391ab248;hb=764a3f1ff2384f34c592c311f5435a24eb6a53c8;hp=0bdecdaefbef03ba9b61241473409d1580e9fefe;hpb=534fb55f9d0a212c5d857eb3eccabe5c08df1ba1;p=ipfire-2.x.git

diff --git a/lfs/gcc b/lfs/gcc
index 0bdecdaefb..ea8ef60f04 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -24,19 +24,22 @@
 
 include Config
 
-VER        = 4.4.7
+VER        = 4.9.3
 
 GMP_VER    = 5.0.5
 MPFR_VER   = 2.4.2
+MPC_VER    = 1.0.3
 
 THISAPP    = gcc-$(VER)
-DL_FILE    = $(THISAPP).tar.bz2
+DL_FILE    = $(THISAPP).tar.gz
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mtune=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
+CFLAGS    := $(filter-out -fexceptions,$(CFLAGS))
+CXXFLAGS  := $(CFLAGS)
 
 # Normal build or /tools build.
 #
@@ -60,25 +63,34 @@ ifeq "$(PASS)" "1"
   EXTRA_CONFIG = \
 	--target=$(CROSSTARGET) \
 	--prefix=/tools \
+	--with-sysroot=$(ROOT) \
 	--disable-nls \
 	--disable-shared \
 	--disable-decimal-float \
 	--disable-threads \
+	--disable-libatomic \
 	--disable-libmudflap \
 	--disable-libssp \
 	--disable-libgomp \
 	--disable-libquadmath \
+	--disable-libstdc++-v3 \
+	--disable-libvtv \
+	--disable-libcilkrts \
+	--disable-libitm \
+	--disable-libsanitizer \
 	--with-newlib \
 	--without-headers \
 	--without-ppl \
 	--without-cloog \
-	--enable-languages=c
+	--enable-languages=c,c++
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 else
+ifeq "$(PASS)" "2"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
   EXTRA_ENV = \
 	CC="$(CROSSTARGET)-gcc -B/tools/lib/" \
+	CXX="$(CROSSTARGET)-g++" \
 	AR="$(CROSSTARGET)-ar" \
 	RANLIB="$(CROSSTARGET)-ranlib"
   EXTRA_CONFIG = \
@@ -87,6 +99,7 @@ else
 	--target=$(BUILDTARGET) \
 	--prefix=/tools \
 	--with-local-prefix=/tools \
+	--with-native-system-header-dir=/tools/include \
 	--enable-clocale=gnu \
 	--enable-shared \
 	--enable-threads=posix \
@@ -96,7 +109,29 @@ else
 	--disable-bootstrap
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
+else
+  # PASS=L # libstdc++-v3
+  TARGET = $(DIR_INFO)/$(THISAPP)-libstdc++
+  EXTRA_ENV = \
+	CC="$(CROSSTARGET)-gcc -B/tools/lib/" \
+	AR="$(CROSSTARGET)-ar" \
+	RANLIB="$(CROSSTARGET)-ranlib"
+  EXTRA_CONFIG = \
+	--host=$(CROSSTARGET) \
+	--prefix=/tools \
+	--with-sysroot=$(ROOT) \
+	--disable-shared \
+	--disable-nls \
+	--disable-libstdcxx-threads \
+	--disable-libstdcxx-pch \
+	--with-gxx-include-dir=/tools/$(CROSSTARGET)/include/c++/$(VER)
+  EXTRA_MAKE = 
+  EXTRA_INSTALL = 
+endif
 endif
+
+  # Disable stack protection in toolchain.
+  CFLAGS += -fno-stack-protector
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -111,6 +146,11 @@ ifeq "$(MACHINE)" "i586"
 		--with-tune=generic
 endif
 
+ifeq "$(MACHINE)" "x86_64"
+	EXTRA_CONFIG += \
+		--disable-multilib
+endif
+
 EXTRA_CONFIG += \
 	--with-bugurl=http://bugtracker.ipfire.org \
 	--disable-libunwind-exceptions \
@@ -125,15 +165,18 @@ export TCFLAGS = $(CFLAGS)
 
 objects = $(DL_FILE) \
 	gmp-$(GMP_VER).tar.bz2 \
-	mpfr-$(MPFR_VER).tar.bz2
+	mpfr-$(MPFR_VER).tar.bz2 \
+	mpc-$(MPC_VER).tar.gz
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 gmp-$(GMP_VER).tar.bz2 = $(DL_FROM)/gmp-$(GMP_VER).tar.bz2
 mpfr-$(MPFR_VER).tar.bz2 = $(DL_FROM)/mpfr-$(MPFR_VER).tar.bz2
+mpc-$(MPC_VER).tar.gz = $(DL_FROM)/mpc-$(MPC_VER).tar.gz
 
-$(DL_FILE)_MD5			= 295709feb4441b04e87dea3f1bab4281
+$(DL_FILE)_MD5			= 648bfba342bb41a4b5350fb685f85bc5
 gmp-$(GMP_VER).tar.bz2_MD5	= 041487d25e9c230b0c42b106361055fe
 mpfr-$(MPFR_VER).tar.bz2_MD5	= 89e59fe665e2b3ad44a6789f40b059a0
+mpc-$(MPC_VER).tar.gz_MD5	= d6a1d5f8ddea3abd2cc3e98f58352d26
 
 install : $(TARGET)
 
@@ -162,20 +205,16 @@ $(subst %,%_MD5,$(objects)) :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
-	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/gcc-build
 
 	# Apply patches.
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-build-id.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-c++-builtin-redecl.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-i386-libgomp.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-libtool-no-rpath.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-no-add-needed.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-pr33763.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-rh330771.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-rh533181.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-rh610785.patch
-	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc44-unwind-debug-hook.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc49-i386-libgomp.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc49-libtool-no-rpath.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc49-no-add-needed.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc49-pr38757.patch
+	cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/gcc/gcc49-pr64336.patch
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc/gcc-fix-inlining-issues.patch
 
 ifneq "$(ROOT)" ""
 	# Build gmp and mpfr internally in toolchain.
@@ -183,25 +222,39 @@ ifneq "$(ROOT)" ""
 	cd $(DIR_APP) && mv -v gmp-$(GMP_VER) gmp
 	cd $(DIR_APP) && tar xfa $(DIR_DL)/mpfr-$(MPFR_VER).tar.bz2
 	cd $(DIR_APP) && mv -v mpfr-$(MPFR_VER) mpfr
+	cd $(DIR_APP) && tar xfa $(DIR_DL)/mpc-$(MPC_VER).tar.gz
+	cd $(DIR_APP) && mv -v mpc-$(MPC_VER) mpc
 
 ifeq    "$(PASS)" "1"
 	# GCC does not detect stack protection correctly, which causes problems
 	# for the build of libresolv_pic.a.
 	cd $(DIR_APP) && sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' gcc/configure
+
+	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); do \
+		echo "Processing $${file}..."; \
+		sed -i $${file} \
+			-e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \
+			-e 's@/usr@/tools@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_2 ""' >> $${file}; \
+	done
 endif
 
 ifeq    "$(PASS)" "2"
-	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/gcc-4.4.3-startfiles_fix-1.patch
-
+	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
 	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); do \
 		echo "Processing $${file}..."; \
 		sed -i $${file} \
 			-e 's@/lib\(64\)\?\(32\)\?/ld@/tools&@g' \
 			-e 's@/usr@/tools@g'; \
-		echo '#undef STANDARD_INCLUDE_DIR' >> $${file}; \
-		echo '#define STANDARD_INCLUDE_DIR 0' >> $${file}; \
-		echo '#define STANDARD_STARTFILE_PREFIX_1 ""' >> $${file}; \
+		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_2 ""' >> $${file}; \
 	done
 endif
@@ -212,6 +265,15 @@ endif
 		-e 's@\./fixinc\.sh@-c true@' \
 		-e 's/^T_CFLAGS =$$/& -fomit-frame-pointer/'
 
+ifeq    "$(PASS)" "L"
+	# libstdc++ pass
+	cd $(DIR_SRC)/gcc-build && \
+		$(EXTRA_ENV) \
+		$(DIR_APP)/libstdc++-v3/configure \
+			$(EXTRA_CONFIG)
+	cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
+	cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
+else
 	# The actual build.
 	cd $(DIR_SRC)/gcc-build && \
 		$(EXTRA_ENV) \
@@ -219,6 +281,7 @@ endif
 			$(EXTRA_CONFIG)
 	cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
+endif
 
 ifeq "$(ROOT)" ""
 	ln -svf ../usr/bin/cpp /lib