From bfcbebf6b6c5ff701360ca044418cad3f0ac171b Mon Sep 17 00:00:00 2001
From: "Tom G. Christensen" <tgc@jupiterrise.com>
Date: Sun, 24 Nov 2013 00:10:00 +0100
Subject: [PATCH] gcc41: rename and rebuild

This updates the build to use the common gcc build
infrastructure.
Additionally the package is renamed from gcc412 to gcc41
to match tgcwarev2.
---
 gcc41/build.sh                              |  67 +-
 gcc41/meta/ChangeLog                        |   4 +
 gcc41/meta/depend                           |  21 +-
 gcc41/meta/depend.sparc                     |  14 +
 gcc41/meta/pkgdef                           | 686 +++++++++++++++++---
 gcc41/meta/relnotes                         |   4 +-
 gcc41/src/gcc-4.0.4-libjava-testsuite.patch |  15 +
 gcc41/src/gcc-4.1.2-new-gas.patch           |  12 +
 gcc41/src/gcc-4.1.2-new-makeinfo.patch      |  25 +
 9 files changed, 711 insertions(+), 137 deletions(-)
 create mode 100644 gcc41/meta/ChangeLog
 create mode 100644 gcc41/meta/depend.sparc
 create mode 100644 gcc41/src/gcc-4.0.4-libjava-testsuite.patch
 create mode 100644 gcc41/src/gcc-4.1.2-new-gas.patch
 create mode 100644 gcc41/src/gcc-4.1.2-new-makeinfo.patch

diff --git a/gcc41/build.sh b/gcc41/build.sh
index 3268dd5..8f1592f 100755
--- a/gcc41/build.sh
+++ b/gcc41/build.sh
@@ -5,48 +5,40 @@
 #
 ###########################################################
 # Check the following 4 variables before running the script
-snapshot=
 topdir=gcc
 version=4.1.2
-pkgver=1
-source[0]=$topdir-$version.tar.bz2
-[ -n "$snapshot" ] && source[0]=$topdir-$version-$snapshot.tar.bz2
+pkgver=2
+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]=gcc-4.0.4-newer-gas.patch
+patch[0]=gcc-4.1.2-new-makeinfo.patch
+patch[1]=gcc-4.1.2-new-gas.patch
 
 # Source function library
 . ${BUILDPKG_SCRIPTS}/buildpkg.functions
 
+# Common settings for gcc
+. ${BUILDPKG_BASE}/gcc/build.sh.gcc.common
+
 # Global settings
-[ -n "$snapshot" ] && topsrcdir=gcc-$version-$snapshot
-lprefix=$prefix
-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
-configure_args+=(--prefix=$prefix --with-local-prefix=$prefix --with-libiconv-prefix=$lprefix --with-gmp=$lprefix --with-mpfr=$lprefix --disable-nls --enable-shared --enable-threads=posix95)
-configure_args+=(--enable-languages=c,ada,c++,fortran,objc,obj-c++)
-objdir=all_native
-# platform/arch specific options
-[ "$_os" = "sunos56" -a "$arch" = "i386" ] && configure_args+=(--with-gnu-as --with-as=$lprefix/bin/gas)
-[ "$arch" = "sparc" ] && vendor="sun" || vendor="pc"
+# This compiler is bootstrapped with gcc 4.0.4
+export PATH=/usr/tgcware/gcc40/bin:$PATH
 
 reg prep
 prep()
 {
     generic_prep
+    setdir source
+    # Set bugurl and vendor version
+    ${__gsed} -i "s|URL:[^>]*|URL:$gccbugurl|" gcc/version.c
+    ${__gsed} -i "/VERSUFFIX/ s/\"\"/\" ($gccpkgversion)\"/" gcc/version.c
 }
 
 reg build
 build()
 {
-    setdir source
-    ${__mkdir} -p ../$objdir
-    echo "$__configure $configure_args"
+    setup_tools
+    ${__mkdir} -p ${srcdir}/$objdir
     generic_build ../$objdir
 }
 
@@ -55,29 +47,23 @@ install()
 {
     clean stage
     setdir ${srcdir}/${objdir}
-    ${__make} SHELL=/bin/ksh DESTDIR=$stagedir install
+    ${__make} DESTDIR=$stagedir install
     custom_install=1
     generic_install
     ${__find} ${stagedir} -name '*.la' -print | ${__xargs} ${__rm} -f
 
-    # Prepare for split lib packages
-    ${__mkdir} -p ${stagedir}${lprefix}/${_libdir}
-    setdir ${stagedir}${prefix}/${_libdir}
-    ${__tar} -cf - libgcc_s.so.1 libstdc++.so.6* libgfortran.so.1* libobjc.so.1* |
-	(cd ${stagedir}${lprefix}/${_libdir}; ${__tar} -xvBpf -)
+    # Rearrange libraries
+    redo_libs
+
+    # 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
-
-    # Setup compat files
-    for pkg in libgcc_s1 libstdc++6
-    do
-        ${__rm} -f $metadir/compver.$pkg
-        compat $pkg 3.4.6 1 5
-        compat $pkg 4.0.4 1 2
-    done
-    compat libobjc1 4.0.4 1 2
 }
 
 reg check
@@ -91,7 +77,7 @@ check()
 reg pack
 pack()
 {
-    iprefix=$topdir-$version
+    iprefix=${topdir}${abbrev_majorminor}
     generic_pack
 }
 
@@ -100,8 +86,7 @@ distclean()
 {
     META_CLEAN="$META_CLEAN compver.*"
     clean distclean
-    setdir $srcdir
-    ${__rm} -rf $objdir
+    ${__rm} -rf $srcdir/$objdir
 }
 
 ###################################################
diff --git a/gcc41/meta/ChangeLog b/gcc41/meta/ChangeLog
new file mode 100644
index 0000000..12c2f4b
--- /dev/null
+++ b/gcc41/meta/ChangeLog
@@ -0,0 +1,4 @@
+CHANGELOG
+---------
+* Tue Oct 08 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 4.1.2-2
+- Sync with tgcware v2
diff --git a/gcc41/meta/depend b/gcc41/meta/depend
index 54b1848..5b9a560 100644
--- a/gcc41/meta/depend
+++ b/gcc41/meta/depend
@@ -1,6 +1,15 @@
-TGCg412c libgcc_s1 auto
-TGCg412gn gcc auto
-TGCg412cx gcc auto
-TGCg412ob gcc auto
-TGCg412ft gcc auto
-TGCg412ox gcc auto
+TGCg41c TGCbinut auto
+TGCg41c libgcc_s1 auto
+TGCg41cx gcc auto
+TGCg41cx libstdc++6 auto
+TGCg41ft gcc auto
+TGCg41ft libgfortran1 auto
+TGCg41gn gcc auto
+TGCg41gn libgnat41 auto
+TGCg41ob gcc auto
+TGCg41ob libobjc1 auto
+TGClgfrt1 libgcc_s1 auto
+TGClgna41 libgcc_s1 auto
+TGClobjc1 libgcc_s1 auto
+TGClstdc6 libgcc_s1 auto
+TGClssp0 libgcc_s1 auto
diff --git a/gcc41/meta/depend.sparc b/gcc41/meta/depend.sparc
new file mode 100644
index 0000000..22036a7
--- /dev/null
+++ b/gcc41/meta/depend.sparc
@@ -0,0 +1,14 @@
+TGCg41c libgcc_s1 auto
+TGCg41cx gcc auto
+TGCg41cx libstdc++6 auto
+TGCg41ft gcc auto
+TGCg41ft libgfortran1 auto
+TGCg41gn gcc auto
+TGCg41gn libgnat41 auto
+TGCg41ob gcc auto
+TGCg41ob libobjc1 auto
+TGClgfrt1 libgcc_s1 auto
+TGClgna41 libgcc_s1 auto
+TGClobjc1 libgcc_s1 auto
+TGClstdc6 libgcc_s1 auto
+TGClssp0 libgcc_s1 auto
diff --git a/gcc41/meta/pkgdef b/gcc41/meta/pkgdef
index a02629e..f4c1a46 100644
--- a/gcc41/meta/pkgdef
+++ b/gcc41/meta/pkgdef
@@ -1,142 +1,629 @@
 [gcc]
-pkgname="${pkgprefix}g${abbrev_ver}c"
-name="GCC - GNU Compiler Collection"
+pkgname="${pkgprefix}g${abbrev_majorminor}c"
+name="GCC - GNU Compiler Collection (C)"
 pkgvendor="http://gcc.gnu.org"
-pkgdesc="GNU Compiler Collection (C, C++)"
+pkgdesc="GNU Compiler Collection (C)"
 pkgver="$pkgver"
 files(-,root,bin)
-dir $iprefix/share
 $iprefix/$_bindir/*gcc*
 $iprefix/$_bindir/*gcov*
 $iprefix/$_bindir/cpp
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/gcrt*
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/crt*
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/libgcc*
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/libgcov*
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/gmon.o
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/README
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/X11
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/Xm
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/kcms
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/xil
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/curses.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/float.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/iso646.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/limits.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/math.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/memory.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/pthread.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/root
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/stdarg.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/stdbool.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/stddef.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/stdio.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/stdlib.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/sys
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/syslimits.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/unistd.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/unwind.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/varargs.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/alloca.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/ctype.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/gelf.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/kerberos/osconf.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/libelf.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/link.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/locale.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/netinet/if_ether.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/proc_service.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/prof.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/setjmp.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/signal.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/ssp/ssp.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/ssp/stdio.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/ssp/string.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/ssp/unistd.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/string.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/thread.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/thread_db.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/time.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/tzfile.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/widec.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/install-tools
-$iprefix/libexec/gcc/${arch}-${vendor}-solaris*/$version/install-tools
-$iprefix/libexec/gcc/${arch}-${vendor}-solaris*/$version/collect2
-$iprefix/libexec/gcc/${arch}-${vendor}-solaris*/$version/cc1
+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/libssp*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/gmon.o
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libiberty.*
+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/README
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/X11
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/Xm
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/alloca.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/curses.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/ctype.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/gelf.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/kcms
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/kerberos/osconf.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/libelf.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/link.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/locale.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/netinet/if_ether.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/proc_service.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/prof.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/pthread.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/dt/include/Xm/XmosP.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/kcms/kcs.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/DPS/dpsconfig.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/Xfuncs.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/Xlibint.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/Xos.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/X11/Xosdefs.h
+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
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/xil/_XilDefines.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/root/usr/openwin/include/xil/xil.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/setjmp.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/signal.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/string.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/syslimits.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/audio_4231.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/core.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/ddi_impldefs.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/ddidmareq.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/debug.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/elf.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/ethernet.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/exec.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/exechdr.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/fs/hsfs_spec.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/gp1var.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/ieeefp.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/int_const.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/int_fmtio.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/int_limits.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/int_types.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/link.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/msg.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/msreg.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/mutex.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/pctypes.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/proc.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/proc/prdata.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/prsystm.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/rwlock.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/scsi/adapters/glmvar.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/scsi/impl/pkt_wrapper.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/sunddi.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/types.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/user.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/utrap.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/sys/varargs.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/thread.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/thread_db.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/time.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/tzfile.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/unistd.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/widec.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/xil
+# 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
+# ssp includes
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/ssp/ssp.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/ssp/stdio.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/ssp/string.h
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/include/ssp/unistd.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/lib/libiberty.a
-$iprefix/lib/libgcc*
-$iprefix/lib/libssp*
+$iprefix/info/cpp*
 $iprefix/man/?a?1/gcc.1
 $iprefix/man/?a?1/cpp.1
 $iprefix/man/?a?1/gcov.1
 $iprefix/man/?a?7/*.7
-$_sharedir
-# Only on i386
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/*intrin.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mm3dnow.h
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/mm_malloc.h
+$_vdocdir
 
 [gcc-gnat]
-pkgname="${pkgprefix}g${abbrev_ver}gn"
+pkgname="${pkgprefix}g${abbrev_majorminor}gn"
 name="gcc-gnat - GNU Compiler Collection (Ada)"
 pkgvendor="http://gcc.gnu.org"
 pkgdesc="Ada support for GCC"
 pkgver="$pkgver"
 files(-,root,bin)
-$iprefix/bin/gnat*
-$iprefix/bin/gpr*
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/adainclude
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/adalib
-$iprefix/libexec/gcc/${arch}-${vendor}-solaris*/$version/gnat1
+$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/gprmake
+$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*
 
 [gcc-c++]
-pkgname="${pkgprefix}g${abbrev_ver}cx"
+pkgname="${pkgprefix}g${abbrev_majorminor}cx"
 name="gcc-c++ - GNU Compiler Collection (C++)"
 pkgvendor="http://gcc.gnu.org"
 pkgdesc="C++ support for GCC"
 pkgver="$pkgver"
 files(-,root,bin)
 $iprefix/bin/*++*
-$iprefix/include/c++
-$iprefix/lib/libstdc++.*
-$iprefix/lib/libsupc++.a
-$iprefix/libexec/gcc/${arch}-${vendor}-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_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/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/functions.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/macros.h
+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/array_allocator.h
+include/c++/${version}/ext/bitmap_allocator.h
+include/c++/${version}/ext/debug_allocator.h
+include/c++/${version}/ext/codecvt_specializations.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/pb_assoc/assoc_cntnr.hpp
+include/c++/${version}/ext/pb_assoc/data_type.hpp
+include/c++/${version}/ext/pb_assoc/detail/assoc_cntnr_base.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/d_extract_key.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/d_find_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/d_insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/extract_key.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/info_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_assoc_cntnr/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_hash_assoc_cntnr/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_hash_assoc_cntnr/resize_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_tree_assoc_cntnr/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_tree_assoc_cntnr/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_tree_assoc_cntnr/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_tree_assoc_cntnr/node_iteration_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_tree_assoc_cntnr/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_tree_assoc_cntnr/r_erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_tree_assoc_cntnr/r_range_iteration_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_tree_assoc_cntnr/range_iteration_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/basic_tree_assoc_cntnr/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/bin_search_tree_.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/find_iterators.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/node_iterators.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/r_erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/rotate_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/bin_search_tree_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/cc_ht_map_.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/cmp_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/cond_key_dtor_entry_dealtor.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/constructor_destructor_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/debug_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/debug_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/entry_list_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/erase_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/erase_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/find_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/find_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/insert_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/insert_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/resize_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/resize_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/resize_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/size_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/cc_ht_map_/standard_policies.hpp
+include/c++/${version}/ext/pb_assoc/detail/cond_dealtor.hpp
+include/c++/${version}/ext/pb_assoc/detail/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/ds_trait_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/eq_fn/eq_by_less.hpp
+include/c++/${version}/ext/pb_assoc/detail/eq_fn/hash_eq_fn.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_hash_assoc_cntnr/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/constructor_destructor_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/debug_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/debug_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/erase_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/erase_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/find_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/find_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/gp_ht_map_.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/insert_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/insert_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/iterator_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/resize_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/resize_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/gp_ht_map_/resize_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_fn/direct_mask_range_hashing_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_fn/direct_mod_range_hashing_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_fn/linear_probe_fn_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_fn/mask_based_range_hashing.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_fn/mod_based_range_hashing.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_fn/probe_fn_base.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_fn/quadratic_probe_fn_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_fn/ranged_hash_fn.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_fn/ranged_probe_fn.hpp
+include/c++/${version}/ext/pb_assoc/detail/hash_types_traits.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_assoc_cntnr/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_assoc_cntnr/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_map_/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_map_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_map_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_map_/lu_map_.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_map_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_policy/counter_lu_metadata_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_policy/counter_lu_policy_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/lu_policy/mtf_lu_policy_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/map_debug_base.hpp
+include/c++/${version}/ext/pb_assoc/detail/mapping_level_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/ms_category_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/ms_trait_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/order_statistics_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/cond_dtor.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/node_iterators.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/ov_tree_map_.hpp
+include/c++/${version}/ext/pb_assoc/detail/ov_tree_map_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/rb_tree_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/rb_tree_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/rb_tree_map_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/rb_tree_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/rb_tree_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/rb_tree_map_/node.hpp
+include/c++/${version}/ext/pb_assoc/detail/rb_tree_map_/rb_tree_.hpp
+include/c++/${version}/ext/pb_assoc/detail/rb_tree_map_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/resize_policy/cc_hash_max_collision_resize_trigger_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/resize_policy/hash_exponential_size_policy_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/resize_policy/hash_prime_size_policy_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/resize_policy/ht_prime_size_policy_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/resize_policy/size_base.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/node.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/splay_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/splay_tree_.hpp
+include/c++/${version}/ext/pb_assoc/detail/splay_tree_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/standard_policies.hpp
+include/c++/${version}/ext/pb_assoc/detail/standard_sizes.hpp
+include/c++/${version}/ext/pb_assoc/detail/tree_assoc_cntnr/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/tree_policy/null_node_updator_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/tree_policy/order_statistics_imp.hpp
+include/c++/${version}/ext/pb_assoc/detail/type_utils.hpp
+include/c++/${version}/ext/pb_assoc/detail/typelist.hpp
+include/c++/${version}/ext/pb_assoc/detail/typelist/typelist_append.hpp
+include/c++/${version}/ext/pb_assoc/detail/typelist/typelist_apply.hpp
+include/c++/${version}/ext/pb_assoc/detail/typelist/typelist_at_index.hpp
+include/c++/${version}/ext/pb_assoc/detail/typelist/typelist_contains.hpp
+include/c++/${version}/ext/pb_assoc/detail/typelist/typelist_filter.hpp
+include/c++/${version}/ext/pb_assoc/detail/typelist/typelist_transform.hpp
+include/c++/${version}/ext/pb_assoc/detail/typelist/typelist_typelist_append.hpp
+include/c++/${version}/ext/pb_assoc/detail/types_traits.hpp
+include/c++/${version}/ext/pb_assoc/detail/unordered_iterator/const_find_iterator.hpp
+include/c++/${version}/ext/pb_assoc/detail/unordered_iterator/const_iterator.hpp
+include/c++/${version}/ext/pb_assoc/detail/unordered_iterator/find_iterator.hpp
+include/c++/${version}/ext/pb_assoc/detail/unordered_iterator/iterator.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/constructor_destructor_and_related.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/erase_if_pred.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/find_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/info_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/invalidation_guarantee_selector.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/it_value_type_traits.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/iterator.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/iterator_fn_imps.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/ref_pair.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/value_type_adapter.hpp
+include/c++/${version}/ext/pb_assoc/detail/value_type_adapter/value_type_traits.hpp
+include/c++/${version}/ext/pb_assoc/ds_trait.hpp
+include/c++/${version}/ext/pb_assoc/exception.hpp
+include/c++/${version}/ext/pb_assoc/hash_policy.hpp
+include/c++/${version}/ext/pb_assoc/lu_policy.hpp
+include/c++/${version}/ext/pb_assoc/ms_trait.hpp
+include/c++/${version}/ext/pb_assoc/tree_policy.hpp
+include/c++/${version}/ext/pb_assoc/trivial_iterator_def.hpp
+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/rc_string_base.h
+include/c++/${version}/ext/rope
+include/c++/${version}/ext/ropeimpl.h
+include/c++/${version}/ext/slist
+include/c++/${version}/ext/sso_string_base.h
+include/c++/${version}/ext/stdio_filebuf.h
+include/c++/${version}/ext/stdio_sync_filebuf.h
+include/c++/${version}/ext/typelist.h
+include/c++/${version}/ext/vstring.h
+include/c++/${version}/ext/vstring.tcc
+include/c++/${version}/ext/vstring_fwd.h
+include/c++/${version}/ext/vstring_util.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}/tr1/array
+include/c++/${version}/tr1/bind_iterate.h
+include/c++/${version}/tr1/bind_repeat.h
+include/c++/${version}/tr1/boost_shared_ptr.h
+include/c++/${version}/tr1/functional
+include/c++/${version}/tr1/functional_iterate.h
+include/c++/${version}/tr1/hashtable
+include/c++/${version}/tr1/memory
+include/c++/${version}/tr1/mu_iterate.h
+include/c++/${version}/tr1/ref_fwd.h
+include/c++/${version}/tr1/ref_wrap_iterate.h
+include/c++/${version}/tr1/repeat.h
+include/c++/${version}/tr1/tuple
+include/c++/${version}/tr1/tuple_iterate.h
+include/c++/${version}/tr1/type_traits
+include/c++/${version}/tr1/type_traits_fwd.h
+include/c++/${version}/tr1/unordered_map
+include/c++/${version}/tr1/unordered_set
+include/c++/${version}/tr1/utility
+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"
+pkgname="${pkgprefix}g${abbrev_majorminor}ob"
 name="gcc-objc - GNU Compiler Collection (Objective-C)"
 pkgvendor="http://gcc.gnu.org"
 pkgdesc="Objective-C support for GCC"
 pkgver="$pkgver"
 files(-,root,bin)
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/include/objc
-$iprefix/lib/libobjc.*
-$iprefix/libexec/gcc/${arch}-${vendor}-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-objc++]
-pkgname="${pkgprefix}g${abbrev_ver}ox"
+pkgname="${pkgprefix}g${abbrev_majorminor}ox"
 name="gcc-objc++ - GNU Compiler Collection (Objective-C++)"
 pkgvendor="http://gcc.gnu.org"
 pkgdesc="Objective-C++ support for GCC"
 pkgver="$pkgver"
 files(-,root,bin)
-$iprefix/libexec/gcc/${arch}-${vendor}-solaris*/$version/cc1objplus
+libexec/gcc/${arch}-${vendor}-solaris*/$version/cc1objplus
 
 [gcc-gfortran]
-pkgname="${pkgprefix}g${abbrev_ver}ft"
+pkgname="${pkgprefix}g${abbrev_majorminor}ft"
 name="gcc-gfortran - GNU Compiler Collection (Fortran)"
 pkgvendor="http://gcc.gnu.org"
 pkgdesc="Fortran support for GCC"
 pkgver="$pkgver"
 files(-,root,bin)
 $iprefix/bin/*fortran
-$iprefix/lib/libgfortran.*
-$iprefix/lib/libgfortranbegin.a
-$iprefix/libexec/gcc/${arch}-${vendor}-solaris*/$version/f951
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libgfortranbegin.a
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libgfortran.*
+libexec/gcc/${arch}-${vendor}-solaris*/$version/f951
 $iprefix/man/?a?1/gfortran.1
+$iprefix/info/gfortran.info*
 
 [libgcc_s1]
 pkgname="${pkgprefix}lgcc1"
@@ -160,7 +647,7 @@ $_libdir/libstdc++.so.6*
 
 [libobjc1]
 pkgname="${pkgprefix}lobjc1"
-name="libojc1 - GNU Objective-C shared support library"
+name="libobjc1 - GNU Objective-C shared support library"
 pkgcat="system"
 pkgvendor="http://gcc.gnu.org"
 pkgdesc="Runtime support library for Objective-C"
@@ -169,7 +656,7 @@ files(-,root,bin)
 $_libdir/libobjc.so.1*
 
 [libgfortran1]
-pkgname="${pkgprefix}lgft1"
+pkgname="${pkgprefix}lgfrt1"
 name="libgfortran1 - GNU Fortran shared support library"
 pkgcat="system"
 pkgvendor="http://gcc.gnu.org"
@@ -178,3 +665,24 @@ pkgver="$pkgver"
 files(-,root,bin)
 $_libdir/libgfortran.so.1*
 
+[libgnat41]
+pkgname="${pkgprefix}lgna${abbrev_majorminor}"
+name="libgnat${abbrev_majorminor} - GNU Ada shared support library"
+pkgcat="system"
+pkgvendor="http://gcc.gnu.org"
+pkgdesc="Runtime support library for Ada"
+pkgver="$pkgver"
+files(-,root,bin)
+$_libdir/libgnat-${majorminor}.so
+$_libdir/libgnarl-${majorminor}.so
+
+[libssp0]
+pkgname="${pkgprefix}lssp0"
+name="libssp0 - GNU Stack Smashing Protection shared support library"
+pkgcat="system"
+pkgvendor="http://gcc.gnu.org"
+pkgdesc="Runtime support library for Stack Smashing Protection"
+pkgver="$pkgver"
+files(-,root,bin)
+$_libdir/libssp.so.0*
+
diff --git a/gcc41/meta/relnotes b/gcc41/meta/relnotes
index 06fa466..4a1b650 100644
--- a/gcc41/meta/relnotes
+++ b/gcc41/meta/relnotes
@@ -25,4 +25,6 @@ KNOWN DEPENDENCIES
 
 ERRORS/MISCELLANEOUS
 --------------------
-One simple patch applied to fix configure with binutils 2.18.
+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/gcc41/src/gcc-4.0.4-libjava-testsuite.patch b/gcc41/src/gcc-4.0.4-libjava-testsuite.patch
new file mode 100644
index 0000000..69e43b2
--- /dev/null
+++ b/gcc41/src/gcc-4.0.4-libjava-testsuite.patch
@@ -0,0 +1,15 @@
+--- gcc-4.0.4/libjava/testsuite/lib/libjava.exp.orig	2006-04-11 00:01:37.000000000 +0200
++++ gcc-4.0.4/libjava/testsuite/lib/libjava.exp	2013-10-07 18:28:39.308315000 +0200
+@@ -35,6 +35,12 @@
+ 	    set i $j
+ 	}
+     }
++    for {set i [expr {$len - 1}]} {$i >= 0} {incr i -1} {
++	if {[string match "ld: warning: file *libiconv.so: attempted multiple inclusion of file" [lindex $tlist $i]]} {
++	    # Delete line
++	    set tlist [lreplace $tlist $i $i]
++	}
++    }
+     return [join $tlist \n]
+ }
+ 
diff --git a/gcc41/src/gcc-4.1.2-new-gas.patch b/gcc41/src/gcc-4.1.2-new-gas.patch
new file mode 100644
index 0000000..5ca16f7
--- /dev/null
+++ b/gcc41/src/gcc-4.1.2-new-gas.patch
@@ -0,0 +1,12 @@
+diff -up gcc-4.1.2/gcc/configure.orig gcc-4.1.2/gcc/configure
+--- gcc-4.1.2/gcc/configure.orig	2006-11-13 23:09:55.000000000 +0100
++++ gcc-4.1.2/gcc/configure	2012-11-27 14:41:08.040178600 +0100
+@@ -14226,7 +14226,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/gcc41/src/gcc-4.1.2-new-makeinfo.patch b/gcc41/src/gcc-4.1.2-new-makeinfo.patch
new file mode 100644
index 0000000..18ec715
--- /dev/null
+++ b/gcc41/src/gcc-4.1.2-new-makeinfo.patch
@@ -0,0 +1,25 @@
+diff -up gcc-4.1.2/Makefile.in.makeinfo gcc-4.1.2/Makefile.in
+diff -up gcc-4.1.2/gcc/configure.makeinfo gcc-4.1.2/gcc/configure
+--- gcc-4.1.2/gcc/configure.makeinfo	2012-11-27 14:42:57.707666500 +0100
++++ gcc-4.1.2/gcc/configure	2012-11-27 14:43:17.715610000 +0100
+@@ -7495,7 +7495,7 @@ else
+   echo "configure:7495: 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
+diff -up gcc-4.1.2/configure.makeinfo gcc-4.1.2/configure
+--- gcc-4.1.2/configure.makeinfo	2006-11-21 18:48:36.000000000 +0100
++++ gcc-4.1.2/configure	2012-11-27 19:17:38.366113000 +0100
+@@ -3549,7 +3549,7 @@ case " $build_configdirs " in
+     # For an installed makeinfo, we require it to be from texinfo 4.2 or
+     # higher, else we use the "missing" dummy.
+     if ${MAKEINFO} --version \
+-       | egrep 'texinfo[^0-9]*([1-3][0-9]|4\.[2-9]|[5-9])' >/dev/null 2>&1; then
++	| 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
+       :
+     else
+       MAKEINFO="$MISSING makeinfo"