Support building a gcc-2.95 toolchain instead

5 files changed, 547 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 382c8b180..923b6c8cb 100644
--- a/Makefile
+++ b/Makefile
@@ -38,6 +38,11 @@ ARCH:=i386
 # enable to build a native gcc toolchain with uclibc support
 USE_UCLIBC_TOOLCHAIN:=true
 
+# If you are building a native gcc toolchain, do you want to
+# build the old gcc-2.95 based toolchain, or would you prefer
+# a nice and shiny new gcc-3.2.1 toolchain?
+GCC_2_95_TOOLCHAIN:=false
+
 # Enable this to use the uClibc daily snapshot instead of a released
 # version.  Daily snapshots may contain new features and bugfixes. Or
 # they may not even compile at all, depending on what Erik is doing...
diff --git a/make/uclibc_toolchain.mk b/make/uclibc_toolchain.mk
index b9077322c..eaa6e8d21 100644
--- a/make/uclibc_toolchain.mk
+++ b/make/uclibc_toolchain.mk
@@ -17,6 +17,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 ifeq ($(USE_UCLIBC_TOOLCHAIN),true)
+ifeq ($(GCC_2_95__TOOLCHAIN),false)
 
 #############################################################
 #
@@ -471,3 +472,4 @@ $(ARCH)-uclibc-toolchain.tar.bz2: gcc_final
 tarball: $(ARCH)-uclibc-toolchain.tar.bz2
 
 endif
+endif
diff --git a/make/uclibc_toolchain_2_95.mk b/make/uclibc_toolchain_2_95.mk
new file mode 100644
index 000000000..212cea687
--- /dev/null
+++ b/make/uclibc_toolchain_2_95.mk
@@ -0,0 +1,540 @@
+# Makefile for to build a gcc/uClibc toolchain
+#
+# Copyright (C) 2002-2003 Erik Andersen <andersen@uclibc.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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+ifeq ($(USE_UCLIBC_TOOLCHAIN),true)
+ifeq ($(GCC_2_95_TOOLCHAIN),true)
+
+#############################################################
+#
+# You should probably leave this stuff alone unless you are
+# hacking on the toolchain...
+#
+#############################################################
+TARGET_LANGUAGES:=c,c++
+
+# If you want multilib enabled, enable this...
+MULTILIB:=--enable-multilib
+
+#############################################################
+#
+# Where we can find things....
+#
+# for various dependancy reasons, these need to live
+# here at the top...  Easier to find things here anyways...
+#
+#############################################################
+BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
+BINUTILS_SOURCE:=binutils-2.13.2.tar.bz2
+BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.13.2
+#
+# Perhaps you would perfer to use the older 2.12.1 version?
+#BINUTILS_SITE:=ftp://ftp.gnu.org/gnu/binutils/
+#BINUTILS_SOURCE:=binutils-2.12.1.tar.bz2
+#BINUTILS_DIR:=$(BUILD_DIR)/binutils-2.12.1
+
+ifeq ($(USE_UCLIBC_SNAPSHOT),true)
+# Be aware that this changes daily....
+UCLIBC_DIR=$(BUILD_DIR)/uClibc
+UCLIBC_SOURCE=uClibc-snapshot.tar.bz2
+UCLIBC_SITE:=ftp://www.uclibc.org/uClibc
+else
+UCLIBC_DIR:=$(BUILD_DIR)/uClibc-0.9.17
+UCLIBC_SOURCE:=uClibc-0.9.17.tar.bz2
+UCLIBC_SITE:=http://www.kernel.org/pub/linux/libs/uclibc
+endif
+
+GCC_SITE:=http://www.kernel.org/pub/linux/libs/uclibc/toolchain
+GCC_SOURCE:=gcc-20011006.tar.bz2
+GCC_DIR:=$(BUILD_DIR)/gcc-20011006
+
+ELF2FLT_SITE:=http://www.kernel.org/pub/linux/libs/uclibc/toolchain
+ELF2FLT_SOURCE:=elf2flt-20020731.tar.bz2
+ELF2FLT_DIR:=$(BUILD_DIR)/elf2flt
+
+STLPORT_SITE=http://www.stlport.org/archive
+STLPORT_SOURCE=STLport-4.5.3.tar.gz
+STLPORT_DIR=$(BUILD_DIR)/STLport-4.5.3
+
+
+
+#############################################################
+#
+# Setup some initial paths
+#
+#############################################################
+$(BUILD_DIR)/.setup:
+	mkdir -p $(BUILD_DIR)
+	mkdir -p $(DL_DIR)
+	mkdir -p $(STAGING_DIR)
+	mkdir -p $(STAGING_DIR)/include
+	mkdir -p $(STAGING_DIR)/lib/gcc-lib
+	mkdir -p $(STAGING_DIR)/$(GNU_TARGET_NAME)/
+	(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../lib)
+	(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../include)
+	(cd $(STAGING_DIR)/$(GNU_TARGET_NAME); ln -fs ../include sys-include)
+	mkdir -p $(STAGING_DIR)/usr/lib
+	(cd $(STAGING_DIR)/usr/lib; ln -fs ../../lib/gcc-lib)
+	touch $(BUILD_DIR)/.setup
+
+
+#############################################################
+#
+# Setup some initial stuff
+#
+#############################################################
+ifeq ("$(TARGET_LANGUAGES)","c,c++")
+STLPORT_TARGET=stlport
+endif
+
+uclibc_toolchain: gcc_final
+
+uclibc_toolchain-clean: gcc_final-clean uclibc-clean gcc_initial-clean binutils-clean
+
+uclibc_toolchain-dirclean: gcc_final-dirclean uclibc-dirclean gcc_initial-dirclean binutils-dirclean
+
+
+#############################################################
+#
+# build binutils
+#
+#############################################################
+BINUTILS_DIR1:=$(BUILD_DIR)/binutils-build
+$(DL_DIR)/$(BINUTILS_SOURCE):
+	$(WGET) -P $(DL_DIR) $(BINUTILS_SITE)/$(BINUTILS_SOURCE)
+
+$(BINUTILS_DIR)/.unpacked: $(BUILD_DIR)/.setup $(DL_DIR)/$(BINUTILS_SOURCE)
+	bzcat $(DL_DIR)/$(BINUTILS_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch $(BINUTILS_DIR)/.unpacked
+
+$(BINUTILS_DIR)/.patched: $(BINUTILS_DIR)/.unpacked
+	# Apply any files named binutils-*.patch from the source directory to binutils
+	$(SOURCE_DIR)/patch-kernel.sh $(BINUTILS_DIR) $(SOURCE_DIR) binutils-*.patch
+	#
+	# Enable combreloc, since it is such a nice thing to have...
+	#
+	-perl -i -p -e "s,link_info.combreloc = false,link_info.combreloc = true,g;" \
+		$(BINUTILS_DIR)/ld/ldmain.c
+	#
+	# Hack binutils to use the correct shared lib loader
+	#
+	(cd $(BINUTILS_DIR); perl -i -p -e "s,#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\"\
+		,#define ELF_DYNAMIC_INTERPRETER \"/lib/ld-uClibc.so.0\",;" \
+		`grep -lr "#.*define.*ELF_DYNAMIC_INTERPRETER.*\".*\"" $(BINUTILS_DIR)`);
+	touch $(BINUTILS_DIR)/.patched
+
+$(BINUTILS_DIR1)/.configured: $(BINUTILS_DIR)/.patched
+	mkdir -p $(BINUTILS_DIR1)
+	(cd $(BINUTILS_DIR1); CC=$(HOSTCC) $(BINUTILS_DIR)/configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=$(STAGING_DIR) \
+		--exec-prefix=$(STAGING_DIR) \
+		--bindir=$(STAGING_DIR)/bin \
+		--sbindir=$(STAGING_DIR)/sbin \
+		--sysconfdir=$(STAGING_DIR)/etc \
+		--datadir=$(STAGING_DIR)/share \
+		--includedir=$(STAGING_DIR)/include \
+		--libdir=$(STAGING_DIR)/lib \
+		--localstatedir=$(STAGING_DIR)/var \
+		--mandir=$(STAGING_DIR)/man \
+		--infodir=$(STAGING_DIR)/info \
+		--enable-targets=$(GNU_TARGET_NAME) \
+		$(MULTILIB) \
+		--program-prefix=$(ARCH)-uclibc-);
+	touch $(BINUTILS_DIR1)/.configured
+
+$(BINUTILS_DIR1)/binutils/objdump: $(BINUTILS_DIR1)/.configured
+	$(MAKE) -C $(BINUTILS_DIR1);
+
+$(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld: $(BINUTILS_DIR1)/binutils/objdump 
+	$(MAKE) -C $(BINUTILS_DIR1) install
+	rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc \
+		$(STAGING_DIR)/share/locale
+
+$(STAGING_DIR)/lib/libg.a:
+	$(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ar rv $(STAGING_DIR)/lib/libg.a;
+
+binutils: $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin/ld $(STAGING_DIR)/lib/libg.a
+
+binutils-clean:
+	rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)*
+	-$(MAKE) -C $(BINUTILS_DIR1) clean
+
+binutils-dirclean:
+	rm -rf $(BINUTILS_DIR1)
+
+
+
+
+#############################################################
+#
+# Next build first pass gcc compiler
+#
+#############################################################
+GCC_BUILD_DIR1:=$(BUILD_DIR)/gcc-initial
+$(DL_DIR)/$(GCC_SOURCE):
+	$(WGET) -P $(DL_DIR) $(GCC_SITE)/$(GCC_SOURCE)
+
+$(GCC_DIR)/.unpacked: $(BUILD_DIR)/.setup $(DL_DIR)/$(GCC_SOURCE)
+	bzcat $(DL_DIR)/$(GCC_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch $(GCC_DIR)/.unpacked
+
+$(GCC_DIR)/.patched: $(GCC_DIR)/.unpacked
+	# Apply any files named gcc-*.patch from the source directory to gcc
+	$(SOURCE_DIR)/patch-kernel.sh $(GCC_DIR) $(SOURCE_DIR) gcc-2.95-mega.patch.bz2
+	touch $(GCC_DIR)/.patched
+
+$(GCC_DIR)/.gcc_build_hacks: $(GCC_DIR)/.patched
+	#
+	# Hack things to use the correct shared lib loader
+	#
+	(cd $(GCC_DIR); set -e; export LIST=`grep -lr -- "-dynamic-linker.*\.so[\.0-9]*" *`;\
+		if [ -n "$$LIST" ] ; then \
+		perl -i -p -e "s,-dynamic-linker.*\.so[\.0-9]*},\
+		    -dynamic-linker /lib/ld-uClibc.so.0},;" $$LIST; fi);
+	#
+	# Prevent system glibc start files from leaking in uninvited...
+	#
+	perl -i -p -e "s,standard_startfile_prefix_1 = \".*,standard_startfile_prefix_1 =\
+		\"$(STAGING_DIR)/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
+	perl -i -p -e "s,standard_startfile_prefix_2 = \".*,standard_startfile_prefix_2 =\
+		\"$(STAGING_DIR)/usr/lib/\";,;" $(GCC_DIR)/gcc/gcc.c;
+	#
+	# Prevent system glibc include files from leaking in uninvited...
+	#
+	perl -i -p -e "s,^NATIVE_SYSTEM_HEADER_DIR.*,NATIVE_SYSTEM_HEADER_DIR=\
+		$(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
+	perl -i -p -e "s,^CROSS_SYSTEM_HEADER_DIR.*,CROSS_SYSTEM_HEADER_DIR=\
+		$(STAGING_DIR)/include,;" $(GCC_DIR)/gcc/Makefile.in;
+	perl -i -p -e "s,^#define.*STANDARD_INCLUDE_DIR.*,#define STANDARD_INCLUDE_DIR \
+		\"$(STAGING_DIR)/include\",;" $(GCC_DIR)/gcc/cppdefault.h;
+	#
+	# Prevent gcc from using the unwind-dw2-fde-glibc code
+	#
+	perl -i -p -e "s,^#ifndef inhibit_libc,#define inhibit_libc\n\
+		#ifndef inhibit_libc,g;" $(GCC_DIR)/gcc/unwind-dw2-fde-glibc.c;
+	#
+	# Use atexit() directly, rather than cxa_atexit
+	#
+	perl -i -p -e "s,int flag_use_cxa_atexit = 1;,int flag_use_cxa_atexit = 0;,g;"\
+		$(GCC_DIR)/gcc/cp/decl2.c;
+	#
+	# We do not wish to build the libstdc++ library provided with gcc,
+	# since it doesn't seem to work at all with uClibc plus gcc 2.95...
+	#
+	mv $(GCC_DIR)/libstdc++ $(GCC_DIR)/libstdc++.orig
+	mv $(GCC_DIR)/libio $(GCC_DIR)/libio.orig
+	touch $(GCC_DIR)/.gcc_build_hacks
+
+# 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)/.gcc_build_hacks
+	mkdir -p $(GCC_BUILD_DIR1)
+	(cd $(GCC_BUILD_DIR1); PATH=$(STAGING_DIR)/bin:$$PATH AR=$(ARCH)-uclibc-ar \
+		RANLIB=$(ARCH)-uclibc-ranlib CC=$(HOSTCC) $(GCC_DIR)/configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=$(STAGING_DIR) \
+		--exec-prefix=$(STAGING_DIR) \
+		--bindir=$(STAGING_DIR)/bin \
+		--sbindir=$(STAGING_DIR)/sbin \
+		--sysconfdir=$(STAGING_DIR)/etc \
+		--datadir=$(STAGING_DIR)/share \
+		--includedir=$(STAGING_DIR)/include \
+		--libdir=$(STAGING_DIR)/lib \
+		--localstatedir=$(STAGING_DIR)/var \
+		--mandir=$(STAGING_DIR)/man \
+		--infodir=$(STAGING_DIR)/info \
+		--with-local-prefix=$(STAGING_DIR)/usr/local \
+		--oldincludedir=$(STAGING_DIR)/include $(MULTILIB) \
+		--enable-target-optspace --disable-nls --with-gnu-ld \
+		--disable-shared --enable-languages=c --disable-__cxa_atexit \
+		$(EXTRA_GCC_CONFIG_OPTIONS) --program-prefix=$(ARCH)-uclibc-);
+	touch $(GCC_BUILD_DIR1)/.configured
+
+$(GCC_BUILD_DIR1)/.compiled: $(GCC_BUILD_DIR1)/.configured
+	PATH=$(STAGING_DIR)/bin:$$PATH $(MAKE) -C $(GCC_BUILD_DIR1) \
+	    AR_FOR_TARGET=$(STAGING_DIR)/bin/$(ARCH)-uclibc-ar \
+	    RANLIB_FOR_TARGET=$(STAGING_DIR)/bin/$(ARCH)-uclibc-ranlib
+	touch $(GCC_BUILD_DIR1)/.compiled
+
+$(GCC_BUILD_DIR1)/.installed: $(GCC_BUILD_DIR1)/.compiled
+	PATH=$(STAGING_DIR)/bin:$$PATH $(MAKE) -C $(GCC_BUILD_DIR1) install;
+	#Cleanup then mess when --program-prefix mysteriously fails 
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cpp $(STAGING_DIR)/bin/$(ARCH)-uclibc-cpp
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc
+	rm -f $(STAGING_DIR)/bin/gccbug $(STAGING_DIR)/bin/gcov
+	rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc \
+		$(STAGING_DIR)/share/locale
+	touch $(GCC_BUILD_DIR1)/.installed
+
+gcc_initial: binutils $(UCLIBC_DIR)/.configured $(GCC_BUILD_DIR1)/.installed
+
+gcc_initial-clean:
+	rm -rf $(GCC_BUILD_DIR1)
+	rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)*
+
+gcc_initial-dirclean:
+	rm -rf $(GCC_BUILD_DIR1)
+
+
+
+#############################################################
+#
+# uClibc is built in two stages.  First, we install the uClibc 
+# include files so that gcc can be built.  Later when gcc for 
+# the target arch has been compiled, we can actually compile 
+# uClibc for the target... 
+#
+#############################################################
+$(DL_DIR)/$(UCLIBC_SOURCE):
+	$(WGET) -P $(DL_DIR) $(UCLIBC_SITE)/$(UCLIBC_SOURCE)
+
+$(UCLIBC_DIR)/.unpacked: $(BUILD_DIR)/.setup $(DL_DIR)/$(UCLIBC_SOURCE)
+	bzcat $(DL_DIR)/$(UCLIBC_SOURCE) | tar -C $(BUILD_DIR) -xvf -
+	touch $(UCLIBC_DIR)/.unpacked
+
+$(UCLIBC_DIR)/.configured: $(UCLIBC_DIR)/.unpacked $(BUILD_DIR)/linux/.configured
+	perl -i -p -e 's,^CROSS=.*,TARGET_ARCH=$(ARCH)\nCROSS=$(TARGET_CROSS),g' \
+		$(UCLIBC_DIR)/Rules.mak
+	cp $(SOURCE_DIR)/uClibc.config $(UCLIBC_DIR)/.config
+	perl -i -p -e 's,^KERNEL_SOURCE=.*,KERNEL_SOURCE=\"$(LINUX_DIR)\",g' \
+		$(UCLIBC_DIR)/.config
+	perl -i -p -e 's,^DEVEL_PREFIX=.*,DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \
+		$(UCLIBC_DIR)/.config
+	perl -i -p -e 's,^SYSTEM_DEVEL_PREFIX=.*,SYSTEM_DEVEL_PREFIX=\"$(STAGING_DIR)\",g' \
+		$(UCLIBC_DIR)/.config
+	perl -i -p -e 's,^DEVEL_TOOL_PREFIX=.*,DEVEL_TOOL_PREFIX=\"$(STAGING_DIR)/usr\",g' \
+		$(UCLIBC_DIR)/.config
+	perl -i -p -e 's,^SHARED_LIB_LOADER_PATH=.*,SHARED_LIB_LOADER_PATH=\"/lib\",g' \
+		$(UCLIBC_DIR)/.config
+	perl -i -p -e 's,.*UCLIBC_HAS_WCHAR.*,UCLIBC_HAS_WCHAR=y\nUCLIBC_HAS_LOCALE=n,g' \
+		$(UCLIBC_DIR)/.config
+	perl -i -p -e 's,^GCC_BIN.*,GCC_BIN=$(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc,g' \
+		$(UCLIBC_DIR)/extra/gcc-uClibc/Makefile
+	perl -i -p -e 's,^LD_BIN.*,LD_BIN=$(STAGING_DIR)/bin/$(ARCH)-uclibc-ld,g' \
+		$(UCLIBC_DIR)/extra/gcc-uClibc/Makefile
+	$(MAKE) -C $(UCLIBC_DIR) oldconfig
+	$(MAKE) -C $(UCLIBC_DIR) headers install_dev;
+	touch $(UCLIBC_DIR)/.configured
+
+$(UCLIBC_DIR)/lib/libc.a: $(UCLIBC_DIR)/.configured
+	$(MAKE) -C $(UCLIBC_DIR)
+
+$(STAGING_DIR)/lib/libc.a: $(UCLIBC_DIR)/lib/libc.a
+	$(MAKE) -C $(UCLIBC_DIR) install_dev install_runtime install_utils
+
+ifneq ($(TARGET_DIR),)
+$(TARGET_DIR)/lib/libc.so.0: $(STAGING_DIR)/lib/libc.a
+	$(MAKE) -C $(UCLIBC_DIR) DEVEL_PREFIX=$(TARGET_DIR) \
+		SYSTEM_DEVEL_PREFIX=$(TARGET_DIR) \
+		DEVEL_TOOL_PREFIX=$(TARGET_DIR)/usr install_runtime
+
+$(TARGET_DIR)/usr/bin/ldd: $(TARGET_DIR)/lib/libc.so.0
+	$(MAKE) -C $(UCLIBC_DIR) PREFIX=$(TARGET_DIR) install_target_utils
+
+UCLIBC_TARGETS=$(TARGET_DIR)/lib/libc.so.0 $(TARGET_DIR)/usr/bin/ldd
+endif
+
+uclibc: gcc_initial $(STAGING_DIR)/lib/libc.a $(UCLIBC_TARGETS)
+
+uclibc-clean:
+	-$(MAKE) -C $(UCLIBC_DIR) clean
+	rm -f $(UCLIBC_DIR)/.config
+
+uclibc-dirclean:
+	rm -rf $(UCLIBC_DIR)
+
+
+
+
+
+#############################################################
+#
+# second pass compiler build.  Build the compiler targeting 
+# the newly built shared uClibc library.
+#
+#############################################################
+GCC_BUILD_DIR2:=$(BUILD_DIR)/gcc-final
+$(GCC_DIR)/.g++_build_hacks: $(GCC_DIR)/.patched
+	#
+	# Hack up the soname for libstdc++
+	# 
+	#perl -i -p -e "s,\.so\.1,.so.0.9.9,g;" $(GCC_DIR)/gcc/config/t-slibgcc-elf-ver;
+	#perl -i -p -e "s,-version-info.*[0-9]:[0-9]:[0-9],-version-info 9:9:0,g;" \
+	#	$(GCC_DIR)/libstdc++-v3/src/Makefile.am $(GCC_DIR)/libstdc++-v3/src/Makefile.in;
+	#perl -i -p -e "s,3\.0\.0,9.9.0,g;" $(GCC_DIR)/libstdc++-v3/acinclude.m4 \
+	#	$(GCC_DIR)/libstdc++-v3/aclocal.m4 $(GCC_DIR)/libstdc++-v3/configure;
+	#
+	# For now, we don't support locale-ified ctype (we will soon), 
+	# so bypass that problem for now...
+	#
+	#perl -i -p -e "s,defined.*_GLIBCPP_USE_C99.*,1,g;" \
+	#	$(GCC_DIR)/libstdc++-v3/config/locale/generic/c_locale.cc;
+	#cp $(GCC_DIR)/libstdc++-v3/config/os/generic/bits/ctype_base.h \
+	#	$(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/bits/
+	#cp $(GCC_DIR)/libstdc++-v3/config/os/generic/bits/ctype_inline.h \
+	#	$(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/bits/
+	#cp $(GCC_DIR)/libstdc++-v3/config/os/generic/bits/ctype_noninline.h \
+	#	$(GCC_DIR)/libstdc++-v3/config/os/gnu-linux/bits/
+	touch $(GCC_DIR)/.g++_build_hacks
+
+$(GCC_BUILD_DIR2)/.configured: $(GCC_DIR)/.g++_build_hacks
+	mkdir -p $(GCC_BUILD_DIR2)
+	(cd $(GCC_BUILD_DIR2); PATH=$(STAGING_DIR)/bin:$$PATH AR=$(TARGET_CROSS)ar \
+		RANLIB=$(TARGET_CROSS)ranlib LD=$(TARGET_CROSS)ld NM=$(TARGET_CROSS)nm \
+		CC=$(HOSTCC) $(GCC_DIR)/configure \
+		--target=$(GNU_TARGET_NAME) \
+		--prefix=$(STAGING_DIR) \
+		--exec-prefix=$(STAGING_DIR) \
+		--bindir=$(STAGING_DIR)/bin \
+		--sbindir=$(STAGING_DIR)/sbin \
+		--sysconfdir=$(STAGING_DIR)/etc \
+		--datadir=$(STAGING_DIR)/share \
+		--localstatedir=$(STAGING_DIR)/var \
+		--mandir=$(STAGING_DIR)/man \
+		--infodir=$(STAGING_DIR)/info \
+		--with-local-prefix=$(STAGING_DIR)/usr/local \
+		--libdir=$(STAGING_DIR)/lib \
+		--includedir=$(STAGING_DIR)/include \
+		--with-gxx-include-dir=$(STAGING_DIR)/include/c++ \
+		--oldincludedir=$(STAGING_DIR)/include \
+		--enable-shared $(MULTILIB) \
+		--enable-target-optspace --disable-nls \
+		--with-gnu-ld --disable-__cxa_atexit \
+		--enable-languages=$(TARGET_LANGUAGES) \
+		$(EXTRA_GCC_CONFIG_OPTIONS) \
+		--program-prefix=$(ARCH)-uclibc- \
+	);
+	touch $(GCC_BUILD_DIR2)/.configured
+
+$(GCC_BUILD_DIR2)/.compiled: $(GCC_BUILD_DIR2)/.configured
+	PATH=$(STAGING_DIR)/bin:$$PATH CC=$(HOSTCC) \
+	    AR_FOR_TARGET=$(TARGET_CROSS)ar RANLIB_FOR_TARGET=$(TARGET_CROSS)ranlib \
+	    LD_FOR_TARGET=$(TARGET_CROSS)ld NM_FOR_TARGET=$(TARGET_CROSS)nm \
+	    CC_FOR_TARGET=$(TARGET_CROSS)gcc $(MAKE) -C $(GCC_BUILD_DIR2)
+	touch $(GCC_BUILD_DIR2)/.compiled
+
+$(GCC_BUILD_DIR2)/.installed: $(GCC_BUILD_DIR2)/.compiled
+	PATH=$(STAGING_DIR)/bin:$$PATH $(MAKE) -C $(GCC_BUILD_DIR2) install;
+	touch $(GCC_BUILD_DIR2)/.installed
+
+#Cleanup then mess when --program-prefix mysteriously fails 
+$(GCC_BUILD_DIR2)/.fixedup: $(GCC_BUILD_DIR2)/.installed
+	-mv $(STAGING_DIR)/bin/gcc $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin;
+	-mv $(STAGING_DIR)/bin/protoize $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin;
+	-mv $(STAGING_DIR)/bin/unprotoize $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin;
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-cpp $(STAGING_DIR)/bin/$(ARCH)-uclibc-cpp
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-gcc $(STAGING_DIR)/bin/$(ARCH)-uclibc-gcc
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-c++ $(STAGING_DIR)/bin/$(ARCH)-uclibc-c++
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-g++ $(STAGING_DIR)/bin/$(ARCH)-uclibc-g++
+	-mv $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)-c++filt $(STAGING_DIR)/bin/$(ARCH)-uclibc-c++filt
+	rm -f $(STAGING_DIR)/bin/cpp $(STAGING_DIR)/bin/gcov $(STAGING_DIR)/bin/*gccbug
+	rm -rf $(STAGING_DIR)/info $(STAGING_DIR)/man $(STAGING_DIR)/share/doc \
+		$(STAGING_DIR)/share/locale
+	touch $(GCC_BUILD_DIR2)/.fixedup
+
+
+#############################################################
+#
+# STLport -- an alternative C++ library
+#
+#############################################################
+STLPORT_PATCH=$(SOURCE_DIR)/STLport-4.5.3.patch
+$(DL_DIR)/$(STLPORT_SOURCE):
+	$(WGET) -P $(DL_DIR) $(STLPORT_SITE)/$(STLPORT_SOURCE)
+
+$(STLPORT_DIR)/Makefile: $(DL_DIR)/$(STLPORT_SOURCE) $(STLPORT_PATCH)
+	zcat $(DL_DIR)/$(STLPORT_SOURCE) | tar -C $(BUILD_DIR) -xvf - 
+	cat $(STLPORT_PATCH) | patch -d $(STLPORT_DIR) -p1
+
+$(STLPORT_DIR)/lib/libstdc++.a: $(STLPORT_DIR)/Makefile
+	$(MAKE) ARCH=$(ARCH) PREFIX=$(STAGING_DIR) -C $(STLPORT_DIR)
+
+$(STAGING_DIR)/lib/libstdc++.a: $(STLPORT_DIR)/lib/libstdc++.a
+	$(MAKE) ARCH=$(ARCH) PREFIX=$(STAGING_DIR) -C $(STLPORT_DIR) install
+ifneq ($(HAS_MMU),true)
+	rm -f $(STAGING_DIR)/lib/libstdc++*.so*
+endif
+
+stlport: $(STAGING_DIR)/lib/libstdc++.a
+
+stlport-clean:
+	rm -f $(STAGING_DIR)/lib/libstdc++*
+	rm -f $(STAGING_DIR)/include/c++*
+	-$(MAKE) -C $(STLPORT_DIR) clean
+
+stlport-dirclean:
+	rm -f $(STAGING_DIR)/lib/libstdc++*
+	rm -f $(STAGING_DIR)/include/g++-v3*
+	rm -rf $(STLPORT_DIR)
+
+
+
+#############################################################
+#
+# Final cleanups....
+#
+#############################################################
+$(BUILD_DIR)/.shuffled: $(GCC_BUILD_DIR2)/.fixedup
+	mkdir -p $(STAGING_DIR)/usr/bin;
+	(set -e; cd $(STAGING_DIR)/usr/bin; \
+		for i in $(STAGING_DIR)/bin/* ; do \
+		j=`basename $$i`; \
+		k=`basename $$i| sed -e "s,$(ARCH)-uclibc-,,g"`; \
+		ln -fs ../../bin/$$j $$k; \
+	done)
+	(set -e; cd $(STAGING_DIR)/$(GNU_TARGET_NAME)/bin; \
+		for i in $(STAGING_DIR)/bin/* ; do \
+		j=`basename $$i`; \
+		k=`basename $$i| sed -e "s,$(ARCH)-uclibc-,,g"`; \
+		ln -fs ../../bin/$$j $$k; \
+	done)
+	touch $(BUILD_DIR)/.shuffled
+
+$(BUILD_DIR)/.stripped: $(BUILD_DIR)/.shuffled
+	# Strip the host binaries
+	-strip --strip-all -R .note -R .comment $(STAGING_DIR)/bin/*
+	# Strip the target shared libs
+	-$(STRIP) --strip-unneeded -R .note -R .comment $(STAGING_DIR)/lib/*.so*;
+	touch $(BUILD_DIR)/.stripped
+
+gcc_final: uclibc $(GCC_BUILD_DIR2)/.fixedup $(BUILD_DIR)/.stripped $(STLPORT_TARGET)
+
+gcc_final-clean:
+	rm -rf $(GCC_BUILD_DIR2)
+	rm -f $(STAGING_DIR)/bin/$(GNU_TARGET_NAME)*
+
+gcc_final-dirclean:
+	rm -rf $(GCC_BUILD_DIR2)
+
+
+
+#############################################################
+#
+# Packup the toolchain binaries
+#
+#############################################################
+$(ARCH)-uclibc-toolchain.tar.bz2: gcc_final
+	rm -f $(ARCH)-uclibc-toolchain.tar.bz2
+	tar -cf $(ARCH)-uclibc-toolchain.tar $(STAGING_DIR)
+	bzip2 -9 $(ARCH)-uclibc-toolchain.tar
+
+tarball: $(ARCH)-uclibc-toolchain.tar.bz2
+
+endif
+endif
diff --git a/sources/gcc-2.95-mega.patch.bz2 b/sources/gcc-2.95-mega.patch.bz2
new file mode 100644
index 000000000..4dffd849b
--- /dev/null
+++ b/sources/gcc-2.95-mega.patch.bz2
diff --git a/sources/gcc2.95-mega.patch.bz2 b/sources/gcc2.95-mega.patch.bz2
new file mode 100644
index 000000000..4dffd849b
--- /dev/null
+++ b/sources/gcc2.95-mega.patch.bz2