resync to DEV300_m70

16 files changed, 100 insertions, 614 deletions

diff --git a/solenv/bin/checkdll.sh b/solenv/bin/checkdll.sh
index 0400f461666e..e64b8fd2aa4c 100755
--- a/solenv/bin/checkdll.sh
+++ b/solenv/bin/checkdll.sh
@@ -60,16 +60,6 @@ if [ -x $checkdll ]; then
         *) DYLD_LIBRARY_PATH=$libpath;;
         esac
         export DYLD_LIBRARY_PATH;;
-    IRIX) case "${LD_LIBRARYN32_PATH+X}" in
-        X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
-        *) LD_LIBRARYN32_PATH=$libpath;;
-    esac
-        export LD_LIBRARYN32_PATH;;
-    IRIX64) case "${LD_LIBRARYN32_PATH+X}" in
-        X) LD_LIBRARYN32_PATH=$libpath:$LD_LIBRARYN32_PATH;;
-        *) LD_LIBRARYN32_PATH=$libpath;;
-    esac
-        export LD_LIBRARYN32_PATH;;
     *)  case "${LD_LIBRARY_PATH+X}" in
         X) LD_LIBRARY_PATH=$libpath:$LD_LIBRARY_PATH;;
         *) LD_LIBRARY_PATH=$libpath;;
diff --git a/solenv/bin/modules/osarch.pm b/solenv/bin/modules/osarch.pm
index 8c3a87e4ddc5..205e4c933193 100755
--- a/solenv/bin/modules/osarch.pm
+++ b/solenv/bin/modules/osarch.pm
@@ -27,8 +27,7 @@ chop( $m_str, $s_str );
 #              "SCO_SV",    "scouw21",
                "Darwin",    "macosxp",
                "Mac OS",    "macosxp",
-               "SINIX-N",   "sinix",
-               "IRIX",      "irix"
+               "SINIX-N",   "sinix"
                );
 
 %osDefTable = ("SunOS",     "-DSYSV -DSOLARIS",
@@ -42,8 +41,7 @@ chop( $m_str, $s_str );
 #              "SCO_SV",    "-DSYSV -DSCO -DSCO_UW21",
                "Darwin",    "-DBSD -DMACOSX",
                "Mac OS",    "-DBSD -DMACOSX",
-               "SINIX-N",   "-DSYSV -DSINIX",
-               "IRIX",      "-DSYSV -DIRIX"
+               "SINIX-N",   "-DSYSV -DSINIX"
                );
 
 %osDosTable = ("SunOS",     "sol",
@@ -56,8 +54,7 @@ chop( $m_str, $s_str );
                "SCO_SV",    "sco",
                "Darwin",    "macx",
                "Mac OS",    "macx",
-               "SINIX-N",   "sni",
-               "IRIX",      "irx"
+               "SINIX-N",   "sni"
                );
 
 %archTable  = ("sun4c",         "sparc",
diff --git a/solenv/config/sdev300.ini b/solenv/config/sdev300.ini
index be1fc69fa487..c3b6f91c9dd7 100755..100644
--- a/solenv/config/sdev300.ini
+++ b/solenv/config/sdev300.ini
@@ -885,7 +885,6 @@ unxlngx6
 			DEVROOT %SOLAR_ENV_ROOT%
 			PERL %SOLAR_ENV_ROOT%/bt_linux_libc2.32/%WORK_STAMP%/bin/perl
 			PKGFORMAT rpm
-			PTHREAD_CFLAGS -DNPTL
 			SHARED_SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SHARED_SOLARVERSION %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
 			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
@@ -2185,7 +2184,6 @@ unxubti8
 			PAM_LINK NO
 			PERL /usr/bin/perl
 			PKGFORMAT deb
-			PTHREAD_CFLAGS -DNPTL
 			SOLARENV %SOLAR_SOURCE_ROOT%/%WORK_STAMP%/ooo%UPDMINOREXT%/solenv
 			SOLARROOT %SOLAR_ENV_ROOT%
 			SOLARVER %SOLAR_SOURCE_ROOT%/%WORK_STAMP%
diff --git a/solenv/inc/_tg_shl.mk b/solenv/inc/_tg_shl.mk
index a862ec39897f..19f6e30ad175 100644
--- a/solenv/inc/_tg_shl.mk
+++ b/solenv/inc/_tg_shl.mk
@@ -100,9 +100,7 @@ $(USE_SHL1VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL1VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
 
 $(USE_SHL1VERSIONMAP): \
                     $(SHL1OBJS)\
@@ -139,9 +137,7 @@ $(USE_SHL1VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL1VERSIONMAP)"!=""
 USE_SHL1VERSIONMAP=$(MISC)/$(SHL1VERSIONMAP:b)_$(SHL1TARGET)$(SHL1VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL1VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL1VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL1VERSIONMAP): $(SHL1OBJS) $(SHL1LIBS)
@@ -189,11 +185,7 @@ $(USE_SHL1VERSIONMAP): $(SHL1VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL1SONAME=$(SONAME_SWITCH)$(SHL1TARGETN:f)
-.ELSE
 SHL1SONAME=\"$(SONAME_SWITCH)$(SHL1TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -654,9 +646,7 @@ $(USE_SHL2VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL2VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
 
 $(USE_SHL2VERSIONMAP): \
                     $(SHL2OBJS)\
@@ -693,9 +683,7 @@ $(USE_SHL2VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL2VERSIONMAP)"!=""
 USE_SHL2VERSIONMAP=$(MISC)/$(SHL2VERSIONMAP:b)_$(SHL2TARGET)$(SHL2VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL2VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL2VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL2VERSIONMAP): $(SHL2OBJS) $(SHL2LIBS)
@@ -743,11 +731,7 @@ $(USE_SHL2VERSIONMAP): $(SHL2VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL2SONAME=$(SONAME_SWITCH)$(SHL2TARGETN:f)
-.ELSE
 SHL2SONAME=\"$(SONAME_SWITCH)$(SHL2TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -1208,9 +1192,7 @@ $(USE_SHL3VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL3VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
 
 $(USE_SHL3VERSIONMAP): \
                     $(SHL3OBJS)\
@@ -1247,9 +1229,7 @@ $(USE_SHL3VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL3VERSIONMAP)"!=""
 USE_SHL3VERSIONMAP=$(MISC)/$(SHL3VERSIONMAP:b)_$(SHL3TARGET)$(SHL3VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL3VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL3VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL3VERSIONMAP): $(SHL3OBJS) $(SHL3LIBS)
@@ -1297,11 +1277,7 @@ $(USE_SHL3VERSIONMAP): $(SHL3VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL3SONAME=$(SONAME_SWITCH)$(SHL3TARGETN:f)
-.ELSE
 SHL3SONAME=\"$(SONAME_SWITCH)$(SHL3TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -1762,9 +1738,7 @@ $(USE_SHL4VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL4VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
 
 $(USE_SHL4VERSIONMAP): \
                     $(SHL4OBJS)\
@@ -1801,9 +1775,7 @@ $(USE_SHL4VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL4VERSIONMAP)"!=""
 USE_SHL4VERSIONMAP=$(MISC)/$(SHL4VERSIONMAP:b)_$(SHL4TARGET)$(SHL4VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL4VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL4VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL4VERSIONMAP): $(SHL4OBJS) $(SHL4LIBS)
@@ -1851,11 +1823,7 @@ $(USE_SHL4VERSIONMAP): $(SHL4VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL4SONAME=$(SONAME_SWITCH)$(SHL4TARGETN:f)
-.ELSE
 SHL4SONAME=\"$(SONAME_SWITCH)$(SHL4TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -2316,9 +2284,7 @@ $(USE_SHL5VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL5VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
 
 $(USE_SHL5VERSIONMAP): \
                     $(SHL5OBJS)\
@@ -2355,9 +2321,7 @@ $(USE_SHL5VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL5VERSIONMAP)"!=""
 USE_SHL5VERSIONMAP=$(MISC)/$(SHL5VERSIONMAP:b)_$(SHL5TARGET)$(SHL5VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL5VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL5VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL5VERSIONMAP): $(SHL5OBJS) $(SHL5LIBS)
@@ -2405,11 +2369,7 @@ $(USE_SHL5VERSIONMAP): $(SHL5VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL5SONAME=$(SONAME_SWITCH)$(SHL5TARGETN:f)
-.ELSE
 SHL5SONAME=\"$(SONAME_SWITCH)$(SHL5TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -2870,9 +2830,7 @@ $(USE_SHL6VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL6VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
 
 $(USE_SHL6VERSIONMAP): \
                     $(SHL6OBJS)\
@@ -2909,9 +2867,7 @@ $(USE_SHL6VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL6VERSIONMAP)"!=""
 USE_SHL6VERSIONMAP=$(MISC)/$(SHL6VERSIONMAP:b)_$(SHL6TARGET)$(SHL6VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL6VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL6VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL6VERSIONMAP): $(SHL6OBJS) $(SHL6LIBS)
@@ -2959,11 +2915,7 @@ $(USE_SHL6VERSIONMAP): $(SHL6VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL6SONAME=$(SONAME_SWITCH)$(SHL6TARGETN:f)
-.ELSE
 SHL6SONAME=\"$(SONAME_SWITCH)$(SHL6TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -3424,9 +3376,7 @@ $(USE_SHL7VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL7VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
 
 $(USE_SHL7VERSIONMAP): \
                     $(SHL7OBJS)\
@@ -3463,9 +3413,7 @@ $(USE_SHL7VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL7VERSIONMAP)"!=""
 USE_SHL7VERSIONMAP=$(MISC)/$(SHL7VERSIONMAP:b)_$(SHL7TARGET)$(SHL7VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL7VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL7VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL7VERSIONMAP): $(SHL7OBJS) $(SHL7LIBS)
@@ -3513,11 +3461,7 @@ $(USE_SHL7VERSIONMAP): $(SHL7VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL7SONAME=$(SONAME_SWITCH)$(SHL7TARGETN:f)
-.ELSE
 SHL7SONAME=\"$(SONAME_SWITCH)$(SHL7TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -3978,9 +3922,7 @@ $(USE_SHL8VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL8VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
 
 $(USE_SHL8VERSIONMAP): \
                     $(SHL8OBJS)\
@@ -4017,9 +3959,7 @@ $(USE_SHL8VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL8VERSIONMAP)"!=""
 USE_SHL8VERSIONMAP=$(MISC)/$(SHL8VERSIONMAP:b)_$(SHL8TARGET)$(SHL8VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL8VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL8VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL8VERSIONMAP): $(SHL8OBJS) $(SHL8LIBS)
@@ -4067,11 +4007,7 @@ $(USE_SHL8VERSIONMAP): $(SHL8VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL8SONAME=$(SONAME_SWITCH)$(SHL8TARGETN:f)
-.ELSE
 SHL8SONAME=\"$(SONAME_SWITCH)$(SHL8TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -4532,9 +4468,7 @@ $(USE_SHL9VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL9VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
 
 $(USE_SHL9VERSIONMAP): \
                     $(SHL9OBJS)\
@@ -4571,9 +4505,7 @@ $(USE_SHL9VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL9VERSIONMAP)"!=""
 USE_SHL9VERSIONMAP=$(MISC)/$(SHL9VERSIONMAP:b)_$(SHL9TARGET)$(SHL9VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL9VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL9VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL9VERSIONMAP): $(SHL9OBJS) $(SHL9LIBS)
@@ -4621,11 +4553,7 @@ $(USE_SHL9VERSIONMAP): $(SHL9VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL9SONAME=$(SONAME_SWITCH)$(SHL9TARGETN:f)
-.ELSE
 SHL9SONAME=\"$(SONAME_SWITCH)$(SHL9TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
@@ -5086,9 +5014,7 @@ $(USE_SHL10VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL10VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
 
 $(USE_SHL10VERSIONMAP): \
                     $(SHL10OBJS)\
@@ -5125,9 +5051,7 @@ $(USE_SHL10VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL10VERSIONMAP)"!=""
 USE_SHL10VERSIONMAP=$(MISC)/$(SHL10VERSIONMAP:b)_$(SHL10TARGET)$(SHL10VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL10VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL10VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL10VERSIONMAP): $(SHL10OBJS) $(SHL10LIBS)
@@ -5175,11 +5099,7 @@ $(USE_SHL10VERSIONMAP): $(SHL10VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL10SONAME=$(SONAME_SWITCH)$(SHL10TARGETN:f)
-.ELSE
 SHL10SONAME=\"$(SONAME_SWITCH)$(SHL10TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk
index b27b78230620..c81283b50ebb 100644
--- a/solenv/inc/minor.mk
+++ b/solenv/inc/minor.mk
@@ -1,5 +1,5 @@
 RSCVERSION=300
-RSCREVISION=300m68(Build:9474)
-BUILD=9474
-LAST_MINOR=m68
+RSCREVISION=300m70(Build:9478)
+BUILD=9478
+LAST_MINOR=m70
 SOURCEVERSION=DEV300
diff --git a/solenv/inc/postset.mk b/solenv/inc/postset.mk
index 30bb91599903..4a7f6aeae28c 100644
--- a/solenv/inc/postset.mk
+++ b/solenv/inc/postset.mk
@@ -114,6 +114,7 @@ pl \
 ps \
 pt \
 pt-BR \
+ro \
 ru \
 rw \
 sat \
diff --git a/solenv/inc/tg_help.mk b/solenv/inc/tg_help.mk
new file mode 100644
index 000000000000..a8a33051f0fc
--- /dev/null
+++ b/solenv/inc/tg_help.mk
@@ -0,0 +1,86 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2008 by Sun Microsystems, Inc.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile: makefile.pmk,v $
+#
+# $Revision: 1.25 $
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+# to make it usable with special lang selection of
+# helpcontent2
+
+aux_alllangiso*:=$(alllangiso)
+
+SHELL_PACKAGE:=$(subst,/,$/ $(PACKAGE))
+HLANGXHPFILES:=$(foreach,i,$(XHPFILES) $(foreach,j,$(aux_alllangiso) $(COMMONMISC)$/$j$/$(SHELL_PACKAGE)$/$(i:f)))
+
+ALLTAR : $(COMMONMISC)$/$(TARGET).done $(COMMONMISC)$/xhp_changed.flag optix
+
+$(HLANGXHPFILES) : $$(@:d)thisdir.created
+
+$(COMMONMISC)$/{$(aux_alllangiso)}$/$(SHELL_PACKAGE)$/%.xhp :| %.xhp
+    @$(TOUCH) $@
+# internal dependencies not sufficient to trigger merge?
+#    @$(NULL)
+
+
+$(COMMONMISC)$/$(TARGET).done : $(HLANGXHPFILES)
+.IF "$(WITH_LANG)"!=""
+    $(AUGMENT_LIBRARY_PATH) $(HELPEX) -QQ -p $(PRJNAME) -r $(PRJ) -i @$(mktmp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES))))) -x $(COMMONMISC) -y $(SHELL_PACKAGE) -l all -lf $(aux_alllangiso:t",") -m $(LOCALIZESDF) && $(TOUCH) $@
+.ELSE			# "$(WITH_LANG)"!=""
+    cp $(uniq $(foreach,i,$? $(!eq,$(i:f),$(i:f:s/.xhp//) $(i:f) $(XHPFILES)))) $(COMMONMISC)$/en-US$/$(SHELL_PACKAGE) && $(TOUCH) $@
+.ENDIF			# "$(WITH_LANG)"!=""
+.IF "$(OS)"=="SOLARIS"
+    @$(ECHONL) " "
+.ELSE			# "$(OS)"=="SOLARIS"
+    @$(ECHONL)
+.ENDIF			# "$(OS)"=="SOLARIS"
+
+$(COMMONMISC)$/xhp_changed.flag : $(HLANGXHPFILES)
+    @$(TOUCH) $@
+
+# urks - dmake mixes up operators and strings :-(
+.IF "$(HLANGXHPFILES:s/defined/xxx/)"!=""
+
+.IF "$(HELPTRANSPHONY)"!=""
+$(COMMONMISC)$/$(TARGET).done .PHONY :
+.ELSE           # "$(HELPTRANSPHONY)"!=""
+
+$(COMMONMISC)$/$(TARGET).done : makefile.mk
+.IF "$(WITH_LANG)"!=""
+$(COMMONMISC)$/$(TARGET).done : $(LOCALIZESDF)
+.ENDIF			# "$(WITH_LANG)"!=""
+.ENDIF          # "$(HELPTRANSPHONY)"!=""
+.ENDIF          # "$(HLANGXHPFILES)"!=""
+
+optix: $(COMMONMISC)$/$(TARGET).done
+    @echo done
+
+%.created :
+    @@-$(MKDIRHIER) $(@:d)
+    @$(TOUCH) $@
+
+
diff --git a/solenv/inc/tg_shl.mk b/solenv/inc/tg_shl.mk
index 496e95926981..8cb6653f334e 100644
--- a/solenv/inc/tg_shl.mk
+++ b/solenv/inc/tg_shl.mk
@@ -133,9 +133,7 @@ $(USE_SHL$(TNR)VERSIONMAP) .PHONY:
 
 .ENDIF			# "$(SHL$(TNR)VERSIONMAP)"!=""
 
-.IF "$(OS)"!="IRIX"
 SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
 
 $(USE_SHL$(TNR)VERSIONMAP): \
                     $(SHL$(TNR)OBJS)\
@@ -172,9 +170,7 @@ $(USE_SHL$(TNR)VERSIONMAP) :
 #and now for the plain non-generic way...
 .IF "$(SHL$(TNR)VERSIONMAP)"!=""
 USE_SHL$(TNR)VERSIONMAP=$(MISC)/$(SHL$(TNR)VERSIONMAP:b)_$(SHL$(TNR)TARGET)$(SHL$(TNR)VERSIONMAP:e)
-.IF "$(OS)"!="IRIX"
 SHL$(TNR)VERSIONMAPPARA=$(LINKVERSIONMAPFLAG) $(USE_SHL$(TNR)VERSIONMAP)
-.ENDIF
 
 .IF "$(OS)"=="MACOSX"
 $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)OBJS) $(SHL$(TNR)LIBS)
@@ -222,11 +218,7 @@ $(USE_SHL$(TNR)VERSIONMAP): $(SHL$(TNR)VERSIONMAP)
 .IF "$(UNIXVERSIONNAMES)"!=""
 .IF "$(OS)"!="MACOSX"
 .IF "$(GUI)"=="UNX"
-.IF "$(OS)"=="IRIX"
-SHL$(TNR)SONAME=$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)
-.ELSE
 SHL$(TNR)SONAME=\"$(SONAME_SWITCH)$(SHL$(TNR)TARGETN:f)\"
-.ENDIF
 .ENDIF			# "$(GUI)"!="UNX"
 .ENDIF			# "$(OS)"!="MACOSX"
 .ENDIF			# "$(UNIXVERSIONNAMES)"!=""
diff --git a/solenv/inc/unx.mk b/solenv/inc/unx.mk
index bb5a4864484d..36e5cd70447f 100644
--- a/solenv/inc/unx.mk
+++ b/solenv/inc/unx.mk
@@ -151,18 +151,6 @@
 .INCLUDE : unxfbsd.mk
 .ENDIF
 
-.IF "$(COM)$(OS)$(CPU)" == "C730IRIXM"
-.INCLUDE : unxirxm3.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "GCCIRIXM"
-.INCLUDE : unxirgm.mk
-.ENDIF
-
-.IF "$(COM)$(OS)$(CPU)" == "C710IRIXM"
-.INCLUDE : unxirxm.mk
-.ENDIF
-
 .IF "$(COM)$(OS)$(CPU)" == "GCCMACOSXP"
 .INCLUDE : unxmacxp.mk
 .ENDIF
diff --git a/solenv/inc/unxirgm.mk b/solenv/inc/unxirgm.mk
deleted file mode 100644
index b3abfb76d2c3..000000000000
--- a/solenv/inc/unxirgm.mk
+++ /dev/null
@@ -1,163 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unxirgm.mk,v $
-#
-# $Revision: 1.15 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# Makefile for IRIX/mips using GNU compilers 2.95.2 for n32 ABI
-ASM=
-AFLAGS=
-
-SOLAR_JAVA=TRUE
-JAVADEF=-DSOLAR_JAVA
-#JAVAFLAGSDEBUG=-g
-
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC= gcc
-CXX= g++
-CFLAGS=-c
-CDEFS+= -D_PTHREADS -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSCXX=$(ARCH_FLAGS)
-PICSWITCH:=-fpic
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=$(PICSWITCH)
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=$(PICSWITCH)
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL= 
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-w
-CFLAGSWALLCC=-Wall
-CFLAGSWERRCC=-Werror
-
-# exception flags
-CFLAGSEXCEPTIONS=-fexceptions
-CFLAGS_NO_EXCEPTIONS=-fno-exceptions
-
-STATIC=			-Wl,-Bstatic
-DYNAMIC=		-Wl,-Bdynamic
-
-#
-# To use the map files, you need to have a gcc_specs file which contains:
-# *linker:
-# /path/to/bin/ld.sh
-# where ld.sh is a wrapper script that does some conversion of the
-# map files on the fly.
-#
-LINK= g++
-LINKFLAGS=	-L/usr/lib32 -Wl,-no_unresolved
-LINKVERSIONMAPFLAG= -Wl,-exports_file
-
-LINKFLAGSAPPGUI= $(THREADLIB)
-LINKFLAGSAPPCUI= $(THREADLIB)
-LINKFLAGSSHLGUI= $(THREADLIB)
-LINKFLAGSSHLCUI= $(THREADLIB)
-
-LINKFLAGSAPPGUI+= -Wl,-multigot
-LINKFLAGSAPPCUI+= -Wl,-multigot
-LINKFLAGSSHLGUI+= -shared 
-LINKFLAGSSHLCUI+= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG= -g
-LINKFLAGSOPT=
-
-LINKFLAGSSHLGUI += -Wl,-Bsymbolic
-LINKFLAGSSHLCUI += -Wl,-Bsymbolic
-
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-SONAME_SWITCH = -Wl,-soname -Wl,
-
-# Sequence of libraries DOES matter!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDLIBCUIMT=	$(THREADLIB) $(DYNAMIC) -lgcc -lc -lm
-STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lgcc -lc
-STDSHLCUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lgcc -lc
-THREADLIB=		-lpthread
-
-.IF "$(STLPORT_VER)" >= "500"
-LIBSTLPORT=$(DYNAMIC) -lstlport
-LIBSTLPORTST= -lstlport
-.ELSE
-LIBSTLPORT=$(DYNAMIC) -lstlport_gcc
-LIBSTLPORTST= -lstlport_gcc
-.ENDIF
-
-LIBMGR=			ar
-LIBFLAGS=		-r
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=				irc
-RCFLAGS=		-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=		im
-DLLPRE=			lib
-DLLPOST=		.so
-
-
-LDUMP=c++filt
diff --git a/solenv/inc/unxirxm.mk b/solenv/inc/unxirxm.mk
deleted file mode 100644
index 80aae3d5b382..000000000000
--- a/solenv/inc/unxirxm.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unxirxm.mk,v $
-#
-# $Revision: 1.10 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-# mak-file for IRIX/mips
-ASM=
-AFLAGS=
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-#
-# Zu den Compilerflags:
-#
-# -ptused :		instantisiert Templates, wenn sie benutzt werden.
-#				Der Schalter wurde neu eingefuegt, weil sich eine 
-#				statische Memberfunktion nicht instantisieren liess.
-#				(ts&sdo/10.06.98)
-#
-CC=			cc -KPIC -c -n32
-CXX=		CC -KPIC -c -n32 -ptused -OPT:Olimit=20523 
-CDEFS+=-D_PTHREADS
-CDEFS+=	-D_STD_NO_NAMESPACE -D_VOS_NO_NAMESPACE -D_UNO_NO_NAMESPACE
-# 1009    ...nested comment is not allowed...
-# 1021    ...type qualifiers are meaningless in this declaration...
-# 1107    ...signed bit field of length 1...
-# 1110    ...statement not reached...
-# 1155    ...unrecognized #pragma...
-# 1171    ...expression has no effect...
-# 1183    ...comparison of unsigned integer with zero... 
-# 1185    ...enumerated type mixed with another type... 
-# 1188    ...type qualifier is meaningless on cast type... 
-# 1233    ...explicit type is missing ("int" assumed)...
-# 1234    ...access control not specified...
-# 1257    ...NULL reference is not allowed...
-# 1440    ...initial value of reference to non-const must be an lvalue...
-# 1516    ...pointless comparison of unsigned integer with a negative constant
-# 1681    ...virtual function override intended...
-# 1682    ...is only partially overridden in class...
-CFLAGSCC=	-Xcpluscomm -woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
-CFLAGSCXX=	-woff 1009,1021,1107,1110,1155,1171,1183,1185,1188,1233,1234,1257,1440,1516,1681,1682 $(ARCH_FLAGS)
-CFLAGSOBJGUIMT=
-CFLAGSOBJCUIMT=
-CFLAGSSLOGUIMT=
-CFLAGSSLOCUIMT=
-CFLAGSPROF=
-CFLAGSDEBUG=	-g
-CFLAGSDBGUTIL=
-CFLAGSOPT=		-O
-CFLAGSNOOPT=
-CFLAGSOUTOBJ=	-o
-
-STATIC=			-B static
-DYNAMIC=		-B dynamic
-
-#
-# Zu den Linkflags:
-#
-# -update_registry <file> :	fuer das Linken mehrerer shared Libraries 
-#				erforderlich. 
-#				**FUER LOKALE STAENDE FEHLT Z.ZT. EIN GULTIGER 
-#				MECHANISMUS**					
-#
-LINK=			CC
-LINKFLAGS=		
-LINKFLAGSAPPGUI=-n32 -multigot
-LINKFLAGSSHLGUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
-LINKFLAGSAPPCUI=-n32 -multigot
-LINKFLAGSSHLCUI=-B symbolic -soname $(DLLPRE)$(SHL$(TNR)TARGET)$(DLLPOSTFIX)$(DLLPOST) $(DYNAMIC) -shared -n32 -multigot -update_registry $(SOLARLIBDIR)/so_locations
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG=
-LINKFLAGSOPT=
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-# Reihenfolge der Libraries NICHT egal!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-# STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDLIBGUIMT=	$(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDLIBCUIMT=	$(THREADLIB) $(DYNAMIC) -lc -lm
-# STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDSHLGUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lc -lm
-STDSHLCUIMT=	-L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lc -lm
-THREADLIB=		-lpthread
-
-LIBMGR=			ar
-LIBFLAGS=		-r
-# LIBEXT=		.so
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=				irc
-RCFLAGS=		-fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=		im
-.IF "$(WORK_STAMP)"=="MIX364"
-DLLPOSTFIX=
-.ENDIF
-DLLPRE=			lib
-DLLPOST=		.so
-
-
-LDUMP=
-
-
-# --------------------------
-# AUS DEM ALTEN ENVIRONMENT:
-# --------------------------
-#
-# Linken einer statischen Library:
-#	ar -r ...
-#
-# Linken einer shared Library:
-#	CC -B symbolic -soname <...> -B dynamic -shared -n32 -multigot
-#		-update_registry <...> ...
-#
-# Linken einer Applikation mit statischen Librarys:
-#	CC -B static ...
-#
-# Linken einer Applikation mit stared Librarys:
-#	CC -n32 -multigot ...
-#
-
diff --git a/solenv/inc/unxirxm3.mk b/solenv/inc/unxirxm3.mk
deleted file mode 100644
index 8d24d2c54032..000000000000
--- a/solenv/inc/unxirxm3.mk
+++ /dev/null
@@ -1,162 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-# 
-# Copyright 2008 by Sun Microsystems, Inc.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# $RCSfile: unxirxm3.mk,v $
-#
-# $Revision: 1.12 $
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org.  If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-
-# Makefile for IRIX/mips
-ASM=
-AFLAGS=
-
-SOLAR_JAVA*=TRUE
-JAVADEF=-DSOLAR_JAVA
-#JAVAFLAGSDEBUG=-g
-
-.IF "$(debug)"==""
-JAVA_RUNTIME=-ljava
-.ELSE
-JAVA_RUNTIME=-ljava_g
-.ENDIF
-
-# architecture dependent flags for the C and C++ compiler that can be changed by
-# exporting the variable ARCH_FLAGS="..." in the shell, which is used to start build
-ARCH_FLAGS*=
-
-CC= cc
-CXX= CC
-CFLAGS= -c
-CDEFS+= -DSTLPORT_VERSION=0x450 -D_USE_NAMESPACE=1 -DNEW_SOLAR
-CFLAGSCC=$(ARCH_FLAGS)
-CFLAGSCXX=      -LANG:ansi-for-init-scope=OFF -LANG:std=ON -LANG:libc_in_namespace_std=ON $(ARCH_FLAGS)
-
-# Compiler flags for compiling static object in multi threaded environment with graphical user interface
-CFLAGSOBJGUIMT=
-# Compiler flags for compiling static object in multi threaded environment with character user interface
-CFLAGSOBJCUIMT=
-# Compiler flags for compiling shared object in multi threaded environment with graphical user interface
-CFLAGSSLOGUIMT=-KPIC
-# Compiler flags for compiling shared object in multi threaded environment with character user interface
-CFLAGSSLOCUIMT=-KPIC
-# Compiler flags for profiling
-CFLAGSPROF=
-# Compiler flags for debugging
-CFLAGSDEBUG=-g
-CFLAGSDBGUTIL=
-# Compiler flags for enabling optimizations
-CFLAGSOPT=-O2
-# Compiler flags for disabling optimizations
-CFLAGSNOOPT=-O0
-# Compiler flags for describing the output path
-CFLAGSOUTOBJ=-o
-
-CFLAGSWARNCC=-w
-CFLAGSWALLCC=-fullwarn
-CFLAGSWERRCC=
-
-# exception flags
-CFLAGSEXCEPTIONS=-LANG:exceptions=ON
-CFLAGS_NO_EXCEPTIONS=-LANG:exceptions=OFF
-#CFLAGS_NO_EXCEPTIONS=
-
-STATIC=                 -Wl,-Bstatic
-DYNAMIC=                -Wl,-Bdynamic
-
-#
-# To use the map files, you need to have a gcc_specs file which contains:
-# *linker:
-# /path/to/bin/ld.sh
-# where ld.sh is a wrapper script that does some conversion of the
-# map files on the fly.
-#
-LINK= CC
-LINKFLAGS=      -L/usr/lib32 -Wl,-no_unresolved
-LINKVERSIONMAPFLAG= -Wl,-exports_file
-
-LINKFLAGSAPPGUI= $(THREADLIB)
-LINKFLAGSAPPCUI= $(THREADLIB)
-LINKFLAGSSHLGUI= $(THREADLIB)
-LINKFLAGSSHLCUI= $(THREADLIB)
-
-LINKFLAGSAPPGUI+= -Wl,-multigot
-LINKFLAGSAPPCUI+= -Wl,-multigot
-LINKFLAGSSHLGUI+= -shared
-LINKFLAGSSHLCUI+= -shared
-
-LINKFLAGSTACK=
-LINKFLAGSPROF=
-LINKFLAGSDEBUG= -g
-LINKFLAGSOPT=
-
-LINKFLAGSSHLGUI += -Wl,-Bsymbolic
-LINKFLAGSSHLCUI += -Wl,-Bsymbolic
-
-APPLINKSTATIC=-Bstatic
-APPLINKSHARED=-Bsymbolic
-
-SONAME_SWITCH = -Wl,-soname -Wl,
-
-# Sequence of libraries DOES matter!
-STDOBJGUI=
-STDSLOGUI=
-STDOBJCUI=
-STDSLOCUI=
-STDLIBGUIMT=    $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
-STDLIBCUIMT=    $(THREADLIB) $(DYNAMIC) -lc -lm
-STDSHLGUIMT=    -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lX11 -lm -lc
-STDSHLCUIMT=    -L/usr/lib32 $(THREADLIB) $(DYNAMIC) -lm -lc
-THREADLIB=              -lpthread
-
-#LIBSTLPORT=$(DYNAMIC) -lstlport_mipspro
-LIBSTLPORT=$(DYNAMIC)
-LIBSTLPORTST=
-#LIBSTLPORTST= -lstlport_mipspro
-
-LIBMGR=                 ar
-LIBFLAGS=               -r
-
-IMPLIB=
-IMPLIBFLAGS=
-
-MAPSYM=
-MAPSYMFLAGS=
-
-RC=                             irc
-RCFLAGS=                -fo$@ $(RCFILES)
-RCLINK=
-RCLINKFLAGS=
-RCSETVERSION=
-
-DLLPOSTFIX=             im
-DLLPRE=                 lib
-DLLPOST=                .so
-
-
-LDUMP=c++filt
-
-
diff --git a/solenv/inc/unxlng.mk b/solenv/inc/unxlng.mk
index a79d3e47c6cf..b6c8f798a5f9 100644
--- a/solenv/inc/unxlng.mk
+++ b/solenv/inc/unxlng.mk
@@ -47,7 +47,7 @@ JAVAFLAGSDEBUG=-g
 #LINKOUTPUT_FILTER=" |& $(SOLARENV)/bin/msg_filter"
 
 # _PTHREADS is needed for the stl
-CDEFS+=$(PTHREAD_CFLAGS) -DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
+CDEFS+=-DGLIBC=2 -D_PTHREADS -D_REENTRANT -DNEW_SOLAR -D_USE_NAMESPACE=1 -DSTLPORT_VERSION=$(STLPORT_VER)
 
 # enable visibility define in "sal/types.h"
 .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
@@ -208,12 +208,14 @@ LINKFLAGS += -Wl,-zdynsort
 .ENDIF
 
 # libraries for linking applications
-STDLIBGUIMT+=-Wl,--as-needed -lX11 -ldl -lpthread -lm -Wl,--no-as-needed
+STDLIBGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 STDLIBCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 # libraries for linking shared libraries
-STDSHLGUIMT+=-Wl,--as-needed -lX11 -lXext -ldl -lpthread -lm -Wl,--no-as-needed
+STDSHLGUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 STDSHLCUIMT+=-Wl,--as-needed -ldl -lpthread -lm -Wl,--no-as-needed
 
+X11LINK_DYNAMIC = -Wl,--as-needed -lXext -lX11 -Wl,--no-as-needed
+
 LIBSALCPPRT*=-Wl,--whole-archive -lsalcpprt -Wl,--no-whole-archive
 
 .IF "$(USE_STLP_DEBUG)" != ""
diff --git a/solenv/inc/unxmacxi.mk b/solenv/inc/unxmacxi.mk
index 6d27121366e5..09d5d424b690 100644
--- a/solenv/inc/unxmacxi.mk
+++ b/solenv/inc/unxmacxi.mk
@@ -55,7 +55,6 @@ CFLAGSENABLESYMBOLS=-g
 
 .IF "$(SNOW_LEOPARD_10_4)"!=""
 JAVACOMPILER+=-target 1.5
-DYLD_INSERT_LIBRARIES=/usr/lib/libsqlite3.dylib
 .EXPORT: DYLD_INSERT_LIBRARIES
 .ENDIF # "$(SNOW_LEOPARD_10_4)"!=""
 
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index afcea59a9971..c4c777376561 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -199,7 +199,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
 # libdl.so - no really an GUI library but required in this context
 STDLIBGUIMT+=-ldl
 STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lX11
+X11LINK_DYNAMIC = -lXext -lX11
 
 # @@@ interposer needed for -Bdirect @@@
 # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index a28b097e13b4..67bafa3a1c14 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -205,7 +205,7 @@ STDSHLCUIMT=$(DYNAMIC) -lpthread CPPRUNTIME -lm -lc
 # libdl.so - no really an GUI library but required in this context
 STDLIBGUIMT+=-ldl
 STDSHLGUIMT+=-ldl
-X11LINK_DYNAMIC = -lX11
+X11LINK_DYNAMIC = -lXext -lX11
 
 # @@@ interposer needed for -Bdirect @@@
 # LIBSALCPPRT*=-z allextract -lsalcpprt -z defaultextract