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

This updates the build to use the common gcc build
infrastructure.
Additionally the package is renamed from gcc424 to gcc42
to match tgcwarev2.
---
 gcc42/build.sh                    |  63 +--
 gcc42/meta/ChangeLog              |   4 +
 gcc42/meta/depend                 |  24 +-
 gcc42/meta/depend.sparc           |  17 +
 gcc42/meta/pkgdef                 | 798 ++++++++++++++++++++++++++----
 gcc42/meta/relnotes               |   3 +
 gcc42/src/gcc-4.2.4-new-gas.patch |  12 +
 7 files changed, 777 insertions(+), 144 deletions(-)
 create mode 100644 gcc42/meta/ChangeLog
 create mode 100644 gcc42/meta/depend.sparc
 create mode 100644 gcc42/src/gcc-4.2.4-new-gas.patch

diff --git a/gcc42/build.sh b/gcc42/build.sh
index 0766077..6eb27ba 100755
--- a/gcc42/build.sh
+++ b/gcc42/build.sh
@@ -5,50 +5,39 @@
 #
 ###########################################################
 # Check the following 4 variables before running the script
-snapshot=
 topdir=gcc
 version=4.2.4
-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]=
+patch[0]=gcc-4.2.4-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"
-
-export CONFIG_SHELL=/bin/ksh
+# This compiler is bootstrapped with gcc 4.1.2
+export PATH=/usr/tgcware/gcc41/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
 }
 
@@ -62,27 +51,15 @@ install()
     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.2* libobjc.so.2* libgomp.so.1* |
-	(cd ${stagedir}${lprefix}/${_libdir}; ${__tar} -xvBpf -)
+    # Rearrange libraries
+    redo_libs
+
+    # 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
-        compat $pkg 4.1.2 1 2
-        compat $pkg 4.2.3 1 2
-    done
-    compat libobjc2 4.2.3 1 2
-    compat libgfortran2 4.2.3 1 2
 }
 
 reg check
@@ -96,7 +73,7 @@ check()
 reg pack
 pack()
 {
-    iprefix=$topdir-$version
+    iprefix=${topdir}${abbrev_majorminor}
     generic_pack
 }
 
diff --git a/gcc42/meta/ChangeLog b/gcc42/meta/ChangeLog
new file mode 100644
index 0000000..c6d033b
--- /dev/null
+++ b/gcc42/meta/ChangeLog
@@ -0,0 +1,4 @@
+CHANGELOG
+---------
+* Sat Oct 12 2013 Tom G. Christensen <swpkg@jupiterrise.com> - 4.2.4-2
+- Sync with tgcware v2
diff --git a/gcc42/meta/depend b/gcc42/meta/depend
index 98ece9b..c2ee1b6 100644
--- a/gcc42/meta/depend
+++ b/gcc42/meta/depend
@@ -1,6 +1,18 @@
-TGCg424c libgcc_s1 auto
-TGCg424gn gcc auto
-TGCg424cx gcc auto
-TGCg424ob gcc auto
-TGCg424ft gcc auto
-TGCg424ox gcc auto
+TGCg42c TGCbinut auto
+TGCg42c libgcc_s1 auto
+TGCg42c libgomp1 auto
+TGCg42cx gcc auto
+TGCg42cx libstdc++6 auto
+TGCg42ft gcc auto
+TGCg42ft libgfortran2 auto
+TGCg42gn gcc auto
+TGCg42gn libgnat42 auto
+TGCg42ob gcc auto
+TGCg42ob libobjc2 auto
+TGCg42ox gcc auto
+TGClgfrt2 libgcc_s1 auto
+TGClgna42 libgcc_s1 auto
+TGClgomp1 libgcc_s1 auto
+TGClobjc2 libgcc_s1 auto
+TGClssp0 libgcc_s1 auto
+TGClstdc6 libgcc_s1 auto
diff --git a/gcc42/meta/depend.sparc b/gcc42/meta/depend.sparc
new file mode 100644
index 0000000..b8f34e0
--- /dev/null
+++ b/gcc42/meta/depend.sparc
@@ -0,0 +1,17 @@
+TGCg42c libgcc_s1 auto
+TGCg42c libgomp1 auto
+TGCg42cx gcc auto
+TGCg42cx libstdc++6 auto
+TGCg42ft gcc auto
+TGCg42ft libgfortran2 auto
+TGCg42gn gcc auto
+TGCg42gn libgnat42 auto
+TGCg42ob gcc auto
+TGCg42ob libobjc2 auto
+TGCg42ox gcc auto
+TGClgfrt2 libgcc_s1 auto
+TGClgna42 libgcc_s1 auto
+TGClgomp1 libgcc_s1 auto
+TGClobjc2 libgcc_s1 auto
+TGClssp0 libgcc_s1 auto
+TGClstdc6 libgcc_s1 auto
diff --git a/gcc42/meta/pkgdef b/gcc42/meta/pkgdef
index 7542351..82c256f 100644
--- a/gcc42/meta/pkgdef
+++ b/gcc42/meta/pkgdef
@@ -1,148 +1,735 @@
 [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/decfloat.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/omp.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/gmon.o
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libgcc*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libgcov*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libgomp*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libiberty.*
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/libssp*
+# "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/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/decfloat.h
+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/omp.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
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/install-tools
+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/info/libgomp.info
-$iprefix/lib/libiberty.a
-$iprefix/lib/libgcc*
-$iprefix/lib/libgomp*
-$iprefix/lib/libssp*
+$iprefix/info/libgomp*
 $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/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/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/ostream_insert.h
+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/atomicity.h
+include/c++/${version}/ext/bitmap_allocator.h
+include/c++/${version}/ext/debug_allocator.h
+include/c++/${version}/ext/concurrence.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/numeric_traits.h
+include/c++/${version}/ext/pb_ds/assoc_container.hpp
+include/c++/${version}/ext/pb_ds/detail/basic_tree_policy/basic_tree_policy_base.hpp
+include/c++/${version}/ext/pb_ds/detail/basic_tree_policy/null_node_metadata.hpp
+include/c++/${version}/ext/pb_ds/detail/basic_tree_policy/traits.hpp
+include/c++/${version}/ext/pb_ds/detail/basic_types.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/bin_search_tree_.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/cond_dtor_entry_dealtor.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/cond_key_dtor_entry_dealtor.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/node_iterators.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/point_iterators.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/r_erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/rotate_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/bin_search_tree_/traits.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/binary_heap_.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/const_iterator.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/const_point_iterator.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/entry_cmp.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/entry_pred.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/resize_policy.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binary_heap_/trace_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_/binomial_heap_.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_base_/binomial_heap_base_.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_base_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_base_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_base_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_base_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_base_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/binomial_heap_base_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/cc_ht_map_.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/cmp_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/cond_key_dtor_entry_dealtor.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/debug_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/entry_list_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/erase_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/find_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/insert_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/resize_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/resize_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/size_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/standard_policies.hpp
+include/c++/${version}/ext/pb_ds/detail/cc_hash_table_map_/trace_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/cond_dealtor.hpp
+include/c++/${version}/ext/pb_ds/detail/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/container_base_dispatch.hpp
+include/c++/${version}/ext/pb_ds/detail/eq_fn/eq_by_less.hpp
+include/c++/${version}/ext/pb_ds/detail/eq_fn/hash_eq_fn.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/constructor_destructor_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/debug_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/debug_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/erase_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/erase_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/find_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/find_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/gp_ht_map_.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/insert_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/insert_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/iterator_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/resize_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/resize_no_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/resize_store_hash_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/standard_policies.hpp
+include/c++/${version}/ext/pb_ds/detail/gp_hash_table_map_/trace_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/direct_mask_range_hashing_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/direct_mod_range_hashing_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/linear_probe_fn_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/mask_based_range_hashing.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/mod_based_range_hashing.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/probe_fn_base.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/quadratic_probe_fn_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/ranged_hash_fn.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/ranged_probe_fn.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/sample_probe_fn.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/sample_range_hashing.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/sample_ranged_hash_fn.hpp
+include/c++/${version}/ext/pb_ds/detail/hash_fn/sample_ranged_probe_fn.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/const_iterator.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/const_point_iterator.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/left_child_next_sibling_heap_.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/node.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/null_metadata.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/left_child_next_sibling_heap_/trace_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/constructor_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/entry_metadata_base.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/lu_map_.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_map_/trace_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_policy/counter_lu_metadata.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_policy/counter_lu_policy_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_policy/mtf_lu_policy_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/list_update_policy/sample_update_policy.hpp
+include/c++/${version}/ext/pb_ds/detail/map_debug_base.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/cond_dtor.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/node_iterators.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/ov_tree_map_.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/ov_tree_map_/traits.hpp
+include/c++/${version}/ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp
+include/c++/${version}/ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/child_iterator.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/cond_dtor_entry_dealtor.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/const_child_iterator.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/head.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/internal_node.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/leaf.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/node_base.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/node_iterators.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/node_metadata_base.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/pat_trie_.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/point_iterators.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/policy_access_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/split_join_branch_bag.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/synth_e_access_traits.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/traits.hpp
+include/c++/${version}/ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/priority_queue_base_dispatch.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/node.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rb_tree_map_/traits.hpp
+include/c++/${version}/ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rc_binomial_heap_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rc_binomial_heap_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rc_binomial_heap_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rc_binomial_heap_/rc.hpp
+include/c++/${version}/ext/pb_ds/detail/rc_binomial_heap_/rc_binomial_heap_.hpp
+include/c++/${version}/ext/pb_ds/detail/rc_binomial_heap_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/rc_binomial_heap_/trace_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/resize_policy/cc_hash_max_collision_check_resize_trigger_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/resize_policy/hash_exponential_size_policy_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/resize_policy/hash_load_check_resize_trigger_size_base.hpp
+include/c++/${version}/ext/pb_ds/detail/resize_policy/hash_prime_size_policy_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/resize_policy/hash_standard_resize_policy_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/resize_policy/sample_resize_policy.hpp
+include/c++/${version}/ext/pb_ds/detail/resize_policy/sample_resize_trigger.hpp
+include/c++/${version}/ext/pb_ds/detail/resize_policy/sample_size_policy.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/info_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/node.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/splay_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/splay_tree_.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/splay_tree_/traits.hpp
+include/c++/${version}/ext/pb_ds/detail/standard_policies.hpp
+include/c++/${version}/ext/pb_ds/detail/thin_heap_/constructors_destructor_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/thin_heap_/debug_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/thin_heap_/erase_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/thin_heap_/find_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/thin_heap_/insert_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/thin_heap_/split_join_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/thin_heap_/thin_heap_.hpp
+include/c++/${version}/ext/pb_ds/detail/thin_heap_/trace_fn_imps.hpp
+include/c++/${version}/ext/pb_ds/detail/tree_policy/node_metadata_selector.hpp
+include/c++/${version}/ext/pb_ds/detail/tree_policy/null_node_update_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/tree_policy/order_statistics_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/tree_policy/sample_tree_node_update.hpp
+include/c++/${version}/ext/pb_ds/detail/tree_trace_base.hpp
+include/c++/${version}/ext/pb_ds/detail/trie_policy/node_metadata_selector.hpp
+include/c++/${version}/ext/pb_ds/detail/trie_policy/null_node_update_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/trie_policy/order_statistics_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/trie_policy/prefix_search_node_update_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/trie_policy/sample_trie_e_access_traits.hpp
+include/c++/${version}/ext/pb_ds/detail/trie_policy/sample_trie_node_update.hpp
+include/c++/${version}/ext/pb_ds/detail/trie_policy/string_trie_e_access_traits_imp.hpp
+include/c++/${version}/ext/pb_ds/detail/trie_policy/trie_policy_base.hpp
+include/c++/${version}/ext/pb_ds/detail/type_utils.hpp
+include/c++/${version}/ext/pb_ds/detail/types_traits.hpp
+include/c++/${version}/ext/pb_ds/detail/unordered_iterator/const_iterator.hpp
+include/c++/${version}/ext/pb_ds/detail/unordered_iterator/const_point_iterator.hpp
+include/c++/${version}/ext/pb_ds/detail/unordered_iterator/iterator.hpp
+include/c++/${version}/ext/pb_ds/detail/unordered_iterator/point_iterator.hpp
+include/c++/${version}/ext/pb_ds/exception.hpp
+include/c++/${version}/ext/pb_ds/hash_policy.hpp
+include/c++/${version}/ext/pb_ds/list_update_policy.hpp
+include/c++/${version}/ext/pb_ds/priority_queue.hpp
+include/c++/${version}/ext/pb_ds/tag_and_trait.hpp
+include/c++/${version}/ext/pb_ds/tree_policy.hpp
+include/c++/${version}/ext/pb_ds/trie_policy.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/throw_allocator.h
+include/c++/${version}/ext/typelist.h
+include/c++/${version}/ext/type_traits.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/cctype
+include/c++/${version}/tr1/cfenv
+include/c++/${version}/tr1/cfloat
+include/c++/${version}/tr1/cinttypes
+include/c++/${version}/tr1/climits
+include/c++/${version}/tr1/cmath
+include/c++/${version}/tr1/common.h
+include/c++/${version}/tr1/complex
+include/c++/${version}/tr1/cstdarg
+include/c++/${version}/tr1/cstdbool
+include/c++/${version}/tr1/cstdint
+include/c++/${version}/tr1/cstdio
+include/c++/${version}/tr1/cstdlib
+include/c++/${version}/tr1/ctgmath
+include/c++/${version}/tr1/ctime
+include/c++/${version}/tr1/ctype.h
+include/c++/${version}/tr1/cwchar
+include/c++/${version}/tr1/cwctype
+include/c++/${version}/tr1/fenv.h
+include/c++/${version}/tr1/float.h
+include/c++/${version}/tr1/functional
+include/c++/${version}/tr1/functional_hash.h
+include/c++/${version}/tr1/functional_iterate.h
+include/c++/${version}/tr1/hashtable
+include/c++/${version}/tr1/hashtable_policy.h
+include/c++/${version}/tr1/inttypes.h
+include/c++/${version}/tr1/limits.h
+include/c++/${version}/tr1/math.h
+include/c++/${version}/tr1/memory
+include/c++/${version}/tr1/mu_iterate.h
+include/c++/${version}/tr1/random
+include/c++/${version}/tr1/random.tcc
+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/stdarg.h
+include/c++/${version}/tr1/stdbool.h
+include/c++/${version}/tr1/stdint.h
+include/c++/${version}/tr1/stdio.h
+include/c++/${version}/tr1/stdlib.h
+include/c++/${version}/tr1/tgmath.h
+include/c++/${version}/tr1/tuple
+include/c++/${version}/tr1/tuple_defs.h
+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}/tr1/wchar.h
+include/c++/${version}/tr1/wctype.h
+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/gcc/${arch}-${vendor}-solaris*/$version/libgfortranbegin.a
-$iprefix/lib/gcc/${arch}-${vendor}-solaris*/$version/finclude
-$iprefix/libexec/gcc/${arch}-${vendor}-solaris*/$version/f951
+lib/$libsubdir/${arch}-${vendor}-solaris*/$version/finclude/omp*
+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*
 
@@ -168,7 +755,7 @@ $_libdir/libstdc++.so.6*
 
 [libobjc2]
 pkgname="${pkgprefix}lobjc2"
-name="libojc2 - GNU Objective-C shared support library"
+name="libobjc2 - GNU Objective-C shared support library"
 pkgcat="system"
 pkgvendor="http://gcc.gnu.org"
 pkgdesc="Runtime support library for Objective-C"
@@ -177,7 +764,7 @@ files(-,root,bin)
 $_libdir/libobjc.so.2*
 
 [libgfortran2]
-pkgname="${pkgprefix}lgft2"
+pkgname="${pkgprefix}lgfrt2"
 name="libgfortran2 - GNU Fortran shared support library"
 pkgcat="system"
 pkgvendor="http://gcc.gnu.org"
@@ -186,8 +773,29 @@ pkgver="$pkgver"
 files(-,root,bin)
 $_libdir/libgfortran.so.2*
 
+[libgnat42]
+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*
+
 [libgomp1]
-pkgname="${pkgprefix}lgo1"
+pkgname="${pkgprefix}lgomp1"
 name="libgomp1 - GNU OpenMP shared support library"
 pkgcat="system"
 pkgvendor="http://gcc.gnu.org"
diff --git a/gcc42/meta/relnotes b/gcc42/meta/relnotes
index bd83629..4a1b650 100644
--- a/gcc42/meta/relnotes
+++ b/gcc42/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/gcc42/src/gcc-4.2.4-new-gas.patch b/gcc42/src/gcc-4.2.4-new-gas.patch
new file mode 100644
index 0000000..6a88f10
--- /dev/null
+++ b/gcc42/src/gcc-4.2.4-new-gas.patch
@@ -0,0 +1,12 @@
+diff -up gcc-4.2.4/gcc/configure.orig gcc-4.2.4/gcc/configure
+--- gcc-4.2.4/gcc/configure.orig	2008-03-12 01:56:34.000000000 +0100
++++ gcc-4.2.4/gcc/configure	2012-12-02 11:25:50.191450000 +0100
+@@ -14045,7 +14045,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