Merge remote-tracking branch 'amarx/BUG10796' into next

[ipfire-2.x.git] / lfs / gcc

diff --git a/lfs/gcc b/lfs/gcc
index 400cf269d7f2d624c648b9c42af27f65a0a94ed2..0264d37f8308aa989604c40f15303aa2c69ddbab 100644 (file)
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -36,6 +36,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 
 CFLAGS    := $(patsubst -march=%,,$(CFLAGS))
 CFLAGS    := $(patsubst -mtune=%,,$(CFLAGS))
+CFLAGS    := $(patsubst -mfloat-abi=%,,$(CFLAGS))
 
 # Normal build or /tools build.
 #
@@ -96,6 +97,9 @@ else
   EXTRA_MAKE = 
   EXTRA_INSTALL = 
 endif
+
+  # Disable stack protection in toolchain.
+  CFLAGS += -fno-stack-protector
 endif
 
 ifeq "$(MACHINE_TYPE)" "arm"
@@ -118,10 +122,6 @@ EXTRA_CONFIG += \
 export XCFLAGS = $(CFLAGS)
 export TCFLAGS = $(CFLAGS)
 
-ifeq "$(PASS)" "1"
-  CFLAGS =
-endif
-
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -180,6 +180,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