X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgcc;h=0bdecdaefbef03ba9b61241473409d1580e9fefe;hb=811a52519104150ebe845f391d936f83b4001135;hp=2ddaa7f5e4804c6fc76d10d7a5d3a1962101d93b;hpb=70df830214c97a68fcb7e89ae0d7df58c35590be;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/gcc b/lfs/gcc
index 2ddaa7f5e..0bdecdaef 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2007-2011  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        #
@@ -24,101 +24,116 @@
 
 include Config
 
-VER        = 4.0.3
+VER        = 4.4.7
+
+GMP_VER    = 5.0.5
+MPFR_VER   = 2.4.2
 
 THISAPP    = gcc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
-CFLAGS     =
-CXXFLAGS   =
-TARGET_PATH = /opt/$(MACHINE)-uClibc/bin:$(PATH)
+
+CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -mtune=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
-ifeq "$(INST)" "1"
-  TARGET = $(DIR_INFO)/$(THISAPP)-install1
-  EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
-		--build=$(MACHINE)-pc-linux-gnu \
-		--host=$(MACHINE)-pc-linux-gnu \
-		--target=$(MACHINE)-linux-uclibc \
-		--enable-languages=c \
-		--with-sysroot=$(DIR_SRC)/uClibc_dev \
-		--disable-__cxa_atexit \
-		--enable-target-optspace \
-		--with-gnu-ld \
-		--disable-shared \
-		--enable-threads \
-		--enable-multilib \
-		--disable-nls
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
-else
-ifeq "$(INST)" "2"
-  TARGET = $(DIR_INFO)/$(THISAPP)-install2
-  EXTRA_CONFIG = --prefix=/opt/$(MACHINE)-uClibc \
-		--build=$(MACHINE)-pc-linux-gnu \
-		--host=$(MACHINE)-pc-linux-gnu \
-		--target=$(MACHINE)-linux-uclibc \
-		--enable-languages=c,c++ \
-		--with-sysroot=$(DIR_SRC)/uClibc_dev \
-		--disable-__cxa_atexit \
-		--enable-target-optspace \
-		--with-gnu-ld \
-		--enable-shared \
-		--disable-nls \
-		--enable-threads \
-		--enable-multilib
-  EXTRA_MAKE = 
-  EXTRA_INSTALL = 
-else
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr \
-		--libexecdir=/usr/lib \
-		--enable-shared \
-		--enable-threads=posix \
-		--enable-__cxa_atexit \
-		--enable-clocale=gnu \
-		--enable-languages=c,c++ \
-		--disable-nls
+  EXTRA_CONFIG = \
+	--prefix=/usr \
+	--libexecdir=/usr/lib \
+	--enable-shared \
+	--enable-threads=posix \
+	--enable-__cxa_atexit \
+	--enable-clocale=gnu \
+	--enable-languages=c,c++ \
+	--disable-bootstrap \
+	--disable-nls
   EXTRA_MAKE =
   EXTRA_INSTALL =
-endif
-endif
 else
 ifeq "$(PASS)" "1"
   TARGET = $(DIR_INFO)/$(THISAPP)-tools1
-  EXTRA_CONFIG = --prefix=/tools \
-		--with-local-prefix=/tools \
-		--disable-nls \
-		--enable-shared \
-		--enable-languages=c
-  EXTRA_MAKE = bootstrap BOOT_LDFLAGS="-static"
+  EXTRA_CONFIG = \
+	--target=$(CROSSTARGET) \
+	--prefix=/tools \
+	--disable-nls \
+	--disable-shared \
+	--disable-decimal-float \
+	--disable-threads \
+	--disable-libmudflap \
+	--disable-libssp \
+	--disable-libgomp \
+	--disable-libquadmath \
+	--with-newlib \
+	--without-headers \
+	--without-ppl \
+	--without-cloog \
+	--enable-languages=c
+  EXTRA_MAKE = 
   EXTRA_INSTALL = 
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools2
-  EXTRA_CONFIG = --prefix=/tools \
-		--with-local-prefix=/tools \
-		--enable-clocale=gnu \
-		--enable-shared \
-		--enable-threads=posix \
-		--enable-__cxa_atexit \
-		--enable-languages=c,c++ \
-		--disable-libstdcxx-pch
+  EXTRA_ENV = \
+	CC="$(CROSSTARGET)-gcc -B/tools/lib/" \
+	AR="$(CROSSTARGET)-ar" \
+	RANLIB="$(CROSSTARGET)-ranlib"
+  EXTRA_CONFIG = \
+	--host=$(BUILDTARGET) \
+	--build=$(BUILDTARGET) \
+	--target=$(BUILDTARGET) \
+	--prefix=/tools \
+	--with-local-prefix=/tools \
+	--enable-clocale=gnu \
+	--enable-shared \
+	--enable-threads=posix \
+	--enable-__cxa_atexit \
+	--enable-languages=c,c++ \
+	--disable-libstdcxx-pch \
+	--disable-bootstrap
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
 endif
 
+ifeq "$(MACHINE_TYPE)" "arm"
+	EXTRA_CONFIG += \
+		--with-float=soft \
+		--disable-sjlj-exceptions
+endif
+
+ifeq "$(MACHINE)" "i586"
+	EXTRA_CONFIG += \
+		--with-arch=i586 \
+		--with-tune=generic
+endif
+
+EXTRA_CONFIG += \
+	--with-bugurl=http://bugtracker.ipfire.org \
+	--disable-libunwind-exceptions \
+	--enable-gnu-unique-object
+
+export XCFLAGS = $(CFLAGS)
+export TCFLAGS = $(CFLAGS)
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
-objects = $(DL_FILE)
+
+objects = $(DL_FILE) \
+	gmp-$(GMP_VER).tar.bz2 \
+	mpfr-$(MPFR_VER).tar.bz2
 
 $(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
 
-$(DL_FILE)_MD5 = 6ff1af12c53cbb3f79b27f2d6a9a3d50
+$(DL_FILE)_MD5			= 295709feb4441b04e87dea3f1bab4281
+gmp-$(GMP_VER).tar.bz2_MD5	= 041487d25e9c230b0c42b106361055fe
+mpfr-$(MPFR_VER).tar.bz2_MD5	= 89e59fe665e2b3ad44a6789f40b059a0
 
 install : $(TARGET)
 
@@ -149,58 +164,70 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	@$(PREBUILD)
 	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
 	@mkdir $(DIR_SRC)/gcc-build
-ifeq "$(ROOT)" ""
-ifeq "$(INST)" "1"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
-	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-	cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) all-gcc
-	cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install-gcc
-	cd /opt/$(MACHINE)-uClibc/bin && for i in `ls -w1 $(MACHINE)-linux-uclibc-*`; do \
-		ln -svf $$i $(MACHINE)-linux-`echo $$i | cut -c 19-`; \
-	done
-	ln -svf $(MACHINE)-linux-uclibc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux
-	ln -svf gcc /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/bin/cc
-else
-ifeq "$(INST)" "2"
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-conf.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-uclibc-locale.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-libstdc++-pic.patch
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-sdk-libstdc++-includes.patch
-	ln -snf ../include /opt/$(MACHINE)-uClibc/$(MACHINE)-linux-uclibc/sys-include
-	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-	cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_SRC)/gcc-build && PATH=$(TARGET_PATH) make install $(EXTRA_INSTALL)
-	cp -f /opt/$(MACHINE)-uClibc/lib/libgcc_s.so /lib
-	cd /lib && ln -sf libgcc_s.so libgcc_s.so.1
-else
-	cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
-	cd $(DIR_APP) && sed -i 's/^XCFLAGS =$$/& -fomit-frame-pointer/' gcc/Makefile.in
-	cd $(DIR_APP) && sed -i 's@\./fixinc\.sh@-c true@' gcc/Makefile.in
-	cd $(DIR_APP) && sed -i 's/@have_mktemp_command@/yes/' gcc/gccbug.in
 
-	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-	cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
-	ln -sfv ../usr/bin/cpp /lib
-	ln -sfv gcc /usr/bin/cc
+	# 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
+
+ifneq "$(ROOT)" ""
+	# Build gmp and mpfr internally in toolchain.
+	cd $(DIR_APP) && tar xfa $(DIR_DL)/gmp-$(GMP_VER).tar.bz2
+	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
+
+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
 endif
+
+ifeq    "$(PASS)" "2"
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/gcc-4.4.3-startfiles_fix-1.patch
+
+	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 '#define STANDARD_STARTFILE_PREFIX_2 ""' >> $${file}; \
+	done
 endif
-else
-ifeq "$(PASS)" "1"
-	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
+endif
+
+	cd $(DIR_APP) && sed -i 's/install_to_$$(INSTALL_DEST) //' libiberty/Makefile.in
+	cd $(DIR_APP) && sed -i gcc/Makefile.in \
+		-e 's@\./fixinc\.sh@-c true@' \
+		-e 's/^T_CFLAGS =$$/& -fomit-frame-pointer/'
+
+	# The actual build.
+	cd $(DIR_SRC)/gcc-build && \
+		$(EXTRA_ENV) \
+		$(DIR_APP)/configure \
+			$(EXTRA_CONFIG)
 	cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
 	cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
-	ln -sfv gcc /tools/bin/cc
+
+ifeq "$(ROOT)" ""
+	ln -svf ../usr/bin/cpp /lib
+	ln -svf gcc /usr/bin/cc
 else
-	cd $(DIR_APP) && cp -v gcc/Makefile.in{,.orig}
-	cd $(DIR_APP) && sed 's@\./fixinc\.sh@-c true@' gcc/Makefile.in.orig > gcc/Makefile.in
-	cd $(DIR_APP) && cp -v gcc/Makefile.in{,.tmp}
-	cd $(DIR_APP) && sed 's/^XCFLAGS =$\/& -fomit-frame-pointer/' gcc/Makefile.in.tmp \
-				> gcc/Makefile.in
-	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-specs-1.patch
-	cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
-	cd $(DIR_SRC)/gcc-build && make $(MAKETUNING) $(EXTRA_MAKE)
-	cd $(DIR_SRC)/gcc-build && make $(EXTRA_INSTALL) install
+ifeq    "$(PASS)" "1"
+	ln -svf libgcc.a $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/')
+else
+	ln -svf gcc /tools/bin/cc
 endif
 endif
 	@rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build