63 files changed, 76 insertions, 105 deletions
diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile
index e76b60b0b..a13ab2ebf 100644
--- a/toolchain/gcc/Makefile
+++ b/toolchain/gcc/Makefile
@@ -2,7 +2,7 @@
 #
 # Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.org>
 # Copyright (C) 2004 Manuel Novoa III <mjn3@uclibc.org>
-# Copyright (C) 2005 Felix Fietkau <openwrt@nbd.name>
+# Copyright (C) 2005-2006 Felix Fietkau <nbd@openwrt.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
@@ -20,68 +20,36 @@
 
 include $(TOPDIR)/rules.mk
 
-GCC_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#"))
+PKG_NAME:=gcc
+PKG_VERSION:=$(strip $(subst ",, $(CONFIG_GCC_VERSION)))#"))
 
-#GCC_SITE:=ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(GCC_VERSION)
-GCC_SITE:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(GCC_VERSION) \
-	http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(GCC_VERSION)
+PKG_SOURCE:=gcc-$(PKG_VERSION).tar.bz2
+PKG_MD5SUM:=unknown
+PKG_SOURCE_URL:=ftp://ftp.fu-berlin.de/unix/languages/gcc/releases/gcc-$(PKG_VERSION) \
+	http://mirrors.rcn.net/pub/sourceware/gcc/releases/gcc-$(PKG_VERSION) \
+	ftp://ftp.gnu.org/gnu/gcc/releases/gcc-$(PKG_VERSION)
+PKG_CAT:=bzcat
 
-GCC_SOURCE:=gcc-$(GCC_VERSION).tar.bz2
-GCC_DIR:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)
-GCC_CAT:=bzcat
+PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)
 
-#############################################################
-#
-# Setup some initial stuff
-#
-#############################################################
-
-ifeq ($(CONFIG_INSTALL_LIBGCJ),y)
-TARGET_LANGUAGES:=c,c++,java
-else
-ifeq ($(CONFIG_INSTALL_LIBSTDCPP),y)
-TARGET_LANGUAGES:=c,c++
-else
 TARGET_LANGUAGES:=c
+ifeq ($(CONFIG_INSTALL_LIBSTDCPP),y)
+TARGET_LANGUAGES:=$(TARGET_LANGUAGES),c++
 endif
+ifeq ($(CONFIG_INSTALL_LIBGCJ),y)
+TARGET_LANGUAGES:=$(TARGET_LANGUAGES),java
 endif
 
-#############################################################
-#
-# build the first pass gcc compiler
-#
-#############################################################
-
-GCC_BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-initial
-
-$(DL_DIR)/$(GCC_SOURCE):
-	mkdir -p $(DL_DIR)
-	$(SCRIPT_DIR)/download.pl $(DL_DIR) $(GCC_SOURCE) x $(GCC_SITE)
-
-$(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
-	mkdir -p $(TOOL_BUILD_DIR)
-	$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOL_BUILD_DIR) $(TAR_OPTIONS) -
-	touch $(GCC_DIR)/.unpacked
-
-$(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
-	# Apply any files named gcc-*.patch from the source directory to gcc
-	$(SCRIPT_DIR)/patch-kernel.sh $(GCC_DIR) ./$(GCC_VERSION) \*.patch
-	# Note: The soft float situation has improved considerably with gcc 3.4.x.
-	# We can dispense with the custom spec files, as well as libfloat for the arm case.
-	# However, we still need a patch for arm.  There's a similar patch for gcc 3.3.x
-	# which needs to be integrated so we can kill of libfloat for good.
-	$(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(GCC_DIR)/gcc/version.c
-	$(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:https://dev.openwrt.org/>\2,' $(GCC_DIR)/gcc/version.c
-	touch $(GCC_DIR)/.patched
-
-# The --without-headers option stopped working with gcc 3.0 and has never been
-# # fixed, so we need to actually have working C library header files prior to
-# # the step or libgcc will not build...
-
-$(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
-	mkdir -p $(GCC_BUILD_DIR1)
-	(cd $(GCC_BUILD_DIR1); rm -f config.cache; PATH=$(TARGET_PATH) \
-		$(GCC_DIR)/configure \
+include $(INCLUDE_DIR)/host-build.mk
+
+BUILD_DIR1:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)-initial
+BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(PKG_VERSION)-final
+
+
+define Stage1/Configure
+	mkdir -p $(BUILD_DIR1)
+	(cd $(BUILD_DIR1); rm -f config.cache; PATH=$(TARGET_PATH) \
+		$(PKG_BUILD_DIR)/configure \
 		--prefix=$(STAGING_DIR) \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
@@ -92,41 +60,25 @@ $(GCC_BUILD_DIR1)/.configured: $(GCC_DIR)/.patched
 		--disable-__cxa_atexit \
 		--enable-target-optspace \
 		--with-gnu-ld \
-		$(DISABLE_NLS) \
-		$(MULTILIB) \
+		--disable-nls \
 	);
-	touch $(GCC_BUILD_DIR1)/.configured
-
-$(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
-	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) all-gcc
-	touch $(GCC_BUILD_DIR1)/.compiled
-
-$(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc: $(GCC_BUILD_DIR1)/.compiled
-	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR1) install-gcc
-
-#############################################################
-#
-# second pass compiler build.  Build the compiler targeting 
-# the newly built shared uClibc library.
-#
-#############################################################
-#
-# Sigh... I had to rework things because using --with-gxx-include-dir
-# causes issues with include dir search order for g++.  This seems to
-# have something to do with "path translations" and possibly doesn't
-# affect gcc-target.  However, I haven't tested gcc-target yet so no
-# guarantees.  mjn3
-
-GCC_BUILD_DIR2:=$(TOOL_BUILD_DIR)/gcc-$(GCC_VERSION)-final
-$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(STAGING_DIR)/lib/libc.a
-	mkdir -p $(GCC_BUILD_DIR2)
+endef
+define Stage1/Compile
+	PATH=$(TARGET_PATH) $(MAKE) -C $(BUILD_DIR1) all-gcc
+endef
+define Stage1/Install
+	PATH=$(TARGET_PATH) $(MAKE) -C $(BUILD_DIR1) install-gcc
+endef
+
+define Stage2/Configure
+	mkdir -p $(BUILD_DIR2)
 	# Important!  Required for limits.h to be fixed.
 	rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
 	ln -sf ../include $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/sys-include
 	rm -rf $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
 	ln -sf ../lib $(STAGING_DIR)/$(REAL_GNU_TARGET_NAME)/lib
-	(cd $(GCC_BUILD_DIR2); rm -f config.cache; PATH=$(TARGET_PATH) \
-		$(GCC_DIR)/configure \
+	(cd $(BUILD_DIR2); rm -f config.cache; PATH=$(TARGET_PATH) \
+		$(PKG_BUILD_DIR)/configure \
 		--prefix=$(STAGING_DIR) \
 		--build=$(GNU_HOST_NAME) \
 		--host=$(GNU_HOST_NAME) \
@@ -136,18 +88,15 @@ $(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.patched $(STAGING_DIR)/lib/libc.a
 		--disable-__cxa_atexit \
 		--enable-target-optspace \
 		--with-gnu-ld \
-		$(DISABLE_NLS) \
-		$(MULTILIB) \
+		--disable-nls \
 	);
-	touch $(GCC_BUILD_DIR2)/.configured
-
-$(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
-	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) all
-	touch $(GCC_BUILD_DIR2)/.compiled
-
-gcc-install: $(GCC_BUILD_DIR2)/.compiled FORCE
-	PATH=$(TARGET_PATH) $(MAKE) -C $(GCC_BUILD_DIR2) install
-	echo $(GCC_VERSION) > $(STAGING_DIR)/gcc_version
+endef
+define Stage2/Compile
+	PATH=$(TARGET_PATH) $(MAKE) -C $(BUILD_DIR2) all
+endef
+define Stage2/Install
+	PATH=$(TARGET_PATH) $(MAKE) -C $(BUILD_DIR2) install
+	echo $(PKG_VERSION) > $(STAGING_DIR)/gcc_version
 	# Set up the symlinks to enable lying about target name.
 	set -e; \
 	(cd $(STAGING_DIR); \
@@ -158,14 +107,36 @@ gcc-install: $(GCC_BUILD_DIR2)/.compiled FORCE
 		   	$(GNU_TARGET_NAME)$${app##$(REAL_GNU_TARGET_NAME)}; \
 		done; \
 	);
-
-source: $(DL_DIR)/$(GCC_SOURCE)
-prepare: $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gcc
-compile: gcc-install
-install:
-clean: gcc-clean
-	rm -rf $(GCC_DIR)
-	rm -rf $(GCC_BUILD_DIR1)
-	rm -rf $(GCC_BUILD_DIR2)
+endef
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(SCRIPT_DIR)/patch-kernel.sh $(PKG_BUILD_DIR) ./patches/$(PKG_VERSION) \*.patch
+	$(SED) 's,\(version_string.. = "[0-9\.]*\).*\(";\),\1 (OpenWrt-2.0)\2,' $(PKG_BUILD_DIR)/gcc/version.c
+	$(SED) 's,\(bug_report_url.. = "\).*\(";\),\1<URL:https://dev.openwrt.org/>\2,' $(PKG_BUILD_DIR)/gcc/version.c
+endef
+
+define Build/Configure
+	$(call Stage1/Configure)
+endef
+
+define Build/Compile
+	$(call Stage1/Compile)
+	$(call Stage1/Install)
+endef
+
+define Build/Install
+	$(call Stage2/Configure)
+	$(call Stage2/Compile)
+	$(call Stage2/Install)
+endef
+
+define Build/Clean
+	rm -rf $(PKG_BUILD_DIR)
+	rm -rf $(BUILD_DIR1)
+	rm -rf $(BUILD_DIR2)
 	rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-gc*
 	rm -f $(STAGING_DIR)/bin/$(REAL_GNU_TARGET_NAME)-c*
+endef
+
+$(eval $(call HostBuild))
diff --git a/toolchain/gcc/3.4.4/100-uclibc-conf.patch b/toolchain/gcc/patches/3.4.4/100-uclibc-conf.patch
index 29e4c802e..29e4c802e 100644
--- a/toolchain/gcc/3.4.4/100-uclibc-conf.patch
+++ b/toolchain/gcc/patches/3.4.4/100-uclibc-conf.patch
diff --git a/toolchain/gcc/3.4.4/200-uclibc-locale.patch b/toolchain/gcc/patches/3.4.4/200-uclibc-locale.patch
index 3fc4900b0..3fc4900b0 100644
--- a/toolchain/gcc/3.4.4/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/3.4.4/200-uclibc-locale.patch
diff --git a/toolchain/gcc/3.4.4/300-libstdc++-pic.patch b/toolchain/gcc/patches/3.4.4/300-libstdc++-pic.patch
index c030ba620..c030ba620 100644
--- a/toolchain/gcc/3.4.4/300-libstdc++-pic.patch
+++ b/toolchain/gcc/patches/3.4.4/300-libstdc++-pic.patch
diff --git a/toolchain/gcc/3.4.4/601-gcc34-arm-ldm.patch b/toolchain/gcc/patches/3.4.4/601-gcc34-arm-ldm.patch
index 142052fdf..142052fdf 100644
--- a/toolchain/gcc/3.4.4/601-gcc34-arm-ldm.patch
+++ b/toolchain/gcc/patches/3.4.4/601-gcc34-arm-ldm.patch
diff --git a/toolchain/gcc/3.4.4/602-sdk-libstdc++-includes.patch b/toolchain/gcc/patches/3.4.4/602-sdk-libstdc++-includes.patch
index 4377c2143..4377c2143 100644
--- a/toolchain/gcc/3.4.4/602-sdk-libstdc++-includes.patch
+++ b/toolchain/gcc/patches/3.4.4/602-sdk-libstdc++-includes.patch
diff --git a/toolchain/gcc/3.4.4/700-pr15068-fix.patch b/toolchain/gcc/patches/3.4.4/700-pr15068-fix.patch
index 2977765c5..2977765c5 100644
--- a/toolchain/gcc/3.4.4/700-pr15068-fix.patch
+++ b/toolchain/gcc/patches/3.4.4/700-pr15068-fix.patch
diff --git a/toolchain/gcc/3.4.4/800-arm-bigendian.patch b/toolchain/gcc/patches/3.4.4/800-arm-bigendian.patch
index 0bae8f474..0bae8f474 100644
--- a/toolchain/gcc/3.4.4/800-arm-bigendian.patch
+++ b/toolchain/gcc/patches/3.4.4/800-arm-bigendian.patch
diff --git a/toolchain/gcc/3.4.4/810-arm-bigendian-uclibc.patch b/toolchain/gcc/patches/3.4.4/810-arm-bigendian-uclibc.patch
index a4d87e231..a4d87e231 100644
--- a/toolchain/gcc/3.4.4/810-arm-bigendian-uclibc.patch
+++ b/toolchain/gcc/patches/3.4.4/810-arm-bigendian-uclibc.patch
diff --git a/toolchain/gcc/3.4.4/830-gcc-bug-num-22167.patch b/toolchain/gcc/patches/3.4.4/830-gcc-bug-num-22167.patch
index c7419af90..c7419af90 100644
--- a/toolchain/gcc/3.4.4/830-gcc-bug-num-22167.patch
+++ b/toolchain/gcc/patches/3.4.4/830-gcc-bug-num-22167.patch
diff --git a/toolchain/gcc/3.4.4/arm-softfloat.patch.conditional b/toolchain/gcc/patches/3.4.4/arm-softfloat.patch.conditional
index 19d1b90da..19d1b90da 100644
--- a/toolchain/gcc/3.4.4/arm-softfloat.patch.conditional
+++ b/toolchain/gcc/patches/3.4.4/arm-softfloat.patch.conditional
diff --git a/toolchain/gcc/3.4.5/100-uclibc-conf.patch b/toolchain/gcc/patches/3.4.5/100-uclibc-conf.patch
index 6bc73a427..6bc73a427 100644
--- a/toolchain/gcc/3.4.5/100-uclibc-conf.patch
+++ b/toolchain/gcc/patches/3.4.5/100-uclibc-conf.patch
diff --git a/toolchain/gcc/3.4.5/200-uclibc-locale.patch b/toolchain/gcc/patches/3.4.5/200-uclibc-locale.patch
index a97f22b49..a97f22b49 100644
--- a/toolchain/gcc/3.4.5/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/3.4.5/200-uclibc-locale.patch
diff --git a/toolchain/gcc/3.4.5/300-libstdc++-pic.patch b/toolchain/gcc/patches/3.4.5/300-libstdc++-pic.patch
index c030ba620..c030ba620 100644
--- a/toolchain/gcc/3.4.5/300-libstdc++-pic.patch
+++ b/toolchain/gcc/patches/3.4.5/300-libstdc++-pic.patch
diff --git a/toolchain/gcc/3.4.5/600-gcc34-arm-ldm-peephole.patch b/toolchain/gcc/patches/3.4.5/600-gcc34-arm-ldm-peephole.patch
index 0c370502c..0c370502c 100644
--- a/toolchain/gcc/3.4.5/600-gcc34-arm-ldm-peephole.patch
+++ b/toolchain/gcc/patches/3.4.5/600-gcc34-arm-ldm-peephole.patch
diff --git a/toolchain/gcc/3.4.5/601-gcc34-arm-ldm-peephole2.patch b/toolchain/gcc/patches/3.4.5/601-gcc34-arm-ldm-peephole2.patch
index 27f7c07db..27f7c07db 100644
--- a/toolchain/gcc/3.4.5/601-gcc34-arm-ldm-peephole2.patch
+++ b/toolchain/gcc/patches/3.4.5/601-gcc34-arm-ldm-peephole2.patch
diff --git a/toolchain/gcc/3.4.5/601-gcc34-arm-ldm.patch b/toolchain/gcc/patches/3.4.5/601-gcc34-arm-ldm.patch
index 142052fdf..142052fdf 100644
--- a/toolchain/gcc/3.4.5/601-gcc34-arm-ldm.patch
+++ b/toolchain/gcc/patches/3.4.5/601-gcc34-arm-ldm.patch
diff --git a/toolchain/gcc/3.4.5/602-sdk-libstdc++-includes.patch b/toolchain/gcc/patches/3.4.5/602-sdk-libstdc++-includes.patch
index 4377c2143..4377c2143 100644
--- a/toolchain/gcc/3.4.5/602-sdk-libstdc++-includes.patch
+++ b/toolchain/gcc/patches/3.4.5/602-sdk-libstdc++-includes.patch
diff --git a/toolchain/gcc/3.4.5/700-pr15068-fix.patch b/toolchain/gcc/patches/3.4.5/700-pr15068-fix.patch
index 2977765c5..2977765c5 100644
--- a/toolchain/gcc/3.4.5/700-pr15068-fix.patch
+++ b/toolchain/gcc/patches/3.4.5/700-pr15068-fix.patch
diff --git a/toolchain/gcc/3.4.5/71_all_sh-pr16665-fix.patch b/toolchain/gcc/patches/3.4.5/71_all_sh-pr16665-fix.patch
index 680bb3978..680bb3978 100644
--- a/toolchain/gcc/3.4.5/71_all_sh-pr16665-fix.patch
+++ b/toolchain/gcc/patches/3.4.5/71_all_sh-pr16665-fix.patch
diff --git a/toolchain/gcc/3.4.5/72_all_sh-no-reorder-blocks.patch b/toolchain/gcc/patches/3.4.5/72_all_sh-no-reorder-blocks.patch
index 8b9826831..8b9826831 100644
--- a/toolchain/gcc/3.4.5/72_all_sh-no-reorder-blocks.patch
+++ b/toolchain/gcc/patches/3.4.5/72_all_sh-no-reorder-blocks.patch
diff --git a/toolchain/gcc/3.4.5/73_all_sh-pr20617.patch b/toolchain/gcc/patches/3.4.5/73_all_sh-pr20617.patch
index 6d8021cc7..6d8021cc7 100644
--- a/toolchain/gcc/3.4.5/73_all_sh-pr20617.patch
+++ b/toolchain/gcc/patches/3.4.5/73_all_sh-pr20617.patch
diff --git a/toolchain/gcc/3.4.5/800-arm-bigendian.patch b/toolchain/gcc/patches/3.4.5/800-arm-bigendian.patch
index 0bae8f474..0bae8f474 100644
--- a/toolchain/gcc/3.4.5/800-arm-bigendian.patch
+++ b/toolchain/gcc/patches/3.4.5/800-arm-bigendian.patch
diff --git a/toolchain/gcc/3.4.5/800-powerpc-libc_stack_end-uclibc.patch b/toolchain/gcc/patches/3.4.5/800-powerpc-libc_stack_end-uclibc.patch
index a209470f7..a209470f7 100644
--- a/toolchain/gcc/3.4.5/800-powerpc-libc_stack_end-uclibc.patch
+++ b/toolchain/gcc/patches/3.4.5/800-powerpc-libc_stack_end-uclibc.patch
diff --git a/toolchain/gcc/3.4.6/100-uclibc-conf.patch b/toolchain/gcc/patches/3.4.6/100-uclibc-conf.patch
index 29e4c802e..29e4c802e 100644
--- a/toolchain/gcc/3.4.6/100-uclibc-conf.patch
+++ b/toolchain/gcc/patches/3.4.6/100-uclibc-conf.patch
diff --git a/toolchain/gcc/3.4.6/200-uclibc-locale.patch b/toolchain/gcc/patches/3.4.6/200-uclibc-locale.patch
index 3fc4900b0..3fc4900b0 100644
--- a/toolchain/gcc/3.4.6/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/3.4.6/200-uclibc-locale.patch
diff --git a/toolchain/gcc/3.4.6/300-libstdc++-pic.patch b/toolchain/gcc/patches/3.4.6/300-libstdc++-pic.patch
index c030ba620..c030ba620 100644
--- a/toolchain/gcc/3.4.6/300-libstdc++-pic.patch
+++ b/toolchain/gcc/patches/3.4.6/300-libstdc++-pic.patch
diff --git a/toolchain/gcc/3.4.6/601-gcc34-arm-ldm.patch b/toolchain/gcc/patches/3.4.6/601-gcc34-arm-ldm.patch
index 142052fdf..142052fdf 100644
--- a/toolchain/gcc/3.4.6/601-gcc34-arm-ldm.patch
+++ b/toolchain/gcc/patches/3.4.6/601-gcc34-arm-ldm.patch
diff --git a/toolchain/gcc/3.4.6/602-sdk-libstdc++-includes.patch b/toolchain/gcc/patches/3.4.6/602-sdk-libstdc++-includes.patch
index 4377c2143..4377c2143 100644
--- a/toolchain/gcc/3.4.6/602-sdk-libstdc++-includes.patch
+++ b/toolchain/gcc/patches/3.4.6/602-sdk-libstdc++-includes.patch
diff --git a/toolchain/gcc/3.4.6/700-pr15068-fix.patch b/toolchain/gcc/patches/3.4.6/700-pr15068-fix.patch
index 2977765c5..2977765c5 100644
--- a/toolchain/gcc/3.4.6/700-pr15068-fix.patch
+++ b/toolchain/gcc/patches/3.4.6/700-pr15068-fix.patch
diff --git a/toolchain/gcc/3.4.6/800-arm-bigendian.patch b/toolchain/gcc/patches/3.4.6/800-arm-bigendian.patch
index 0bae8f474..0bae8f474 100644
--- a/toolchain/gcc/3.4.6/800-arm-bigendian.patch
+++ b/toolchain/gcc/patches/3.4.6/800-arm-bigendian.patch
diff --git a/toolchain/gcc/3.4.6/810-arm-bigendian-uclibc.patch b/toolchain/gcc/patches/3.4.6/810-arm-bigendian-uclibc.patch
index a4d87e231..a4d87e231 100644
--- a/toolchain/gcc/3.4.6/810-arm-bigendian-uclibc.patch
+++ b/toolchain/gcc/patches/3.4.6/810-arm-bigendian-uclibc.patch
diff --git a/toolchain/gcc/3.4.6/arm-softfloat.patch.conditional b/toolchain/gcc/patches/3.4.6/arm-softfloat.patch.conditional
index 19d1b90da..19d1b90da 100644
--- a/toolchain/gcc/3.4.6/arm-softfloat.patch.conditional
+++ b/toolchain/gcc/patches/3.4.6/arm-softfloat.patch.conditional
diff --git a/toolchain/gcc/4.0.2/100-uclibc-conf.patch b/toolchain/gcc/patches/4.0.2/100-uclibc-conf.patch
index 9436c7d1c..9436c7d1c 100644
--- a/toolchain/gcc/4.0.2/100-uclibc-conf.patch
+++ b/toolchain/gcc/patches/4.0.2/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.0.2/200-uclibc-locale.patch b/toolchain/gcc/patches/4.0.2/200-uclibc-locale.patch
index c57f17312..c57f17312 100644
--- a/toolchain/gcc/4.0.2/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/4.0.2/200-uclibc-locale.patch
diff --git a/toolchain/gcc/4.0.3/100-uclibc-conf.patch b/toolchain/gcc/patches/4.0.3/100-uclibc-conf.patch
index 3be7d0975..3be7d0975 100644
--- a/toolchain/gcc/4.0.3/100-uclibc-conf.patch
+++ b/toolchain/gcc/patches/4.0.3/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.0.3/200-uclibc-locale.patch b/toolchain/gcc/patches/4.0.3/200-uclibc-locale.patch
index ac4cf9720..ac4cf9720 100644
--- a/toolchain/gcc/4.0.3/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/4.0.3/200-uclibc-locale.patch
diff --git a/toolchain/gcc/4.0.3/300-libstdc++-pic.patch b/toolchain/gcc/patches/4.0.3/300-libstdc++-pic.patch
index 63aed34ea..63aed34ea 100644
--- a/toolchain/gcc/4.0.3/300-libstdc++-pic.patch
+++ b/toolchain/gcc/patches/4.0.3/300-libstdc++-pic.patch
diff --git a/toolchain/gcc/4.0.3/301-missing-execinfo_h.patch b/toolchain/gcc/patches/4.0.3/301-missing-execinfo_h.patch
index 0e2092f3f..0e2092f3f 100644
--- a/toolchain/gcc/4.0.3/301-missing-execinfo_h.patch
+++ b/toolchain/gcc/patches/4.0.3/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.0.3/302-c99-snprintf.patch b/toolchain/gcc/patches/4.0.3/302-c99-snprintf.patch
index dfb22d681..dfb22d681 100644
--- a/toolchain/gcc/4.0.3/302-c99-snprintf.patch
+++ b/toolchain/gcc/patches/4.0.3/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.0.3/303-c99-complex-ugly-hack.patch b/toolchain/gcc/patches/4.0.3/303-c99-complex-ugly-hack.patch
index 2ccc80d9b..2ccc80d9b 100644
--- a/toolchain/gcc/4.0.3/303-c99-complex-ugly-hack.patch
+++ b/toolchain/gcc/patches/4.0.3/303-c99-complex-ugly-hack.patch
diff --git a/toolchain/gcc/4.0.3/602-sdk-libstdc++-includes.patch b/toolchain/gcc/patches/4.0.3/602-sdk-libstdc++-includes.patch
index c7676ae6a..c7676ae6a 100644
--- a/toolchain/gcc/4.0.3/602-sdk-libstdc++-includes.patch
+++ b/toolchain/gcc/patches/4.0.3/602-sdk-libstdc++-includes.patch
diff --git a/toolchain/gcc/4.1.0/100-uclibc-conf.patch b/toolchain/gcc/patches/4.1.0/100-uclibc-conf.patch
index 49d576c7d..49d576c7d 100644
--- a/toolchain/gcc/4.1.0/100-uclibc-conf.patch
+++ b/toolchain/gcc/patches/4.1.0/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.1.0/110-arm-eabi.patch b/toolchain/gcc/patches/4.1.0/110-arm-eabi.patch
index acebe5308..acebe5308 100644
--- a/toolchain/gcc/4.1.0/110-arm-eabi.patch
+++ b/toolchain/gcc/patches/4.1.0/110-arm-eabi.patch
diff --git a/toolchain/gcc/4.1.0/200-uclibc-locale.patch b/toolchain/gcc/patches/4.1.0/200-uclibc-locale.patch
index bba729ce7..bba729ce7 100644
--- a/toolchain/gcc/4.1.0/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/4.1.0/200-uclibc-locale.patch
diff --git a/toolchain/gcc/4.1.0/300-libstdc++-pic.patch b/toolchain/gcc/patches/4.1.0/300-libstdc++-pic.patch
index 89d03a85e..89d03a85e 100644
--- a/toolchain/gcc/4.1.0/300-libstdc++-pic.patch
+++ b/toolchain/gcc/patches/4.1.0/300-libstdc++-pic.patch
diff --git a/toolchain/gcc/4.1.0/301-missing-execinfo_h.patch b/toolchain/gcc/patches/4.1.0/301-missing-execinfo_h.patch
index 0e2092f3f..0e2092f3f 100644
--- a/toolchain/gcc/4.1.0/301-missing-execinfo_h.patch
+++ b/toolchain/gcc/patches/4.1.0/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.1.0/302-c99-snprintf.patch b/toolchain/gcc/patches/4.1.0/302-c99-snprintf.patch
index dfb22d681..dfb22d681 100644
--- a/toolchain/gcc/4.1.0/302-c99-snprintf.patch
+++ b/toolchain/gcc/patches/4.1.0/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.1.0/303-c99-complex-ugly-hack.patch b/toolchain/gcc/patches/4.1.0/303-c99-complex-ugly-hack.patch
index 2ccc80d9b..2ccc80d9b 100644
--- a/toolchain/gcc/4.1.0/303-c99-complex-ugly-hack.patch
+++ b/toolchain/gcc/patches/4.1.0/303-c99-complex-ugly-hack.patch
diff --git a/toolchain/gcc/4.1.0/602-sdk-libstdc++-includes.patch b/toolchain/gcc/patches/4.1.0/602-sdk-libstdc++-includes.patch
index 23fce7544..23fce7544 100644
--- a/toolchain/gcc/4.1.0/602-sdk-libstdc++-includes.patch
+++ b/toolchain/gcc/patches/4.1.0/602-sdk-libstdc++-includes.patch
diff --git a/toolchain/gcc/4.1.0/740-sh-pr24836.patch b/toolchain/gcc/patches/4.1.0/740-sh-pr24836.patch
index 7992282cf..7992282cf 100644
--- a/toolchain/gcc/4.1.0/740-sh-pr24836.patch
+++ b/toolchain/gcc/patches/4.1.0/740-sh-pr24836.patch
diff --git a/toolchain/gcc/4.1.0/800-arm-bigendian.patch b/toolchain/gcc/patches/4.1.0/800-arm-bigendian.patch
index 1fa5ae1cd..1fa5ae1cd 100644
--- a/toolchain/gcc/4.1.0/800-arm-bigendian.patch
+++ b/toolchain/gcc/patches/4.1.0/800-arm-bigendian.patch
diff --git a/toolchain/gcc/4.1.1/100-uclibc-conf.patch b/toolchain/gcc/patches/4.1.1/100-uclibc-conf.patch
index 49d576c7d..49d576c7d 100644
--- a/toolchain/gcc/4.1.1/100-uclibc-conf.patch
+++ b/toolchain/gcc/patches/4.1.1/100-uclibc-conf.patch
diff --git a/toolchain/gcc/4.1.1/110-arm-eabi.patch b/toolchain/gcc/patches/4.1.1/110-arm-eabi.patch
index acebe5308..acebe5308 100644
--- a/toolchain/gcc/4.1.1/110-arm-eabi.patch
+++ b/toolchain/gcc/patches/4.1.1/110-arm-eabi.patch
diff --git a/toolchain/gcc/4.1.1/200-uclibc-locale.patch b/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
index 9d65a6234..9d65a6234 100644
--- a/toolchain/gcc/4.1.1/200-uclibc-locale.patch
+++ b/toolchain/gcc/patches/4.1.1/200-uclibc-locale.patch
diff --git a/toolchain/gcc/4.1.1/300-libstdc++-pic.patch b/toolchain/gcc/patches/4.1.1/300-libstdc++-pic.patch
index 89d03a85e..89d03a85e 100644
--- a/toolchain/gcc/4.1.1/300-libstdc++-pic.patch
+++ b/toolchain/gcc/patches/4.1.1/300-libstdc++-pic.patch
diff --git a/toolchain/gcc/4.1.1/301-missing-execinfo_h.patch b/toolchain/gcc/patches/4.1.1/301-missing-execinfo_h.patch
index 0e2092f3f..0e2092f3f 100644
--- a/toolchain/gcc/4.1.1/301-missing-execinfo_h.patch
+++ b/toolchain/gcc/patches/4.1.1/301-missing-execinfo_h.patch
diff --git a/toolchain/gcc/4.1.1/302-c99-snprintf.patch b/toolchain/gcc/patches/4.1.1/302-c99-snprintf.patch
index dfb22d681..dfb22d681 100644
--- a/toolchain/gcc/4.1.1/302-c99-snprintf.patch
+++ b/toolchain/gcc/patches/4.1.1/302-c99-snprintf.patch
diff --git a/toolchain/gcc/4.1.1/303-c99-complex-ugly-hack.patch b/toolchain/gcc/patches/4.1.1/303-c99-complex-ugly-hack.patch
index 2ccc80d9b..2ccc80d9b 100644
--- a/toolchain/gcc/4.1.1/303-c99-complex-ugly-hack.patch
+++ b/toolchain/gcc/patches/4.1.1/303-c99-complex-ugly-hack.patch
diff --git a/toolchain/gcc/4.1.1/304-index_macro.patch b/toolchain/gcc/patches/4.1.1/304-index_macro.patch
index 1fac112fa..1fac112fa 100644
--- a/toolchain/gcc/4.1.1/304-index_macro.patch
+++ b/toolchain/gcc/patches/4.1.1/304-index_macro.patch
diff --git a/toolchain/gcc/4.1.1/602-sdk-libstdc++-includes.patch b/toolchain/gcc/patches/4.1.1/602-sdk-libstdc++-includes.patch
index 23fce7544..23fce7544 100644
--- a/toolchain/gcc/4.1.1/602-sdk-libstdc++-includes.patch
+++ b/toolchain/gcc/patches/4.1.1/602-sdk-libstdc++-includes.patch
diff --git a/toolchain/gcc/4.1.1/740-sh-pr24836.patch b/toolchain/gcc/patches/4.1.1/740-sh-pr24836.patch
index 7992282cf..7992282cf 100644
--- a/toolchain/gcc/4.1.1/740-sh-pr24836.patch
+++ b/toolchain/gcc/patches/4.1.1/740-sh-pr24836.patch
diff --git a/toolchain/gcc/4.1.1/800-arm-bigendian.patch b/toolchain/gcc/patches/4.1.1/800-arm-bigendian.patch
index 1fa5ae1cd..1fa5ae1cd 100644
--- a/toolchain/gcc/4.1.1/800-arm-bigendian.patch
+++ b/toolchain/gcc/patches/4.1.1/800-arm-bigendian.patch