diff --git a/gcc34/build.sh b/gcc34/build.sh
index 67c8a9d..045c11f 100755
--- a/gcc34/build.sh
+++ b/gcc34/build.sh
@@ -7,57 +7,43 @@
 # Check the following 4 variables before running the script
 topdir=gcc
 version=3.4.6
-pkgver=4
-source[0]=$topdir-$version.tar.bz2
+pkgver=5
+source[0]=ftp://ftp.sunet.se/pub/gnu/gcc/releases/$topdir-$version/$topdir-$version.tar.bz2
 ## If there are no patches, simply comment this
-#patch[0]=
+patch[0]=gcc-3.4.6-new-makeinfo.patch
+patch[1]=gcc-3.4.6-new-gas.patch
+patch[2]=gcc-3.4.6-gnat-share-make.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
-# GCC package naming guide
-# gcc - c
-# gcc-c++ - cx
-# gcc-gnat - gn
-# gcc-objc - ob
-# gcc-objc++ - ox
-# gcc-java - jv
+# Common settings for gcc
+. ${BUILDPKG_BASE}/gcc/build.sh.gcc.common
 
 # Global settings
-prefix=/usr/tgcware/$topdir-$version
-__configure="../$topsrcdir/configure"
-make_build_target=bootstrap
 
-# Define abbreviated version number (for pkgdef)
-abbrev_ver=$(echo $version | ${__tr} -d '.')
-
-configure_args=(--prefix=$prefix --with-local-prefix=$prefix --disable-nls --enable-shared)
-configure_args+=(--enable-languages=c,c++,f77,objc,ada)
-objdir=cccgoa_native
-export CC=/export/home/tgc/gnat/bin/gcc
-export GNATROOT=/export/home/tgc/gnat
-export PATH=/export/home/tgc/gnat/bin:$PATH
-
-# Conditionals for pkgdef
-[ -n "$(isainfo | grep sparcv9)" ] && v9libs=1
-[ "$_os" = "sunos56" ] && sol26=1
-[ "$_os" = "sunos57" ] && sol27=1
+# This compiler is bootstrapped with gcc 3.3.6
+export PATH=/usr/tgcware/gcc33/bin:$PATH
 
 reg prep
 prep()
 {
     generic_prep
+    setdir source
+    ${__gsed} -i "s/@@GCCVERSION@@/$version/" gcc/ada/Makefile.in gcc/ada/bld.adb
+    # Set bugurl and vendor version
+    ${__gsed} -i "s|URL:[^>]*|URL:$gccbugurl|" gcc/version.c
+    ${__gsed} -i "s/$version/$version (release)/" gcc/version.c
+    ${__gsed} -i "s/(release)/($gccpkgversion)/" gcc/version.c
 }
 
 reg build
 build()
 {
-    setdir source
-    ${__mkdir} -p ../$objdir
-    echo "$__configure $configure_args"
-    setdir $srcdir/$objdir
-    ${__configure} $configure_args
-    ${__make} $make_build_target
+    setup_tools
+    ${__mkdir} -p ${srcdir}/$objdir
+    generic_build ../$objdir
+    # Build gnat
     setdir ${srcdir}/${objdir}
     ${__make} -C gcc gnatlib
     ${__make} -C gcc gnattools
@@ -73,29 +59,18 @@ install()
     generic_install
     ${__find} ${stagedir} -name '*.la' -print | ${__xargs} ${__rm} -f
 
-    # Prepare for split lib packages
-    lprefix=$topinstalldir
-    ${__mkdir} -p ${stagedir}${lprefix}/${_libdir}
-    setdir ${stagedir}${prefix}/${_libdir}
-    ${__tar} -cf - libgcc_s.so.1 libstdc++.so.6* libg2c.so.0* libobjc.so.1* |
-	(cd ${stagedir}${lprefix}/${_libdir}; ${__tar} -xvBpf -)
+    # Rearrange libraries
+    redo_libs
 
-    if [ "x$v9libs" != "x" ]; then
-	${__mkdir} -p ${stagedir}${lprefix}/${_libdir}/sparcv9
-	setdir ${stagedir}${prefix}/${_libdir}/sparcv9
-	${__tar} -cf - libgcc_s.so.1 libstdc++.so.6* libg2c.so.0* libobjc.so.1* |
-	    (cd ${stagedir}${lprefix}/${_libdir}/sparcv9; ${__tar} -xvBpf -)
-    fi
+    # Remove obsolete gccbug script
+    ${__rm} -f $stagedir$prefix/bin/gccbug
+
+    # Turn all the hardlinks in bin into symlinks
+    redo_bin
 
     # Place share/docs in the regular location
     prefix=$topinstalldir
     doc COPYING* BUGS FAQ MAINTAINERS NEWS
-
-    for pkg in libg2c0 libgcc_s1 libobjc1 libstdc++6
-    do
-	${__rm} -f $metadir/compver.$pkg
-	compat $pkg 3.4.6 1 $pkgver
-    done
 }
 
 reg check
@@ -103,13 +78,17 @@ check()
 {
     setdir source
     setdir ../$objdir
-    ${__make} -k check
+    if [ $multilib -eq 0 ]; then
+	${__make} -k check
+    else
+	${__make} -k RUNTESTFLAGS="--target_board='unix{,$multilib_testopt}'" check
+    fi
 }
 
 reg pack
 pack()
 {
-    iprefix=$topdir-$version
+    iprefix=${topdir}${abbrev_majorminor}
     generic_pack
 }
 
diff --git a/gcc34/meta/ChangeLog b/gcc34/meta/ChangeLog
new file mode 100644
index 0000000..a404238
--- /dev/null
+++ b/gcc34/meta/ChangeLog
@@ -0,0 +1,4 @@
+CHANGELOG
+---------
+* Fri Oct 04 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 3.4.6-5
+- Sync with tgcware v2
diff --git a/gcc34/meta/depend b/gcc34/meta/depend
index d211e8a..f23f06e 100644
--- a/gcc34/meta/depend
+++ b/gcc34/meta/depend
@@ -1,4 +1,12 @@
-TGCg346gn gcc auto
-TGCg346cx gcc auto
-TGCg346ob gcc auto
-TGCg346g7 gcc auto
+TGCg34c TGCbinut auto
+TGCg34c libgcc_s1 auto
+TGCg34cx gcc auto
+TGCg34cx libstdc++6 auto
+TGCg34ob gcc auto
+TGCg34ob libobjc1 auto
+TGCg34ft gcc auto
+TGCg34ft libg2c0 auto
+TGCg34gn gcc auto
+TGClg2c0 libgcc_s1 auto
+TGClobjc1 libgcc_s1 auto
+TGClstdc6 libgcc_s1 auto
diff --git a/gcc34/meta/depend.sparc b/gcc34/meta/depend.sparc
new file mode 100644
index 0000000..df3fac5
--- /dev/null
+++ b/gcc34/meta/depend.sparc
@@ -0,0 +1,11 @@
+TGCg34c libgcc_s1 auto
+TGCg34cx gcc auto
+TGCg34cx libstdc++6 auto
+TGCg34ob gcc auto
+TGCg34ob libobjc1 auto
+TGCg34ft gcc auto
+TGCg34ft libg2c0 auto
+TGCg34gn gcc auto
+TGClg2c0 libgcc_s1 auto
+TGClobjc1 libgcc_s1 auto
+TGClstdc6 libgcc_s1 auto
diff --git a/gcc34/meta/pkgdef b/gcc34/meta/pkgdef
index 337da40..8e9dbba 100644
--- a/gcc34/meta/pkgdef
+++ b/gcc34/meta/pkgdef
@@ -1,239 +1,376 @@
 [gcc]
-pkgname="${pkgprefix}g${abbrev_ver}c"
-name="gcc"
+pkgname="${pkgprefix}g${abbrev_majorminor}c"
+name="GCC - GNU Compiler Collection (C)"
 pkgvendor="http://gcc.gnu.org"
 pkgdesc="GNU Compiler Collection (C)"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $iprefix
-dir $iprefix/bin
-dir $iprefix/lib/gcc/sparc-sun-solaris*/3.4.6/include
-dir $iprefix/lib/gcc/sparc-sun-solaris*/3.4.6
-dir $iprefix/lib/gcc/sparc-sun-solaris*
-dir $iprefix/lib/gcc
-dir $iprefix/lib
-dir $iprefix/man
-dir $iprefix/man/man1
-dir $iprefix/man/man7
-dir $iprefix/info
-dir $iprefix/share
-dir $iprefix/libexec/gcc/sparc-sun-solaris*/$version
-dir $iprefix/libexec/gcc/sparc-sun-solaris*
-dir $iprefix/libexec/gcc
-dir $iprefix/libexec
-$iprefix/bin/*gcc*
-$iprefix/bin/gcov
-$iprefix/bin/cpp
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/gcrt*
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/crt*
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/libgcc*
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/libgcov*
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/specs
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/gmon.o
-if(v9libs)$iprefix/lib/gcc/sparc-sun-solaris*/$version/sparcv9/gcrt*
-if(v9libs)$iprefix/lib/gcc/sparc-sun-solaris*/$version/sparcv9/crt*
-if(v9libs)$iprefix/lib/gcc/sparc-sun-solaris*/$version/sparcv9/gmon.o
-if(v9libs)$iprefix/lib/gcc/sparc-sun-solaris*/$version/sparcv9/libgcc*
-if(v9libs)$iprefix/lib/gcc/sparc-sun-solaris*/$version/sparcv9/libgcov*
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/README
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/X11
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/curses.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/float.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/floatingpoint.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/g2c.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/iso646.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/limits.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/math.h
-if(sol26)$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/memory.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/pthread.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/root
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/rpc
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/stdarg.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/stdbool.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/stddef.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/stdio.h
-if(sol27)$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/stdio_tag.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/stdlib.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/sys
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/syslimits.h
-if(sol26)$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/unistd.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/unwind.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/varargs.h
-if(sol27)$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/wchar.h
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/install-tools
-$iprefix/libexec/gcc/sparc-sun-solaris*/$version/install-tools
-$iprefix/libexec/gcc/sparc-sun-solaris*/$version/collect2
-$iprefix/libexec/gcc/sparc-sun-solaris*/$version/cc1
-$iprefix/info/gcc*
+$iprefix/$_bindir/*gcc*
+$iprefix/$_bindir/*gcov*
+$iprefix/$_bindir/cpp
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/gcrt*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/crt*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libgcc*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libgcov*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/gmon.o
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libiberty.*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/specs
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/install-tools
+# "fixed" includes produced during build
+# This list will vary as it depends on the buildhost
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/curses.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/floatingpoint.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/math.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/memory.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/pthread.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/rpc/auth.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/rpc/clnt.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/rpc/svc.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/rpc/xdr.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stdio.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stdlib.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/syslimits.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/gp1var.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/msreg.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/types.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/signal.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/socket.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/varargs.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/unistd.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/README
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/X11
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/dni.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/nmdefs.h
+# real gcc includes
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/float.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/iso646.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/limits.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stdarg.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stdbool.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/stddef.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/unwind.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/varargs.h
+libexec/gcc/${arch}-${vendor}-solaris*/$version/cc1
+libexec/gcc/${arch}-${vendor}-solaris*/$version/collect2
+libexec/gcc/${arch}-${vendor}-solaris*/$version/install-tools
 $iprefix/info/dir
+$iprefix/info/gcc*
 $iprefix/info/cpp*
-$iprefix/lib/libiberty.a
-$iprefix/lib/libgcc*
-if(v9libs)$iprefix/lib/sparcv9/libiberty.a
-if(v9libs)$iprefix/lib/sparcv9/libgcc*
 $iprefix/man/?a?1/gcc.1
 $iprefix/man/?a?1/cpp.1
 $iprefix/man/?a?1/gcov.1
 $iprefix/man/?a?7/*.7
-$_sharedir
+$_vdocdir
 
 [gcc-gnat]
-pkgname="${pkgprefix}g${abbrev_ver}gn"
-name="gcc-gnat"
+pkgname="${pkgprefix}g${abbrev_majorminor}gn"
+name="gcc-gnat - GNU Compiler Collection (Ada)"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GNU Compiler Collection (Ada)"
+pkgdesc="Ada support for GCC"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $iprefix
-dir $iprefix/bin
-dir $iprefix/lib/gcc/sparc-sun-solaris*/$version/adainclude
-dir $iprefix/lib/gcc/sparc-sun-solaris*/$version/adalib
-dir $iprefix/lib/gcc/sparc-sun-solaris*/$version
-dir $iprefix/lib/gcc/sparc-sun-solaris*
-dir $iprefix/lib/gcc
-dir $iprefix/lib
-dir $iprefix/libexec/gcc/sparc-sun-solaris*/3.4.6
-dir $iprefix/libexec/gcc/sparc-sun-solaris*
-dir $iprefix/libexec/gcc
-dir $iprefix/libexec
-dir $iprefix/man/man1
-dir $iprefix/share/gnat
-dir $iprefix/share
-$iprefix/bin/gnat*
-$iprefix/bin/gpr*
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/adainclude
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/adalib
-$iprefix/libexec/gcc/sparc-sun-solaris*/$version/gnat1
-$iprefix/share/gnat/Makefile.*
+$iprefix/bin/gnat
+$iprefix/bin/gnatbind
+$iprefix/bin/gnatbl
+$iprefix/bin/gnatchop
+$iprefix/bin/gnatclean
+$iprefix/bin/gnatfind
+$iprefix/bin/gnatkr
+$iprefix/bin/gnatlink
+$iprefix/bin/gnatls
+$iprefix/bin/gnatmake
+$iprefix/bin/gnatname
+$iprefix/bin/gnatprep
+$iprefix/bin/gnatxref
+$iprefix/bin/gpr2make
+$iprefix/bin/gprcmd
+$iprefix/lib/$libsubdir/${arch}-${vendor}-solaris*/$version/adainclude
+$iprefix/lib/$libsubdir/${arch}-${vendor}-solaris*/$version/adalib
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/adainclude
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/adalib
+libexec/gcc/${arch}-${vendor}-solaris*/$version/gnat1
+$iprefix/info/gnat*
+share/gnat/${version}/Makefile.*
 
 [gcc-c++]
-pkgname="${pkgprefix}g${abbrev_ver}cx"
-name="gcc-c++"
+pkgname="${pkgprefix}g${abbrev_majorminor}cx"
+name="gcc-c++ - GNU Compiler Collection (C++)"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GNU Compiler Collection (C++)"
+pkgdesc="C++ support for GCC"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $iprefix
-dir $iprefix/bin
-dir $iprefix/include
-dir $iprefix/lib
-dir $iprefix/libexec/gcc/sparc-sun-solaris*/3.4.6
-dir $iprefix/libexec/gcc/sparc-sun-solaris*
-dir $iprefix/libexec/gcc
-dir $iprefix/libexec
-dir $iprefix/man/man1
-dir $iprefix/man
 $iprefix/bin/*++*
-$iprefix/include/c++
-$iprefix/lib/libstdc++.*
-$iprefix/lib/libsupc++.a
-if(v9libs)$iprefix/lib/sparcv9/libstdc++.*
-if(v9libs)$iprefix/lib/sparcv9/libsupc++.*
-$iprefix/libexec/gcc/sparc-sun-solaris*/$version/cc1plus
+include/c++/${version}/algorithm
+include/c++/${version}/backward/algobase.h
+include/c++/${version}/backward/algo.h
+include/c++/${version}/backward/alloc.h
+include/c++/${version}/backward/backward_warning.h
+include/c++/${version}/backward/bvector.h
+include/c++/${version}/backward/complex.h
+include/c++/${version}/backward/defalloc.h
+include/c++/${version}/backward/deque.h
+include/c++/${version}/backward/fstream.h
+include/c++/${version}/backward/function.h
+include/c++/${version}/backward/hash_map.h
+include/c++/${version}/backward/hash_set.h
+include/c++/${version}/backward/hashtable.h
+include/c++/${version}/backward/heap.h
+include/c++/${version}/backward/iomanip.h
+include/c++/${version}/backward/iostream.h
+include/c++/${version}/backward/istream.h
+include/c++/${version}/backward/iterator.h
+include/c++/${version}/backward/list.h
+include/c++/${version}/backward/map.h
+include/c++/${version}/backward/multimap.h
+include/c++/${version}/backward/multiset.h
+include/c++/${version}/backward/new.h
+include/c++/${version}/backward/ostream.h
+include/c++/${version}/backward/pair.h
+include/c++/${version}/backward/queue.h
+include/c++/${version}/backward/rope.h
+include/c++/${version}/backward/set.h
+include/c++/${version}/backward/slist.h
+include/c++/${version}/backward/stack.h
+include/c++/${version}/backward/streambuf.h
+include/c++/${version}/backward/stream.h
+include/c++/${version}/backward/strstream
+include/c++/${version}/backward/tempbuf.h
+include/c++/${version}/backward/tree.h
+include/c++/${version}/backward/vector.h
+include/c++/${version}/bits/allocator.h
+include/c++/${version}/bits/atomicity.h
+include/c++/${version}/bits/basic_ios.h
+include/c++/${version}/bits/basic_ios.tcc
+include/c++/${version}/bits/basic_string.h
+include/c++/${version}/bits/basic_string.tcc
+include/c++/${version}/bits/boost_concept_check.h
+include/c++/${version}/bits/char_traits.h
+include/c++/${version}/bits/cmath.tcc
+include/c++/${version}/bits/codecvt.h
+include/c++/${version}/bits/concept_check.h
+include/c++/${version}/bits/concurrence.h
+include/c++/${version}/bits/cpp_type_traits.h
+include/c++/${version}/bits/deque.tcc
+include/c++/${version}/bits/list.tcc
+include/c++/${version}/bits/locale_classes.h
+include/c++/${version}/bits/vector.tcc
+include/c++/${version}/bitset
+include/c++/${version}/bits/fstream.tcc
+include/c++/${version}/bits/functexcept.h
+include/c++/${version}/bits/gslice_array.h
+include/c++/${version}/bits/gslice.h
+include/c++/${version}/bits/indirect_array.h
+include/c++/${version}/bits/ios_base.h
+include/c++/${version}/bits/istream.tcc
+include/c++/${version}/bits/locale_facets.h
+include/c++/${version}/bits/locale_facets.tcc
+include/c++/${version}/bits/localefwd.h
+include/c++/${version}/bits/mask_array.h
+include/c++/${version}/bits/ostream.tcc
+include/c++/${version}/bits/postypes.h
+include/c++/${version}/bits/slice_array.h
+include/c++/${version}/bits/sstream.tcc
+include/c++/${version}/bits/stl_algobase.h
+include/c++/${version}/bits/stl_algo.h
+include/c++/${version}/bits/stl_bvector.h
+include/c++/${version}/bits/stl_construct.h
+include/c++/${version}/bits/stl_deque.h
+include/c++/${version}/bits/stl_function.h
+include/c++/${version}/bits/stl_heap.h
+include/c++/${version}/bits/stl_iterator_base_funcs.h
+include/c++/${version}/bits/stl_iterator_base_types.h
+include/c++/${version}/bits/stl_iterator.h
+include/c++/${version}/bits/stl_list.h
+include/c++/${version}/bits/stl_map.h
+include/c++/${version}/bits/stl_multimap.h
+include/c++/${version}/bits/stl_multiset.h
+include/c++/${version}/bits/stl_numeric.h
+include/c++/${version}/bits/stl_pair.h
+include/c++/${version}/bits/stl_queue.h
+include/c++/${version}/bits/stl_raw_storage_iter.h
+include/c++/${version}/bits/stl_relops.h
+include/c++/${version}/bits/stl_set.h
+include/c++/${version}/bits/stl_stack.h
+include/c++/${version}/bits/stl_tempbuf.h
+include/c++/${version}/bits/stl_threads.h
+include/c++/${version}/bits/stl_tree.h
+include/c++/${version}/bits/stl_uninitialized.h
+include/c++/${version}/bits/stl_vector.h
+include/c++/${version}/bits/stream_iterator.h
+include/c++/${version}/bits/streambuf_iterator.h
+include/c++/${version}/bits/streambuf.tcc
+include/c++/${version}/bits/stringfwd.h
+include/c++/${version}/bits/type_traits.h
+include/c++/${version}/bits/valarray_after.h
+include/c++/${version}/bits/valarray_array.h
+include/c++/${version}/bits/valarray_array.tcc
+include/c++/${version}/bits/valarray_before.h
+include/c++/${version}/cassert
+include/c++/${version}/cctype
+include/c++/${version}/cerrno
+include/c++/${version}/cfloat
+include/c++/${version}/ciso646
+include/c++/${version}/climits
+include/c++/${version}/clocale
+include/c++/${version}/cmath
+include/c++/${version}/complex
+include/c++/${version}/csetjmp
+include/c++/${version}/csignal
+include/c++/${version}/cstdarg
+include/c++/${version}/cstddef
+include/c++/${version}/cstdio
+include/c++/${version}/cstdlib
+include/c++/${version}/cstring
+include/c++/${version}/ctime
+include/c++/${version}/cwchar
+include/c++/${version}/cwctype
+include/c++/${version}/cxxabi.h
+include/c++/${version}/debug/bitset
+include/c++/${version}/debug/deque
+include/c++/${version}/debug/debug.h
+include/c++/${version}/debug/formatter.h
+include/c++/${version}/debug/hash_map
+include/c++/${version}/debug/hash_map.h
+include/c++/${version}/debug/hash_multimap.h
+include/c++/${version}/debug/hash_multiset.h
+include/c++/${version}/debug/hash_set
+include/c++/${version}/debug/hash_set.h
+include/c++/${version}/debug/list
+include/c++/${version}/debug/map
+include/c++/${version}/debug/map.h
+include/c++/${version}/debug/multimap.h
+include/c++/${version}/debug/multiset.h
+include/c++/${version}/debug/safe_base.h
+include/c++/${version}/debug/safe_iterator.h
+include/c++/${version}/debug/safe_iterator.tcc
+include/c++/${version}/debug/safe_sequence.h
+include/c++/${version}/debug/set
+include/c++/${version}/debug/set.h
+include/c++/${version}/debug/string
+include/c++/${version}/debug/vector
+include/c++/${version}/deque
+include/c++/${version}/exception
+include/c++/${version}/exception_defines.h
+include/c++/${version}/ext/algorithm
+include/c++/${version}/ext/bitmap_allocator.h
+include/c++/${version}/ext/debug_allocator.h
+include/c++/${version}/ext/enc_filebuf.h
+include/c++/${version}/ext/functional
+include/c++/${version}/ext/hash_fun.h
+include/c++/${version}/ext/hash_map
+include/c++/${version}/ext/hash_set
+include/c++/${version}/ext/hashtable.h
+include/c++/${version}/ext/iterator
+include/c++/${version}/ext/malloc_allocator.h
+include/c++/${version}/ext/memory
+include/c++/${version}/ext/mt_allocator.h
+include/c++/${version}/ext/new_allocator.h
+include/c++/${version}/ext/numeric
+include/c++/${version}/ext/pod_char_traits.h
+include/c++/${version}/ext/pool_allocator.h
+include/c++/${version}/ext/rb_tree
+include/c++/${version}/ext/rope
+include/c++/${version}/ext/ropeimpl.h
+include/c++/${version}/ext/slist
+include/c++/${version}/ext/stdio_filebuf.h
+include/c++/${version}/ext/stdio_sync_filebuf.h
+include/c++/${version}/fstream
+include/c++/${version}/functional
+include/c++/${version}/iomanip
+include/c++/${version}/ios
+include/c++/${version}/iosfwd
+include/c++/${version}/iostream
+include/c++/${version}/istream
+include/c++/${version}/iterator
+include/c++/${version}/limits
+include/c++/${version}/list
+include/c++/${version}/locale
+include/c++/${version}/map
+include/c++/${version}/memory
+include/c++/${version}/new
+include/c++/${version}/numeric
+include/c++/${version}/ostream
+include/c++/${version}/queue
+include/c++/${version}/set
+include/c++/${version}/sstream
+include/c++/${version}/stack
+include/c++/${version}/stdexcept
+include/c++/${version}/streambuf
+include/c++/${version}/string
+include/c++/${version}/typeinfo
+include/c++/${version}/utility
+include/c++/${version}/valarray
+include/c++/${version}/vector
+include/c++/${version}/${arch}-${vendor}-solaris*/bits
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libstdc++.*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libsupc++.*
+libexec/gcc/${arch}-${vendor}-solaris*/$version/cc1plus
 $iprefix/man/man1/g++.1
 
 [gcc-objc]
-pkgname="${pkgprefix}g${abbrev_ver}ob"
-name="gcc-objc"
+pkgname="${pkgprefix}g${abbrev_majorminor}ob"
+name="gcc-objc - GNU Compiler Collection (Objective-C)"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GNU Compiler Collection (Objective-C)"
+pkgdesc="Objective-C support for GCC"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $iprefix
-dir $iprefix/lib
-dir $iprefix/lib/gcc/sparc-sun-solaris*/$version/include/objc
-dir $iprefix/lib/gcc/sparc-sun-solaris*/$version/include
-dir $iprefix/lib/gcc/sparc-sun-solaris*/$version
-dir $iprefix/lib/gcc/sparc-sun-solaris*
-dir $iprefix/lib/gcc
-dir $iprefix/lib
-dir $iprefix/libexec/gcc/sparc-sun-solaris*/$version
-dir $iprefix/libexec/gcc/sparc-sun-solaris*
-dir $iprefix/libexec/gcc
-dir $iprefix/libexec
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/objc
-$iprefix/lib/libobjc.*
-if(v9libs)$iprefix/lib/sparcv9/libobjc.*
-$iprefix/libexec/gcc/sparc-sun-solaris*/$version/cc1obj
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/objc
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libobjc.*
+libexec/gcc/${arch}-${vendor}-solaris*/$version/cc1obj
 
 [gcc-g77]
-pkgname="${pkgprefix}g${abbrev_ver}g7"
-name="gcc-g77"
+pkgname="${pkgprefix}g${abbrev_majorminor}ft"
+name="gcc-g77 - GNU Compiler Collection (Fortran)"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GNU Compiler Collection (Fortran 77)"
+pkgdesc="Fortran support for GCC"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $iprefix
-dir $iprefix/bin
-dir $iprefix/lib
-dir $iprefix/lib/gcc/sparc-sun-solaris*/$version/include
-dir $iprefix/lib/gcc/sparc-sun-solaris*/$version
-dir $iprefix/lib/gcc/sparc-sun-solaris*
-dir $iprefix/lib/gcc
-dir $iprefix/lib
-dir $iprefix/libexec/gcc/sparc-sun-solaris*/$version
-dir $iprefix/libexec/gcc/sparc-sun-solaris*
-dir $iprefix/libexec/gcc
-dir $iprefix/libexec
-dir $iprefix/share
-dir $iprefix/info
-dir $iprefix/man
-dir $iprefix/man/man1
 $iprefix/bin/?77
-$iprefix/lib/gcc/sparc-sun-solaris*/$version/include/g2c.h
-$iprefix/lib/libfrtbegin.a
-$iprefix/lib/libg2c.*
-if(v9libs)$iprefix/lib/sparcv9/libfrtbegin.a
-if(v9libs)$iprefix/lib/sparcv9/libg2c.*
-$iprefix/libexec/gcc/sparc-sun-solaris*/$version/f771
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/g2c.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libfrtbegin.a
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libg2c.*
+libexec/gcc/${arch}-${vendor}-solaris*/$version/f771
 $iprefix/man/?a?1/g77.1
 $iprefix/info/g77.info*
 
 [libgcc_s1]
 pkgname="${pkgprefix}lgcc1"
-name="libgcc_s1"
+name="libgcc_s1 - GCC shared support library"
 pkgcat="system"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GCC shared support library"
+pkgdesc="Runtime support library for C"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $_libdir
 $_libdir/libgcc_s.so.1*
-if(v9libs)$_libdir/sparcv9/libgcc_s.so.1*
 
 [libstdc++6]
 pkgname="${pkgprefix}lstdc6"
-name="libstdc++6"
+name="libstdc++6 - GNU Standard C++ library"
 pkgcat="system"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GNU Standard C++ Library"
+pkgdesc="Runtime support library for C++"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $_libdir
 $_libdir/libstdc++.so.6*
-if(v9libs)$_libdir/sparcv9/libstdc++.so.6*
 
 [libobjc1]
 pkgname="${pkgprefix}lobjc1"
-name="libobjc1"
+name="libobjc1 - GNU Objective-C shared support library"
 pkgcat="system"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GNU Objective-C shared support library"
+pkgdesc="Runtime support library for Objective-C"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $_libdir
 $_libdir/libobjc.so.1*
-if(v9libs)$_libdir/sparcv9/libobjc.so.1*
 
 [libg2c0]
 pkgname="${pkgprefix}lg2c0"
-name="libg2c0"
+name="libg2c0 - GNU Fortran shared support library"
 pkgcat="system"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GNU g77 shared support library"
+pkgdesc="Runtime support library for Fortran"
 pkgver="$pkgver"
 files(-,root,bin)
 dir $_libdir
 $_libdir/libg2c.so.0*
-if(v9libs)$_libdir/sparcv9/libg2c.so.0*
 
diff --git a/gcc34/meta/relnotes b/gcc34/meta/relnotes
index bd83629..4a1b650 100644
--- a/gcc34/meta/relnotes
+++ b/gcc34/meta/relnotes
@@ -25,3 +25,6 @@ KNOWN DEPENDENCIES
 
 ERRORS/MISCELLANEOUS
 --------------------
+After installation the fixed-includes should be regenerated.
+Go to /usr/tgcware/libexec/gcc/<platform>/<version>/install-tools and run
+the mkheaders program.
diff --git a/gcc34/src/gcc-3.4.6-gnat-share-make.patch b/gcc34/src/gcc-3.4.6-gnat-share-make.patch
new file mode 100644
index 0000000..74a1a48
--- /dev/null
+++ b/gcc34/src/gcc-3.4.6-gnat-share-make.patch
@@ -0,0 +1,24 @@
+diff -up gcc-3.4.6/gcc/ada/Makefile.in.gpr gcc-3.4.6/gcc/ada/Makefile.in
+--- gcc-3.4.6/gcc/ada/Makefile.in.gpr	2004-01-26 22:57:33.000000000 +0100
++++ gcc-3.4.6/gcc/ada/Makefile.in	2012-11-16 20:36:24.625050300 +0100
+@@ -2021,7 +2021,7 @@ b_gnatm.o : b_gnatm.c
+ 
+ ADA_INCLUDE_DIR = $(libsubdir)/adainclude
+ ADA_RTL_OBJ_DIR = $(libsubdir)/adalib
+-ADA_SHARE_MAKE_DIR = $(prefix)/share/gnat
++ADA_SHARE_MAKE_DIR = $(prefix)/share/gnat/@@GCCVERSION@@
+ 
+ # force no sibling call optimization on s-traceb.o so the number of stack
+ # frames to be skipped when computing a call chain is not modified by
+diff -up gcc-3.4.6/gcc/ada/bld.adb.gpr gcc-3.4.6/gcc/ada/bld.adb
+--- gcc-3.4.6/gcc/ada/bld.adb.gpr	2004-01-12 12:36:13.000000000 +0100
++++ gcc-3.4.6/gcc/ada/bld.adb	2012-11-16 20:35:48.956716400 +0100
+@@ -2628,6 +2628,8 @@ package body Bld is
+                Put_Directory_Separator;
+                Put ("gnat");
+                Put_Directory_Separator;
++               Put ("@@GCCVERSION@@");
++               Put_Directory_Separator;
+                Put ("Makefile.prolog");
+                New_Line;
+ 
diff --git a/gcc34/src/gcc-3.4.6-new-gas.patch b/gcc34/src/gcc-3.4.6-new-gas.patch
new file mode 100644
index 0000000..b091636
--- /dev/null
+++ b/gcc34/src/gcc-3.4.6-new-gas.patch
@@ -0,0 +1,12 @@
+diff -up gcc-3.4.6/gcc/configure.newgas gcc-3.4.6/gcc/configure
+--- gcc-3.4.6/gcc/configure.newgas	2005-06-01 18:32:31.000000000 +0200
++++ gcc-3.4.6/gcc/configure	2012-09-09 12:05:30.363537700 +0200
+@@ -10577,7 +10577,7 @@ L2:' > conftest.s
+   # arbitrary sections are supported and try the test.
+   as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
+   if echo "$as_ver" | grep GNU > /dev/null; then
+-    as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'`
++    as_ver=`echo $as_ver | sed -e 's/GNU assembler.* \([0-9.][0-9.]*\).*/\1/'`
+     as_major=`echo $as_ver | sed 's/\..*//'`
+     as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
+     if test $as_major -eq 2 && test $as_minor -lt 11
diff --git a/gcc34/src/gcc-3.4.6-new-makeinfo.patch b/gcc34/src/gcc-3.4.6-new-makeinfo.patch
new file mode 100644
index 0000000..e747771
--- /dev/null
+++ b/gcc34/src/gcc-3.4.6-new-makeinfo.patch
@@ -0,0 +1,24 @@
+diff -up gcc-3.4.6/Makefile.in.makeinfo gcc-3.4.6/Makefile.in
+--- gcc-3.4.6/Makefile.in.makeinfo	2004-09-24 02:43:53.000000000 +0200
++++ gcc-3.4.6/Makefile.in	2012-11-26 16:33:40.887886300 +0100
+@@ -186,7 +186,7 @@ MAKEINFO=@MAKEINFO@
+ USUAL_MAKEINFO = `if [ -f $$r/texinfo/makeinfo/makeinfo ] ; \
+ 	then echo $$r/texinfo/makeinfo/makeinfo ; \
+ 	else if (makeinfo --version \
+-	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])') >/dev/null 2>&1; \
++	  | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[7-9]*|4\.[1-9][0-9]*|[1-9][0-9]*)') >/dev/null 2>&1; \
+         then echo makeinfo; else echo $$s/missing makeinfo; fi; fi`
+ 
+ # This just becomes part of the MAKEINFO definition passed down to
+diff -up gcc-3.4.6/gcc/configure.makeinfo gcc-3.4.6/gcc/configure
+--- gcc-3.4.6/gcc/configure.makeinfo	2012-11-26 16:33:19.666187200 +0100
++++ gcc-3.4.6/gcc/configure	2012-11-26 16:33:40.913588700 +0100
+@@ -5232,7 +5232,7 @@ else
+   echo "configure:5232: version of makeinfo is $ac_prog_version" >&5
+   case $ac_prog_version in
+     '')     gcc_cv_prog_makeinfo_modern=no;;
+-    4.[2-9]*)
++    4.[7-9]*|4.[1-9][0-9]*|[5-9]*|[1-9][0-9]*)
+             gcc_cv_prog_makeinfo_modern=yes;;
+     *)      gcc_cv_prog_makeinfo_modern=no;;
+   esac