X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fgcc;h=ff8723a1e85dfe40d4b4715727bc0b172eb2fbe9;hb=b1881251d6cdd92c7e887813395386afe9692944;hp=0bdecdaefbef03ba9b61241473409d1580e9fefe;hpb=1d12008db5c86f06c70600ea2ac9cc0721af6d9b;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/lfs/gcc b/lfs/gcc
index 0bdecdaefb..ff8723a1e8 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -38,6 +38,9 @@ CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mtune=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=476370
+CFLAGS += -fgnu89-inline
+
 # Normal build or /tools build.
 #
 ifeq "$(ROOT)" ""
@@ -97,6 +100,9 @@ else
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
+
+  # Disable stack protection in toolchain.
+  CFLAGS += -fno-stack-protector
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -111,6 +117,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 \
@@ -177,6 +188,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	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
 
+	# texinfo 5 syntax-fixes
+	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/gcc-4.4.7-texinfo-5.patch
+
 ifneq "$(ROOT)" ""
 	# Build gmp and mpfr internally in toolchain.
 	cd $(DIR_APP) && tar xfa $(DIR_DL)/gmp-$(GMP_VER).tar.bz2