]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
Merge remote-tracking branch 'origin/kernel-update' into glibc-update2
authorMichael Tremer <michael.tremer@ipfire.org>
Sun, 12 Aug 2012 21:00:37 +0000 (17:00 -0400)
committerMichael Tremer <michael.tremer@ipfire.org>
Sun, 12 Aug 2012 21:00:37 +0000 (17:00 -0400)
Conflicts:
lfs/binutils
lfs/ccache
lfs/gcc
lfs/glibc
make.sh

1  2 
lfs/gcc
lfs/glibc
lfs/make
make.sh

diff --combined lfs/gcc
index 430c54de17f091c1b12082d3e252f3cafd698588,7665074c36fb374c64ffd7c9492334b7bab5c2d8..1857dde4c485a12f2f102f14d6835fe42ab258f2
+++ b/lfs/gcc
  
  include Config
  
 -VER        = 4.1.2
 +VER        = 4.4.7
 +
 +GMP_VER    = 5.0.5
 +MPFR_VER   = 2.4.2
  
  THISAPP    = gcc-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@@ -38,58 -35,37 +38,59 @@@ DIR_APP    = $(DIR_SRC)/$(THISAPP
  #
  ifeq "$(ROOT)" ""
    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 =
  else
  ifeq "$(PASS)" "1"
    TARGET = $(DIR_INFO)/$(THISAPP)-tools1
 -  EXTRA_CONFIG = --prefix=/tools \
 -              --with-local-prefix=/tools \
 -              --disable-nls \
 -              --enable-shared \
 -              --enable-languages=c \
 -              --enable-bootstrap
 +  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
++      --enable-languages=c \
++      --enable-bootstrap
    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
@@@ -97,28 -73,38 +98,32 @@@ endi
  
  ifeq "$(MACHINE_TYPE)" "arm"
        EXTRA_CONFIG += \
 -              --build=$(BUILDTARGET) \
 -              --host=$(BUILDTARGET) \
 -              --target=$(BUILDTARGET) \
                --with-float=soft \
 -              --disable-libmudflap \
 -              --disable-libssp \
 -              --disable-libgomp \
 -              --enable-threads=posix \
 -              --enable-long-long \
 -              --enable-c99 \
 -              --enable-__cxa_atexit \
 -              --disable-multilib
 -else
 -      EXTRA_CONFIG += --build=$(BUILDTARGET) --host=$(BUILDTARGET) \
 -              --target=$(BUILDTARGET)
 +              --disable-sjlj-exceptions
  endif
  
  export XCFLAGS = $(CFLAGS)
  export TCFLAGS = $(CFLAGS)
  
+ ifeq "$(PASS)" "1"
+   CFLAGS =
+ endif
  ###############################################################################
  # 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 = a4a3eb15c96030906d8494959eeda23c
 +$(DL_FILE)_MD5                        = 295709feb4441b04e87dea3f1bab4281
 +gmp-$(GMP_VER).tar.bz2_MD5    = 041487d25e9c230b0c42b106361055fe
 +mpfr-$(MPFR_VER).tar.bz2_MD5  = 89e59fe665e2b3ad44a6789f40b059a0
  
  install : $(TARGET)
  
@@@ -148,58 -134,42 +153,58 @@@ $(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)
 -      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/$(THISAPP)-fix_linker_version_detection.patch
        @mkdir $(DIR_SRC)/gcc-build
  
 -      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/gcc-4.1.2-gcc_eh.patch
 -      cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/gcc-4.1.2-arm-linux-soft-float.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 "$(ROOT)" ""
 -      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
 +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
 +endif
  
 -      cd $(DIR_SRC)/gcc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
 +      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 ../usr/bin/cpp /lib
 -      ln -sfv gcc /usr/bin/cc
 +
 +ifeq "$(ROOT)" ""
 +      ln -svf ../usr/bin/cpp /lib
  else
 -ifeq "$(PASS)" "1"
 -      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 gcc /tools/bin/cc
 -      ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-gcc
 -      ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-g++
 -      ln -sf ccache $(ROOT)/usr/local/bin/$(BUILDTARGET)-cc
 +ifeq    "$(PASS)" "1"
 +      ln -svf libgcc.a $$(/tools/bin/$(CROSSTARGET)-gcc -print-libgcc-file-name | sed 's/libgcc/&_eh/')
  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
 +      ln -svf gcc /tools/bin/cc
  endif
  endif
        @rm -rf $(DIR_APP) $(DIR_SRC)/gcc-build
diff --combined lfs/glibc
index 682508df0607c568dbbf933f4a96c95018688acc,2e0b7f93346da9e4ff1b2bcf4deed2d33ccdc0b2..d3590d80f3e4d807bf6a8b3d6ed1edd5854b4fa3
+++ b/lfs/glibc
@@@ -24,8 -24,7 +24,8 @@@
  
  include Config
  
 -VER = 2.5
 +VER        = 2.12-2-gc4ccff1
 +PORTS_VER  = 2.12.1
  
  THISAPP    = glibc-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@@ -36,34 -35,23 +36,34 @@@ DIR_APP    = $(DIR_SRC)/$(THISAPP
  #
  ifeq "$(ROOT)" ""
    TARGET = $(DIR_INFO)/$(THISAPP)
 -  EXTRA_CONFIG = --prefix=/usr \
 -    --disable-profile --enable-add-ons \
 -    --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
 +  EXTRA_CONFIG = \
 +      --build=$(BUILDTARGET) \
 +      --prefix=/usr \
 +      --libexecdir=/usr/lib/glibc
    EXTRA_MAKE =
    EXTRA_INSTALL =
  else
    TARGET = $(DIR_INFO)/$(THISAPP)-tools
 -  EXTRA_CONFIG = --prefix=/tools \
 -    --disable-profile --enable-add-ons \
 -    --enable-kernel=2.6.0 --with-binutils=/tools/bin \
 -    --without-gd --with-headers=/tools/include \
 -    --without-selinux
 +  EXTRA_CONFIG = \
 +      --host=$(CROSSTARGET) \
 +      --build=$(BUILDTARGET) \
 +      --prefix=/tools \
 +      --with-headers=/tools/include \
 +      libc_cv_forced_unwind=yes \
 +      libc_cv_ctors_header=yes \
 +      libc_cv_c_cleanup=yes
    EXTRA_MAKE =
    EXTRA_INSTALL =
  endif
  
 -EXTRA_CONFIG += --build=$(BUILDTARGET)
 +# Enable some extra optimization for the glibc code.
 +export CFLAGS := -O3 -DNDEBUG -fasynchronous-unwind-tables -fPIC -DPIC \
 +      -DNO_CTORS_DTORS_SECTIONS
 +
 +ifeq "$(MACHINE)" "i586"
 +      CFLAGS += -march=i586 -mtune=generic -mno-tls-direct-seg-refs
 +endif
 +
  
  ifeq "$(MACHINE_TYPE)" "arm"
        # Disable hardware FP for ARM.
                --without-fp
  endif
  
 +# Add some general configuration flags
 +EXTRA_CONFIG += \
 +      --disable-profile \
 +      --enable-kernel=2.6.0 \
 +      --enable-add-ons \
 +      --without-selinux \
 +      --enable-experimental-malloc \
 +      --enable-bind-now
 +
  ###############################################################################
  # Top-level Rules
  ###############################################################################
  
 -objects = $(DL_FILE) \
 -      glibc-libidn-$(VER).tar.bz2
 +objects = $(DL_FILE)
  
  $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 -glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2
  
 -$(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
 -glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
 +$(DL_FILE)_MD5 = 450958ad3d3b5a432b356376904c96b0
  
  # ARM needs glibc-ports
  ifeq "$(MACHINE_TYPE)" "arm"
 -      objects += glibc-ports-$(VER).tar.bz2
 -      glibc-ports-$(VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(VER).tar.bz2
 -      glibc-ports-$(VER).tar.bz2_MD5 = 183f6d46e8fa5e4b2aff240ab1586c2e
 +      objects += glibc-ports-$(PORTS_VER).tar.bz2
 +      glibc-ports-$(PORTS_VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(PORTS_VER).tar.bz2
 +      glibc-ports-$(PORTS_VER).tar.bz2_MD5 = cb01ab976180e98287cef5079e35359e
  endif
  
  install : $(TARGET)
@@@ -126,126 -108,20 +126,126 @@@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(
        @$(PREBUILD)
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/glibc-build
 +
  ifeq "$(MACHINE_TYPE)" "arm"
 -      cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(VER).tar.bz2
 -      cd $(DIR_APP) && mv -v glibc-ports-$(VER) ports
 +      cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(PORTS_VER).tar.bz2
 +      cd $(DIR_APP) && mv -v glibc-ports-$(PORTS_VER) ports
 +endif
  
- # Apply all patches.
 -      cd $(DIR_APP)/ports && patch -Np1 -i $(DIR_SRC)/src/patches/glibc-ports-avoid-using-asm-procinfo.patch
 -      cd $(DIR_APP)/ports && patch -Np1 -i $(DIR_SRC)/src/patches/glibc-arm-dont-use-swp.patch
++      # Apply all patches.
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-aliasing.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-fedora.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-getlogin-r.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-localedata.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-recvmmsg.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh580498.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh582738.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh587360.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh593396.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh593686.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh601686.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh607010.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh607461.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh615090.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh615701.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh621959.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh623187.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh625893.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh630801.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh631011.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh641128.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh642584.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh643822.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh645672.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh646954.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh647448.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh652661.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh656014.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh656530.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh657572.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh661982.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh667974.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh676076.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh676591.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh681054.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh688720.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh688980.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh689471.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh692177.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh692838.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh694386.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh695595.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh695963.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh696472.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh697421.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh699724.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh700507.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh703480.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh703481.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh705465.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh711927.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh711987.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh712248.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh713134.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh714823.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh718057.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh726517.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh730379.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh731042.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh736346.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh737778.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh738665.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh738763.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh739184.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh739971.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh740506.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh740506-2.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh749188.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh750531.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh751750.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh752122.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh757888.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh766513.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh767146.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh767693.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh767693-2.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh767746.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh771342.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh782585.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh784402.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh785984.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh788959.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh788959-2.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh789189.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh789209.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh789238.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh789238-2.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh794817.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh794817-2.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh795498.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh797094-1.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh797094-2.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh804630.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh804689.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh808337.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh808545.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh809602.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh833716.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh837026.patch
  
 -      # asm/page.h should not be included in sysdeps/unix/sysv/linux/arm/ioperm.c.
 -      cd $(DIR_APP) && sed "/asm\/page.h/d" -i ports/sysdeps/unix/sysv/linux/arm/ioperm.c
 -endif
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
 +      # http://sourceware.org/bugzilla/show_bug.cgi?id=12354
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-cfi-entry-not-closed.patch
 +      cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch
 +
 +      # Fixes:
 +      #   Makefile:235: *** mixed implicit and normal rules.  Stop.
 +      cd $(DIR_APP) && sed -i 's/ot \$$/ot:\n\ttouch $$@\n$$/' manual/Makefile
 +
 +      # Fix an issue when building glibc with gcc 4.7.
 +      #cd $(DIR_APP) && sed -i "s/ -lgcc_s//" Makeconfig
  
  ifeq "$(ROOT)" ""
 -      # This locale causes a loop on bash login - exclude it
 -      cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
  ifeq "$(MACHINE_TYPE)" "arm"
        cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \
                scripts/test-installation.pl
@@@ -254,16 -130,21 +254,16 @@@ els
                scripts/test-installation.pl
  endif
  endif
 -      cd $(DIR_SRC)/glibc-build && CFLAGS="$(CFLAGS)" $(DIR_APP)/configure $(EXTRA_CONFIG)
  
 -ifeq "$(ROOT)" ""
 -      touch /etc/ld.so.conf
 -      cd $(DIR_SRC)/glibc-build && make $(MAKETUNING) $(EXTRA_MAKE)
 -      cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
 -else
 -      -mkdir /tools/etc
 -      touch /tools/etc/ld.so.conf
 -      cd $(DIR_SRC)/glibc-build && make $(MAKETUNING) $(EXTRA_MAKE)
 +      cd $(DIR_SRC)/glibc-build && \
 +              CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
 +              $(DIR_APP)/configure $(EXTRA_CONFIG)
 +      cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
 +              CFLAFS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
        cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
 -endif
  
 -      # Creating the locales
  ifeq "$(ROOT)" ""
 +      # Creating the locales
        mkdir -p /usr/lib/locale
        cd $(DIR_SRC)/glibc-build && localedef -i en_US -f ISO-8859-1 en_US
        cd $(DIR_SRC)/glibc-build && localedef -i en_US -f UTF-8      en_US.utf8
diff --combined lfs/make
index 14d269bc07b8cebafeec16fa6f571338287a4cba,13968fb509cac7074d91f551874e06eae8920ef2..5650230f9353368b8ea03db5d1bee21a8555e3e9
+++ b/lfs/make
@@@ -43,12 -43,16 +43,16 @@@ ifeq "$(ROOT)" "
    EXTRA_MAKE =
    EXTRA_INSTALL =
  else
 -  TARGET = $(DIR_INFO)/$(THISAPP)-tools-pass$(PASS)
 +  TARGET = $(DIR_INFO)/$(THISAPP)-tools
    EXTRA_CONFIG = --prefix=/tools --disable-nls
    EXTRA_MAKE = 
    EXTRA_INSTALL = 
  endif
  
+ ifeq "$(PASS)" "1"
+   CFLAGS =
+ endif
  ###############################################################################
  # Top-level Rules
  ###############################################################################
diff --combined make.sh
index ab6640ebc9aa76b5f5f927c891108a096f7a8dd2,2bf61bac204666a84563b670be5141048489d10b..9d35e6ee4b1dd63ce385dede8b5c041c56149358
+++ b/make.sh
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  MACHINE=`uname -m`
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
- TOOLCHAINVER=3
+ TOOLCHAINVER=4
  
  BUILDMACHINE=$MACHINE
      if [ "$MACHINE" = "x86_64" ]; then
@@@ -240,7 -240,7 +240,7 @@@ buildtoolchain() 
              ;;
  
          # ARM
-         armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv7l)
+         armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l)
              # These are working.
              ;;
          armv5tel:*)
          exiterror "Cannot build toolchain on ipfire. Please use the download."
      fi
  
+     if [ ! -e /usr/include/asm -o ! -e /usr/include/bits -o ! -e /usr/include/gnu -o ! -e /usr/include/sys ]; then
+         exiterror "Cannot build toolchain without (asm, bits, gnu or sys includes). Please fix or use the download."
+     fi
+     if [ ! -e /usr/lib/libc.so ]; then
+         exiterror "Cannot build toolchain without (/usr/lib/libc.so). Please fix or use the download."
+     fi
      LOGFILE="$BASEDIR/log/_build.toolchain.log"
      export LOGFILE
 -    NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
 -    export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
 -    ORG_PATH=$PATH
 -    lfsmake1 ccache   PASS=1
 -    lfsmake1 make     PASS=1
 -    lfsmake1 linux2 TOOLS=1 HEADERS=1
 -    lfsmake1 binutils PASS=1
 -    lfsmake1 gcc              PASS=1
 -    export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
 +
 +    local ORG_PATH=$PATH
 +    export PATH="/tools/ccache/bin:/tools/bin:$PATH"
 +    lfsmake1 fake-environ             PASS=1
 +    lfsmake1 ccache                   PASS=1
 +    lfsmake1 binutils                 PASS=1
 +    lfsmake1 gcc                      PASS=1
 +    lfsmake1 linux2                   TOOLS=1 HEADERS=1
      lfsmake1 glibc
 -    lfsmake1 cleanup-toolchain PASS=1
 -    lfsmake1 fake-environ
 +    lfsmake1 cleanup-toolchain                PASS=1
 +    lfsmake1 binutils                 PASS=2
 +    lfsmake1 gcc                      PASS=2
 +    lfsmake1 fake-environ             PASS=2
 +    lfsmake1 ccache                   PASS=2
      lfsmake1 tcl
      lfsmake1 expect
      lfsmake1 dejagnu
 -    lfsmake1 gcc              PASS=2
 -    lfsmake1 binutils PASS=2
 -    lfsmake1 ccache   PASS=2
      lfsmake1 ncurses
      lfsmake1 bash
      lfsmake1 bzip2
      lfsmake1 grep
      lfsmake1 gzip
      lfsmake1 m4
 -    lfsmake1 make     PASS=2
 +    lfsmake1 make
      lfsmake1 patch
      lfsmake1 perl
      lfsmake1 sed
      lfsmake1 tar
      lfsmake1 texinfo
 -    lfsmake1 util-linux
 -    lfsmake1 strip
 -    lfsmake1 cleanup-toolchain        PASS=2
 +    lfsmake1 cleanup-toolchain                PASS=2
      export PATH=$ORG_PATH
  }
  
@@@ -299,19 -310,13 +307,19 @@@ buildbase() 
      LOGFILE="$BASEDIR/log/_build.base.log"
      export LOGFILE
      lfsmake2 stage2
 -    lfsmake2 linux2 HEADERS=1
 +    lfsmake2 linux2                   HEADERS=1
      lfsmake2 man-pages
      lfsmake2 glibc
      lfsmake2 tzdata
 -    lfsmake2 cleanup-toolchain        PASS=3
 +    lfsmake2 cleanup-toolchain                PASS=3
 +    lfsmake2 zlib
      lfsmake2 binutils
 +    lfsmake2 gmp
 +    lfsmake2 gmp-compat
 +    lfsmake2 mpfr
 +    lfsmake2 file
      lfsmake2 gcc
 +    lfsmake2 sed
      lfsmake2 berkeley
      lfsmake2 coreutils
      lfsmake2 iana-etc
      lfsmake2 bison
      lfsmake2 ncurses
      lfsmake2 procps
 -    lfsmake2 sed
      lfsmake2 libtool
      lfsmake2 perl
      lfsmake2 readline
 -    lfsmake2 zlib
      lfsmake2 autoconf
      lfsmake2 automake
      lfsmake2 bash
      lfsmake2 diffutils
      lfsmake2 e2fsprogs
      lfsmake2 ed
 -    lfsmake2 file
      lfsmake2 findutils
      lfsmake2 flex
      lfsmake2 gawk
@@@ -455,20 -463,6 +463,6 @@@ buildipfire() 
  #    ipfiremake e1000e                        KCFG="-omap"
  #    ipfiremake igb                   KCFG="-omap"
  
-     # arm-versatile kernel build
-     ipfiremake linux                  KCFG="-versatile"
- #    ipfiremake v4l-dvb                       KCFG="-versatile"
- #    ipfiremake kvm-kmod                      KCFG="-versatile"
- #    ipfiremake mISDN                 KCFG="-versatile"
- #    ipfiremake dahdi                 KCFG="-versatile" KMOD=1
-     ipfiremake cryptodev              KCFG="-versatile"
-     ipfiremake compat-wireless                KCFG="-versatile"
- #    ipfiremake r8169                 KCFG="-versatile"
- #    ipfiremake r8168                 KCFG="-versatile"
- #    ipfiremake r8101                 KCFG="-versatile"
- #    ipfiremake e1000                 KCFG="-versatile"
- #    ipfiremake e1000e                        KCFG="-versatile"
- #    ipfiremake igb                   KCFG="-versatile"
      # arm-kirkwood kernel build
      ipfiremake linux                  KCFG="-kirkwood"
  #    ipfiremake v4l-dvb                       KCFG="-kirkwood"
    ipfiremake dracut
    ipfiremake expat
    ipfiremake gdbm
 -  ipfiremake gmp
    ipfiremake pam
    ipfiremake openssl
    ipfiremake curl
    ipfiremake traceroute
    ipfiremake vlan
    ipfiremake wireless
 -  ipfiremake libsafe
    ipfiremake pakfire
    ipfiremake spandsp
    ipfiremake lzo
    ipfiremake wget
    ipfiremake bridge-utils
    ipfiremake screen
 -  ipfiremake hddtemp
    ipfiremake smartmontools
    ipfiremake htop
  #  ipfiremake postfix               # unknown system type linux 3.2.x
@@@ -802,6 -799,7 +796,6 @@@ buildinstaller() 
    ipfiremake mbr
    ipfiremake memtest
    ipfiremake installer
 -  cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
    installmake strip
    ipfiremake initrd
  }
@@@ -1043,7 -1041,9 +1037,7 @@@ toolchain
        echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for $MACHINE" | tee -a $LOGFILE
        test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
        cd $BASEDIR && tar -zc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
 -              build/{bin,etc,usr/bin,usr/local} \
 -              build/tools/{bin,etc,*-linux-gnu*,include,lib,libexec,sbin,share,var} \
 -              log >> $LOGFILE
 +              build/tools log >> $LOGFILE
        md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.tar.gz \
                > cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-$MACHINE.md5
        stdumount