Mercurial Mercurial > illumos-userland / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2632 GNU_ARCH should be defined globally
authorAndrew Stormont <andrew.stormont@nexenta.com>
Fri, 04 May 2012 09:35:45 +0100
changeset 493 66a35caef41c
parent 492 feb4ae69ab0d
child 494 8346b431af59
2632 GNU_ARCH should be defined globally 2684 Help autoconf with 64bit builds Reviewed by: Igor Kozhukhov <[email protected]> Reviewed by: Alasdair Lumsdem <[email protected]> Approved by: Andrew Stormont <[email protected]>
components/binutils/Makefile file | annotate | diff | comparison | revisions
components/gcc3/Makefile file | annotate | diff | comparison | revisions
components/gcc44/Makefile file | annotate | diff | comparison | revisions
components/gcc44/gcc44.p5m file | annotate | diff | comparison | revisions
make-rules/configure.mk file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions
transforms/generate-cleanup file | annotate | diff | comparison | revisions 
--- a/components/binutils/Makefile	Sun Mar 11 22:49:55 2012 +0000
+++ b/components/binutils/Makefile	Fri May 04 09:35:45 2012 +0100
@@ -18,6 +18,7 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2012 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
@@ -33,11 +34,6 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-PARCH =		$(MACH:i386=i386-pc)
-GNU_ARCH =	$(PARCH:sparc=sparc-sun)-solaris$(SOLARIS_VERSION)
-
-PKG_MACROS +=	GNU_ARCH="$(GNU_ARCH)"
-
 CONFIGURE_PREFIX =	/usr/gnu
 
 CONFIGURE_OPTIONS +=	 --mandir=$(CONFIGURE_MANDIR)
--- a/components/gcc3/Makefile	Sun Mar 11 22:49:55 2012 +0000
+++ b/components/gcc3/Makefile	Fri May 04 09:35:45 2012 +0100
@@ -18,6 +18,7 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2012 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
@@ -38,11 +39,6 @@
 include ../../make-rules/configure.mk
 include ../../make-rules/ips.mk
 
-PARCH =		$(MACH:i386=i386-pc)
-GNU_ARCH =	$(PARCH:sparc=sparc-sun)-solaris$(SOLARIS_VERSION)
-
-PKG_MACROS +=	GNU_ARCH="$(GNU_ARCH)"
-
 # we build gcc with gcc
 COMPILER =	gcc
 
--- a/components/gcc44/Makefile	Sun Mar 11 22:49:55 2012 +0000
+++ b/components/gcc44/Makefile	Fri May 04 09:35:45 2012 +0100
@@ -18,6 +18,7 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2012 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2011, OpenIndiana project. All rights reserved.
 #
 include ../../make-rules/shared-macros.mk
@@ -37,11 +38,6 @@
 GCC_ROOT=/usr/gcc/4.4
 COMPILER=gcc
 
-# workarround plattform, EC uses PLAT makro, should be reimplemented in shared-macros.mk
-# ore replaced
-PLAT=$(shell uname -p | sed 's/i386/pc/;s/sparc/sun/')
-PKG_MACROS += PLAT=$(PLAT)
-
 CPPFLAGS+= -fexceptions
 
 CONFIGURE_PREFIX    =           /usr/gcc/4.4
@@ -58,7 +54,6 @@
 CONFIGURE_OPTIONS  +=           --enable-languages=c,c++,objc,fortran
 CONFIGURE_OPTIONS  +=           --with-stage1-ldflags="-R$(CONFIGURE_PREFIX)/lib"
 CONFIGURE_OPTIONS  +=           --with-boot-ldflags="-R$(CONFIGURE_PREFIX)/lib"
-CONFIGURE_OPTIONS  +=           --build=$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)
 
 include ../../make-rules/shared-targets.mk
 
--- a/components/gcc44/gcc44.p5m	Sun Mar 11 22:49:55 2012 +0000
+++ b/components/gcc44/gcc44.p5m	Fri May 04 09:35:45 2012 +0100
@@ -7,6 +7,7 @@
 # source. A copy of the CDDL is also available via the Internet at
 # http://www.illumos.org/license/CDDL.
 #
+# Copyright (c) 2012 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2011, OpenIndiana project. All rights reserved.
 #
 
@@ -28,13 +29,13 @@
 dir path=usr/gcc/4.4/include/c++
 dir path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)
 dir \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)
 dir \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)
 dir \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits
 dir \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits
 dir path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/backward
 dir path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/bits
 dir path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/debug
@@ -91,38 +92,38 @@
 dir path=usr/gcc/4.4/lib
 dir path=usr/gcc/4.4/libexec
 dir path=usr/gcc/4.4/libexec/gcc
-dir path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)
-dir path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/4.4.4
-dir path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/4.4.4/install-tools
+dir path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)
+dir path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/4.4.4
+dir path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/4.4.4/install-tools
 dir path=usr/gcc/4.4/lib/$(MACH64)
 dir path=usr/gcc/4.4/lib/gcc
-dir path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)
+dir path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/$(MACH64)
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/finclude
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/finclude
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/ssp
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/ssp
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/arpa
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/arpa
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/dat
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/dat
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/iso
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/iso
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/sys
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/sys
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools
 dir \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/include
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/include
 dir path=usr/gcc/4.4/share
 dir path=usr/gcc/4.4/share/info
 dir path=usr/gcc/4.4/share/locale
@@ -167,104 +168,104 @@
 dir path=usr/gcc/4.4/share/man
 dir path=usr/gcc/4.4/share/man/man1
 dir path=usr/gcc/4.4/share/man/man7
-file path=usr/gcc/4.4/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)-g++
-file path=usr/gcc/4.4/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)-gcc
-file path=usr/gcc/4.4/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)-gfortran
+file path=usr/gcc/4.4/bin/$(GNU_ARCH)-g++
+file path=usr/gcc/4.4/bin/$(GNU_ARCH)-gcc
+file path=usr/gcc/4.4/bin/$(GNU_ARCH)-gfortran
 file path=usr/gcc/4.4/bin/cpp
 file path=usr/gcc/4.4/bin/gccbug
 file path=usr/gcc/4.4/bin/gcov
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/atomic_word.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/atomic_word.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/basic_file.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/basic_file.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/c++allocator.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/c++allocator.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/c++config.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/c++config.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/c++io.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/c++io.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/c++locale.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/c++locale.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/cpu_defines.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/cpu_defines.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/ctype_base.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/ctype_base.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/ctype_inline.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/ctype_inline.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/ctype_noninline.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/ctype_noninline.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/cxxabi_tweaks.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/cxxabi_tweaks.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/error_constants.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/error_constants.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/extc++.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/extc++.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/gthr-default.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/gthr-default.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/gthr-posix.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/gthr-posix.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/gthr-single.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/gthr-single.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/gthr-tpf.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/gthr-tpf.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/gthr.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/gthr.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/messages_members.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/messages_members.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/os_defines.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/os_defines.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/stdc++.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/stdc++.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/stdtr1c++.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/stdtr1c++.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(MACH64)/bits/time_members.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/$(MACH64)/bits/time_members.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/atomic_word.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/atomic_word.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/basic_file.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/basic_file.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/c++allocator.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/c++allocator.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/c++config.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/c++config.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/c++io.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/c++io.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/c++locale.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/c++locale.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/cpu_defines.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/cpu_defines.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/ctype_base.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/ctype_base.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/ctype_inline.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/ctype_inline.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/ctype_noninline.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/ctype_noninline.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/cxxabi_tweaks.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/cxxabi_tweaks.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/error_constants.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/error_constants.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/extc++.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/extc++.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/gthr-default.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/gthr-default.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/gthr-posix.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/gthr-posix.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/gthr-single.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/gthr-single.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/gthr-tpf.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/gthr-tpf.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/gthr.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/gthr.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/messages_members.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/messages_members.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/os_defines.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/os_defines.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/stdc++.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/stdc++.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/stdtr1c++.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/stdtr1c++.h
 file \
-    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/bits/time_members.h
+    path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/$(GNU_ARCH)/bits/time_members.h
 file path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/algorithm
 file path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/array
 file path=usr/gcc/4.4/include/c++/$(COMPONENT_VERSION)/backward/auto_ptr.h
@@ -1181,179 +1182,179 @@
 file path=usr/gcc/4.4/lib/$(MACH64)/libgomp.spec
 file path=usr/gcc/4.4/lib/$(MACH64)/libiberty.a
 file \
-    specs.$(MACH) path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/specs
+    specs.$(MACH) path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/specs
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/$(MACH64)/crtbegin.o
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtbegin.o
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/$(MACH64)/crtend.o
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/crtend.o
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/$(MACH64)/gmon.o
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/gmon.o
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/$(MACH64)/libgcc.a
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/libgcc.a
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/$(MACH64)/libgcc_eh.a
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/libgcc_eh.a
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/$(MACH64)/libgcov.a
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/$(MACH64)/libgcov.a
 file \
-    path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/cc1 mode=555
+    path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/cc1 mode=555
 file \
-    path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/cc1obj mode=555
+    path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/cc1obj mode=555
 file \
-    path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/cc1plus mode=555
+    path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/cc1plus mode=555
 file \
-    path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/collect2 mode=555
+    path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/collect2 mode=555
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/crtbegin.o
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtbegin.o
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/crtend.o
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/crtend.o
 file \
-    path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/f951 mode=555
+    path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/f951 mode=555
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/finclude/omp_lib.f90
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/finclude/omp_lib.f90
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/finclude/omp_lib.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/finclude/omp_lib.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/finclude/omp_lib.mod
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/finclude/omp_lib.mod
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/finclude/omp_lib_kinds.mod
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/finclude/omp_lib_kinds.mod
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/gmon.o
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/gmon.o
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/ammintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/ammintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/avxintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/avxintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/bmmintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/bmmintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/cpuid.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/cpuid.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/cross-stdarg.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/cross-stdarg.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/emmintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/emmintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/float.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/float.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/immintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/immintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/iso646.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/iso646.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/mm3dnow.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/mm3dnow.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/mm_malloc.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/mm_malloc.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/mmintrin-common.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/mmintrin-common.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/mmintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/mmintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/nmmintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/nmmintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/NXConstStr.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/NXConstStr.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/Object.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/Object.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/Protocol.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/Protocol.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/encoding.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/encoding.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/hash.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/hash.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/objc-api.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/objc-api.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/objc-decls.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/objc-decls.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/objc-list.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/objc-list.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/objc.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/objc.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/sarray.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/sarray.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/thr.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/thr.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/objc/typedstream.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/objc/typedstream.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/omp.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/omp.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/pmmintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/pmmintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/smmintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/smmintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/ssp/ssp.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/ssp/ssp.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/ssp/stdio.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/ssp/stdio.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/ssp/string.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/ssp/string.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/ssp/unistd.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/ssp/unistd.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/stdarg.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/stdarg.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/stdbool.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/stdbool.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/stddef.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/stddef.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/stdfix.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/stdfix.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/tgmath.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/tgmath.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/tmmintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/tmmintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/unwind.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/unwind.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/varargs.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/varargs.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/wmmintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/wmmintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/x86intrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/x86intrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include/xmmintrin.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include/xmmintrin.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/README
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/README
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/arpa/nameser_compat.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/arpa/nameser_compat.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/curses.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/curses.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/dat/dat_platform_specific.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/dat/dat_platform_specific.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/iso/math_c99.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/iso/math_c99.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/limits.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/limits.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/math.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/math.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/sys/feature_tests.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/sys/feature_tests.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/sys/varargs.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/sys/varargs.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/syslimits.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/syslimits.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/include-fixed/wchar.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/include-fixed/wchar.h
 file \
-    path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/fixinc.sh mode=555
+    path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/fixinc.sh mode=555
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/fixinc_list
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/fixinc_list
 file \
-    path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/fixincl mode=555
+    path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/fixincl mode=555
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/gsyslimits.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/gsyslimits.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/include/README
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/include/README
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/include/limits.h
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/include/limits.h
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/macro_list
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/macro_list
 file \
-    path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/mkheaders mode=555
+    path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/mkheaders mode=555
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/mkheaders.conf
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/mkheaders.conf
 file \
-    path=usr/gcc/4.4/libexec/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/install-tools/mkinstalldirs mode=555
+    path=usr/gcc/4.4/libexec/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/install-tools/mkinstalldirs mode=555
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/libgcc.a
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/libgcc.a
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/libgcc_eh.a
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/libgcc_eh.a
 file \
-    path=usr/gcc/4.4/lib/gcc/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)/$(COMPONENT_VERSION)/libgcov.a
+    path=usr/gcc/4.4/lib/gcc/$(GNU_ARCH)/$(COMPONENT_VERSION)/libgcov.a
 file path=usr/gcc/4.4/lib/libgomp.spec
 file path=usr/gcc/4.4/lib/libiberty.a
 file path=usr/gcc/4.4/info/libgomp.info
@@ -1397,12 +1398,9 @@
 file path=usr/gcc/4.4/share/man/man7/fsf-funding.7
 file path=usr/gcc/4.4/share/man/man7/gfdl.7
 file path=usr/gcc/4.4/share/man/man7/gpl.7
-hardlink path=usr/gcc/4.4/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)-c++ \
-    target=i386-pc-solaris2.11-g++
-hardlink \
-    path=usr/gcc/4.4/bin/$(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)-gcc-$(COMPONENT_VERSION) \
-    target=i386-pc-solaris2.11-gcc
-hardlink path=usr/gcc/4.4/bin/c++ target=i386-pc-solaris2.11-g++
-hardlink path=usr/gcc/4.4/bin/g++ target=i386-pc-solaris2.11-g++
-hardlink path=usr/gcc/4.4/bin/gcc target=i386-pc-solaris2.11-gcc
-hardlink path=usr/gcc/4.4/bin/gfortran target=i386-pc-solaris2.11-gfortran
+hardlink path=usr/gcc/4.4/bin/$(GNU_ARCH)-c++ target=$(GNU_ARCH)-g++
+hardlink path=usr/gcc/4.4/bin/$(GNU_ARCH)-gcc-$(COMPONENT_VERSION) target=$(GNU_ARCH)-gcc
+hardlink path=usr/gcc/4.4/bin/c++ target=$(GNU_ARCH)-g++
+hardlink path=usr/gcc/4.4/bin/g++ target=$(GNU_ARCH)-g++
+hardlink path=usr/gcc/4.4/bin/gcc target=$(GNU_ARCH)-gcc
+hardlink path=usr/gcc/4.4/bin/gfortran target=$(GNU_ARCH)-gfortran
--- a/make-rules/configure.mk	Sun Mar 11 22:49:55 2012 +0000
+++ b/make-rules/configure.mk	Fri May 04 09:35:45 2012 +0100
@@ -71,12 +71,17 @@
 CONFIGURE_ENV = CONFIG_SHELL="$(CONFIG_SHELL)"
 
 CONFIGURE_DEFAULT_COMPILERS?=yes
+CONFIGURE_DEFAULT_HOST?=yes
 CONFIGURE_DEFAULT_DIRS?=yes
 
 ifeq ($(CONFIGURE_DEFAULT_COMPILERS),yes)
 CONFIGURE_OPTIONS += CC="$(CC)"
 CONFIGURE_OPTIONS += CXX="$(CXX)"
 endif
+ifeq ($(CONFIGURE_DEFAULT_HOST),yes)
+CONFIGURE_OPTIONS.32 += --build=$(GNU_ARCH)
+CONFIGURE_OPTIONS.64 += --build=$(GNU_ARCH_64)
+endif
 CONFIGURE_OPTIONS += --prefix=$(CONFIGURE_PREFIX)
 ifeq ($(CONFIGURE_DEFAULT_DIRS),yes)
 CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)
--- a/make-rules/shared-macros.mk	Sun Mar 11 22:49:55 2012 +0000
+++ b/make-rules/shared-macros.mk	Fri May 04 09:35:45 2012 +0100
@@ -277,6 +277,17 @@
 #PERL_CC =      $(shell $(PERL) -e 'use Config; print $$Config{cc}')
 PERL_OPTIMIZE = $(shell $(PERL) -e 'use Config; print $$Config{optimize}')
 
+ifeq ($(MACH),sparc)
+PLAT =	sun
+else
+PLAT =	pc
+endif
+
+GNU_ARCH    =   $(MACH)-$(PLAT)-solaris$(SOLARIS_VERSION)
+GNU_ARCH_64 =   $(MACH64:amd64=x86_64)-$(PLAT)-solaris$(SOLARIS_VERSION)
+
+PKG_MACROS +=   GNU_ARCH=$(GNU_ARCH)
+PKG_MACROS +=   GNU_ARCH_64=$(GNU_ARCH_64)
 PKG_MACROS +=   PERL_ARCH=$(PERL_ARCH)
 PKG_MACROS +=   PERL_VERSION=$(PERL_VERSION)
 
--- a/transforms/generate-cleanup	Sun Mar 11 22:49:55 2012 +0000
+++ b/transforms/generate-cleanup	Fri May 04 09:35:45 2012 +0100
@@ -18,6 +18,7 @@
 #
 # CDDL HEADER END
 #
+# Copyright (c) 2012 Nexenta Systems, Inc.  All rights reserved.
 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
 #
 
@@ -53,7 +54,7 @@
 <transform dir file link hardlink -> \
 	edit path "/(sparc|i386)/" "/$!(MACH)/">
 <transform dir file link hardlink -> \
-	edit path "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(MACH)-$!(PLAT)-solaris$!(SOLARIS_RELEASE)">
+	edit path "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(GNU_ARCH)">
 
 <transform dir file link hardlink -> \
 	edit target "/(sparcv9|amd64)$" "/$!(MACH64)">
@@ -68,7 +69,7 @@
 <transform dir file link hardlink -> \
 	edit target "/(sparc|i386)/" "/$!(MACH)/">
 <transform dir file link hardlink -> \
-	edit target "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(MACH)-$!(PLAT)-solaris$!(SOLARIS_RELEASE)">
+	edit target "/(sparc|i386)-(sun|pc)-solaris\d\.\d+" "/$!(GNU_ARCH)">
 
 # <transform dir file link hardlink -> \
 # 	edit path "$(COMPONENT_NAME)" "$!(COMPONENT_NAME)">
illumos-userland