35 files changed, 406 insertions, 81 deletions
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 9a4772399733..81676d0f89a3 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -155,33 +155,8 @@ $(eval $(call gb_Helper_collect_libtargets))
 
 gb_Library_DLLPOSTFIX := lo
 
-ifeq ($(OS),LINUX)
-include $(GBUILDDIR)/platform/linux-$(CPUNAME).mk
-else ifeq ($(OS),MACOSX)
-include $(GBUILDDIR)/platform/macosx.mk
-else ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-include $(GBUILDDIR)/platform/winmingw.mk
-else
-include $(GBUILDDIR)/platform/windows.mk
-endif
-else ifeq ($(OS),OPENBSD)
-include $(GBUILDDIR)/platform/openbsd.mk
-else ifeq ($(OS),FREEBSD)
-include $(GBUILDDIR)/platform/freebsd.mk
-else ifeq ($(OS),NETBSD)
-include $(GBUILDDIR)/platform/netbsd.mk
-else ifeq ($(OS),DRAGONFLY)
-include $(GBUILDDIR)/platform/dragonfly.mk
-else ifeq ($(OS),SOLARIS)
-include $(GBUILDDIR)/platform/solaris.mk
-else ifeq ($(OS),IOS)
-include $(GBUILDDIR)/platform/ios.mk
-else ifeq ($(OS),ANDROID)
-include $(GBUILDDIR)/platform/android.mk
-else
-$(eval $(call gb_Output_error,Unsupported OS: $(OS)))
-endif
+# Include platform/cpu/compiler specific config/definitions
+include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
 
 ifeq ($(CROSS_COMPILING),YES)
 # We can safely Assume all cross-compilation is from Unix systems.
diff --git a/solenv/gbuild/gbuild_simple.mk b/solenv/gbuild/gbuild_simple.mk
index 5a48ffb72606..35a2197a2ba0 100644
--- a/solenv/gbuild/gbuild_simple.mk
+++ b/solenv/gbuild/gbuild_simple.mk
@@ -82,32 +82,7 @@ endif
 
 include $(GBUILDDIR)/Helper.mk
 
-ifeq ($(OS),LINUX)
-include $(GBUILDDIR)/platform/linux-$(CPUNAME).mk
-else ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-include $(GBUILDDIR)/platform/winmingw.mk
-else
-include $(GBUILDDIR)/platform/windows.mk
-endif
-else ifeq ($(OS),SOLARIS)
-include $(GBUILDDIR)/platform/solaris.mk
-else ifeq ($(OS),MACOSX)
-include $(GBUILDDIR)/platform/macosx.mk
-else ifeq ($(OS),OPENBSD)
-include $(GBUILDDIR)/platform/openbsd.mk
-else ifeq ($(OS),FREEBSD)
-include $(GBUILDDIR)/platform/freebsd.mk
-else ifeq ($(OS),NETBSD)
-include $(GBUILDDIR)/platform/netbsd.mk
-else ifeq ($(OS),DRAGONFLY)
-include $(GBUILDDIR)/platform/dragonfly.mk
-else ifeq ($(OS),IOS)
-include $(GBUILDDIR)/platform/ios.mk
-else ifeq ($(OS),ANDROID)
-include $(GBUILDDIR)/platform/android.mk
-else
-$(eval $(call gb_Output_error,Unsupported OS: $(OS)))
-endif
+# Include platform/cpu/compiler specific config/definitions
+include $(GBUILDDIR)/platform/$(OS)_$(CPUNAME)_$(COM).mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/android.mk b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
index 92ad3661832a..92ad3661832a 100644
--- a/solenv/gbuild/platform/android.mk
+++ b/solenv/gbuild/platform/ANDROID_ARM_GCC.mk
diff --git a/solenv/gbuild/platform/dragonfly.mk b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
index 05a013fd8bdc..f63fc46cef80 100644
--- a/solenv/gbuild/platform/dragonfly.mk
+++ b/solenv/gbuild/platform/DRAGONFLY_INTEL_GCC.mk
@@ -30,10 +30,7 @@
 
 #please make generic modifications to unxgcc.mk
 
-ifeq ($(CPUNAME),INTEL)
 gb_CPUDEFS := -DX86
-endif
-
 gb_COMPILERDEFAULTOPTFLAGS := -O -g
 
 include $(GBUILDDIR)/platform/unxgcc.mk
diff --git a/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
new file mode 100644
index 000000000000..3052581150c1
--- /dev/null
+++ b/solenv/gbuild/platform/DRAGONFLY_X86_64_GCC.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+gb_COMPILERDEFAULTOPTFLAGS := -O -g
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:/usr/pkg/lib
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/freebsd.mk b/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk
index 73dd7dda29b2..f52773c9e26a 100644
--- a/solenv/gbuild/platform/freebsd.mk
+++ b/solenv/gbuild/platform/FREEBSD_INTEL_GCC.mk
@@ -30,10 +30,7 @@
 
 #please make generic modifications to unxgcc.mk
 
-ifeq ($(CPUNAME),INTEL)
 gb_CPUDEFS := -DX86
-endif
-
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
diff --git a/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk b/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk
new file mode 100644
index 000000000000..6353f38e1faf
--- /dev/null
+++ b/solenv/gbuild/platform/FREEBSD_X86_64_GCC.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/ios.mk b/solenv/gbuild/platform/IOS_ARM_GCC.mk
index 8f013fbc6341..8f013fbc6341 100644
--- a/solenv/gbuild/platform/ios.mk
+++ b/solenv/gbuild/platform/IOS_ARM_GCC.mk
diff --git a/solenv/gbuild/platform/linux-ARM.mk b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
index 72132ca72e73..72132ca72e73 100644
--- a/solenv/gbuild/platform/linux-ARM.mk
+++ b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
diff --git a/solenv/gbuild/platform/linux-AXP.mk b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
index b550995df59d..b550995df59d 100644
--- a/solenv/gbuild/platform/linux-AXP.mk
+++ b/solenv/gbuild/platform/LINUX_AXP_GCC.mk
diff --git a/solenv/gbuild/platform/linux-GODSON.mk b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
index 2bf9cf7618d4..2bf9cf7618d4 100644
--- a/solenv/gbuild/platform/linux-GODSON.mk
+++ b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
diff --git a/solenv/gbuild/platform/linux-HPPA.mk b/solenv/gbuild/platform/LINUX_HPPA_GCC.mk
index ac21c9088c44..ac21c9088c44 100644
--- a/solenv/gbuild/platform/linux-HPPA.mk
+++ b/solenv/gbuild/platform/LINUX_HPPA_GCC.mk
diff --git a/solenv/gbuild/platform/linux-IA64.mk b/solenv/gbuild/platform/LINUX_IA64_GCC.mk
index ac21c9088c44..ac21c9088c44 100644
--- a/solenv/gbuild/platform/linux-IA64.mk
+++ b/solenv/gbuild/platform/LINUX_IA64_GCC.mk
diff --git a/solenv/gbuild/platform/linux-INTEL.mk b/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
index 4410ed0e9c88..4410ed0e9c88 100644
--- a/solenv/gbuild/platform/linux-INTEL.mk
+++ b/solenv/gbuild/platform/LINUX_INTEL_GCC.mk
diff --git a/solenv/gbuild/platform/linux-M68K.mk b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
index d7c0de18f74c..d7c0de18f74c 100644
--- a/solenv/gbuild/platform/linux-M68K.mk
+++ b/solenv/gbuild/platform/LINUX_M68K_GCC.mk
diff --git a/solenv/gbuild/platform/linux-POWERPC64.mk b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
index e48979b18bba..e48979b18bba 100644
--- a/solenv/gbuild/platform/linux-POWERPC64.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC64_GCC.mk
diff --git a/solenv/gbuild/platform/linux-POWERPC.mk b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
index 2ac40285f018..2ac40285f018 100644
--- a/solenv/gbuild/platform/linux-POWERPC.mk
+++ b/solenv/gbuild/platform/LINUX_POWERPC_GCC.mk
diff --git a/solenv/gbuild/platform/linux-S390X.mk b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
index e50579e2d419..e50579e2d419 100644
--- a/solenv/gbuild/platform/linux-S390X.mk
+++ b/solenv/gbuild/platform/LINUX_S390X_GCC.mk
diff --git a/solenv/gbuild/platform/linux-S390.mk b/solenv/gbuild/platform/LINUX_S390_GCC.mk
index 6f5fec935ff1..6f5fec935ff1 100644
--- a/solenv/gbuild/platform/linux-S390.mk
+++ b/solenv/gbuild/platform/LINUX_S390_GCC.mk
diff --git a/solenv/gbuild/platform/linux-SPARC.mk b/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
index bfb3ad4d4a78..bfb3ad4d4a78 100644
--- a/solenv/gbuild/platform/linux-SPARC.mk
+++ b/solenv/gbuild/platform/LINUX_SPARC_GCC.mk
diff --git a/solenv/gbuild/platform/linux-X86_64.mk b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
index ac21c9088c44..ac21c9088c44 100644
--- a/solenv/gbuild/platform/linux-X86_64.mk
+++ b/solenv/gbuild/platform/LINUX_X86_64_GCC.mk
diff --git a/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk b/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk
new file mode 100644
index 000000000000..32ca48cbb15d
--- /dev/null
+++ b/solenv/gbuild/platform/MACOSX_INTEL_GCC.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Norbert Thiébaud <nthiebaud@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Norbert Thiébaud <nthiebaud@gmail.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+gb_CPUDEFS := -DX86
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/macosx.mk
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/MACOSX_POWERPC_GCC.mk b/solenv/gbuild/platform/MACOSX_POWERPC_GCC.mk
new file mode 100644
index 000000000000..f1cf5ca3f07b
--- /dev/null
+++ b/solenv/gbuild/platform/MACOSX_POWERPC_GCC.mk
@@ -0,0 +1,37 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Norbert Thiébaud <nthiebaud@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Norbert Thiébaud <nthiebaud@gmail.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+gb_CPUDEFS := -DPPC
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/macosx.mk
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/netbsd.mk b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
index a7dd62dc684a..eaf504dc068a 100644
--- a/solenv/gbuild/platform/netbsd.mk
+++ b/solenv/gbuild/platform/NETBSD_INTEL_GCC.mk
@@ -30,10 +30,7 @@
 
 #please make generic modifications to unxgcc.mk
 
-ifeq ($(CPUNAME),INTEL)
 gb_CPUDEFS := -DX86
-endif
-
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 
 include $(GBUILDDIR)/platform/unxgcc.mk
diff --git a/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk b/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk
new file mode 100644
index 000000000000..af72c5044a59
--- /dev/null
+++ b/solenv/gbuild/platform/NETBSD_POWERPC_GCC.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
+
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk b/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk
new file mode 100644
index 000000000000..af72c5044a59
--- /dev/null
+++ b/solenv/gbuild/platform/NETBSD_SPARC_GCC.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
+
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
new file mode 100644
index 000000000000..af72c5044a59
--- /dev/null
+++ b/solenv/gbuild/platform/NETBSD_X86_64_GCC.mk
@@ -0,0 +1,42 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+NB_ADD_LIBPATH := /usr/pkg/lib:/usr/X11R7/lib
+
+gb_Helper_set_ld_path := LD_LIBRARY_PATH=$(OUTDIR_FOR_BUILD)/lib:$(NB_ADD_LIBPATH)
+gb_CppunitTest_CPPTESTPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib:$(NB_ADD_LIBPATH)
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/openbsd.mk b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
index a8380eee965b..090530d35903 100644
--- a/solenv/gbuild/platform/openbsd.mk
+++ b/solenv/gbuild/platform/OPENBSD_INTEL_GCC.mk
@@ -30,10 +30,7 @@
 
 #please make generic modifications to unxgcc.mk
 
-ifeq ($(CPUNAME),INTEL)
 gb_CPUDEFS := -DX86
-endif
-
 gb_COMPILERDEFAULTOPTFLAGS := -O2
 gb_STDLIBS := pthread
 
diff --git a/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
new file mode 100644
index 000000000000..00201206bbff
--- /dev/null
+++ b/solenv/gbuild/platform/OPENBSD_X86_64_GCC.mk
@@ -0,0 +1,58 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Caolán McNamara <caolanm@redhat.com> (Red Hat, Inc.)
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Caolán McNamara <caolanm@redhat.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+#please make generic modifications to unxgcc.mk
+
+gb_COMPILERDEFAULTOPTFLAGS := -O2
+gb_STDLIBS := pthread
+
+include $(GBUILDDIR)/platform/unxgcc.mk
+
+gb_LinkTarget_NOEXCEPTIONFLAGS += -DBOOST_NO_EXCEPTIONS
+
+define gb_LinkTarget__command_dynamiclink
+$(call gb_Helper_abbreviate_dirs,\
+mkdir -p $(dir $(1)) && \
+	$(gb_CXX) \
+		$(if $(filter Library CppunitTest,$(TARGETTYPE)),$(gb_Library_TARGETTYPEFLAGS)) \
+		$(subst \d,$$,$(RPATH)) \
+		$(T_LDFLAGS) \
+		$(foreach object,$(COBJECTS),$(call gb_CObject_get_target,$(object))) \
+		$(foreach object,$(CXXOBJECTS),$(call gb_CxxObject_get_target,$(object))) \
+		$(foreach object,$(GENCOBJECTS),$(call gb_GenCObject_get_target,$(object))) \
+		$(foreach object,$(GENCXXOBJECTS),$(call gb_GenCxxObject_get_target,$(object))) \
+		$(foreach extraobjectlist,$(EXTRAOBJECTLISTS),`cat $(extraobjectlist)`) \
+		-Wl$(COMMA)--start-group $(foreach lib,$(LINKED_STATIC_LIBS),$(call gb_StaticLibrary_get_target,$(lib))) -Wl$(COMMA)--end-group \
+		$(LIBS) \
+		$(subst -lpthread,$(PTHREAD_LIBS),$(patsubst lib%.a,-l%,$(patsubst lib%.so,-l%,$(foreach lib,$(LINKED_LIBS),$(call gb_Library_get_filename,$(lib)))))) \
+		-o $(1))
+endef
+
+# vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/SOLARIS_INTEL_GCC.mk b/solenv/gbuild/platform/SOLARIS_INTEL_GCC.mk
new file mode 100644
index 000000000000..4283a71f0ea3
--- /dev/null
+++ b/solenv/gbuild/platform/SOLARIS_INTEL_GCC.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Norbert Thiébaud <nthiebaud@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Norbert Thiébaud <nthiebaud@gmail.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+include $(GBUILDDIR)/platform/solaris.mk
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/SOLARIS_SPARC_GCC.mk b/solenv/gbuild/platform/SOLARIS_SPARC_GCC.mk
new file mode 100644
index 000000000000..4283a71f0ea3
--- /dev/null
+++ b/solenv/gbuild/platform/SOLARIS_SPARC_GCC.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*************************************************************************
+#
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+# http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# The Initial Developer of the Original Code is
+#        Norbert Thiébaud <nthiebaud@gmail.com>
+# Portions created by the Initial Developer are Copyright (C) 2010 the
+# Initial Developer. All Rights Reserved.
+#
+# Contributor(s): Norbert Thiébaud <nthiebaud@gmail.com>
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+#
+#*************************************************************************
+
+include $(GBUILDDIR)/platform/solaris.mk
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/platform/winmingw.mk b/solenv/gbuild/platform/WIN_INTEL_GCC.mk
index 6906f82edcb4..f2d5507ff015 100644
--- a/solenv/gbuild/platform/winmingw.mk
+++ b/solenv/gbuild/platform/WIN_INTEL_GCC.mk
@@ -27,7 +27,6 @@
 #*************************************************************************
 
 GUI := WNT
-COM := GCC
 
 gb_COMPILERDEFAULTOPTFLAGS := -Os
 gb_CPUDEFS := -D_M_IX86
diff --git a/solenv/gbuild/platform/windows.mk b/solenv/gbuild/platform/WIN_INTEL_MSC.mk
index 5638d636ddcf..43e7698acbc7 100644
--- a/solenv/gbuild/platform/windows.mk
+++ b/solenv/gbuild/platform/WIN_INTEL_MSC.mk
@@ -27,7 +27,6 @@
 #*************************************************************************
 
 GUI := WNT
-COM := MSC
 
 # set tmpdir to some mixed case path, suitable for native tools
 gb_TMPDIR:=$(if $(TMPDIR),$(shell cygpath -m $(TMPDIR)),$(shell cygpath -m /tmp))
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index 49ac78bc62a7..7fa338a0e7d4 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -26,22 +26,10 @@
 #
 #*************************************************************************
 
-GUI := UNX
-COM := GCC
-
 gb_SDKDIR := $(MACOSX_SDK_PATH)
 
-ifeq ($(CPUNAME),POWERPC)
-gb_CPUDEFS := -DPPC
-else
-gb_CPUDEFS := -DX86
-endif
-
-gb_COMPILERDEFAULTOPTFLAGS := -O2
-
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
-
 # Darwin mktemp -t expects a prefix, not a pattern
 gb_MKTEMP ?= /usr/bin/mktemp -t gbuild.
 
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index ba984ff7f713..a96f90a977b9 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -27,7 +27,6 @@
 #*************************************************************************
 
 GUI := UNX
-COM := GCC
 
 gb_Executable_EXT:=