fdo#42783: remove CPU variable from environment

Replace uses with CPUNAME instead, and get rid of the horrible
postgresql patch that worked around environment leakage.

Change-Id: I38ccabfc438360524a272901bb9332ea708e274c

10 files changed, 34 insertions, 120 deletions

diff --git a/bridges/Library_cpp_uno.mk b/bridges/Library_cpp_uno.mk
index 699d4c84bbc9..79d211948466 100644
--- a/bridges/Library_cpp_uno.mk
+++ b/bridges/Library_cpp_uno.mk
@@ -9,13 +9,13 @@
 
 $(eval $(call gb_Library_Library,$(gb_CPPU_ENV)_uno))
 
-ifeq ($(OS)$(CPU),AIXP)
+ifeq ($(OS)-$(CPUNAME),AIX-POWERPC)
 
 bridges_SELECTED_BRIDGE := gcc3_aix_powerpc
 bridge_exception_objects := except
 bridge_cxx_objects := cpp2uno uno2cpp
 
-else ifeq ($(CPU),R)
+else ifeq ($(CPUNAME),ARM)
 
 ifeq ($(OS),IOS)
 $(eval $(call gb_Library_use_sdk_api,gcc3_uno))
@@ -35,25 +35,25 @@ $(call gb_LinkTarget_get_target,$(call gb_Library_get_linktarget,gcc3_uno)) : \
 	EXTRAOBJECTLISTS += $(call gb_CustomTarget_get_workdir,bridges/source/cpp_uno/gcc3_linux_arm)/armhelper.objectlist
 endif
 
-else ifeq ($(OS)$(CPU),LINUXL)
+else ifeq ($(OS)-$(CPUNAME),LINUX-AXP)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_alpha
 bridge_exception_objects := cpp2uno except uno2cpp
 
-else ifeq ($(OS)$(CPU),LINUXH)
+else ifeq ($(OS)-$(CPUNAME),LINUX-HPPA)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_hppa
 bridge_asm_objects := call
 bridge_noopt_objects := cpp2uno except uno2cpp
 
-else ifeq ($(OS)$(CPU),LINUXA)
+else ifeq ($(OS)-$(CPUNAME),LINUX-IA64)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_ia64
 bridge_asm_objects := call
 bridge_exception_objects := except
 bridge_noopt_objects := cpp2uno uno2cpp
 
-else ifeq ($(CPU),I)
+else ifeq ($(CPUNAME),INTEL)
 
 ifneq ($(filter ANDROID DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_intel
@@ -75,12 +75,12 @@ bridge_noopt_objects := uno2cpp
 bridge_exception_objects := callvirtualmethod cpp2uno dllinit except smallstruct
 endif
 
-else ifeq ($(OS)$(CPU),LINUX6)
+else ifeq ($(OS)-$(CPUNAME),LINUX-M68K)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_m68k
 bridge_noopt_objects := cpp2uno except uno2cpp
 
-else ifeq ($(CPU),M)
+else ifeq ($(CPUNAME),GODSON)
 
 ifneq ($(filter ANDROID LINUX,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_mips
@@ -88,36 +88,36 @@ bridge_noopt_objects := cpp2uno uno2cpp
 bridge_exception_objects := except
 endif
 
-else ifeq ($(OS)$(CPUNAME),LINUXPOWERPC)
+else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_powerpc
 bridge_noopt_objects := uno2cpp
 bridge_exception_objects := cpp2uno except
 
-else ifeq ($(OS)$(CPUNAME),LINUXPOWERPC64)
+else ifeq ($(OS)-$(CPUNAME),LINUX-POWERPC64)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_powerpc64
 bridge_noopt_objects := cpp2uno uno2cpp
 bridge_exception_objects := except
 
-else ifeq ($(OS)$(CPUNAME),LINUXS390)
+else ifeq ($(OS)-$(CPUNAME),LINUX-S390)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_s390
 bridge_exception_objects := cpp2uno except uno2cpp
 
-else ifeq ($(OS)$(CPUNAME),LINUXS390X)
+else ifeq ($(OS)-$(CPUNAME),LINUX-S390X)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_s390x
 bridge_exception_objects := cpp2uno except uno2cpp
 
-else ifeq ($(OS)$(CPU),LINUXS)
+else ifeq ($(OS)-$(CPUNAME),LINUX-SPARC)
 
 bridges_SELECTED_BRIDGE := gcc3_linux_sparc
 bridge_asm_objects := call
 bridge_noopt_objects := except
 bridge_exception_objects := cpp2uno uno2cpp
 
-else ifeq ($(CPU),X)
+else ifeq ($(CPUNAME),X86_64)
 
 ifneq ($(filter DRAGONFLY FREEBSD LINUX NETBSD OPENBSD,$(OS)),)
 bridges_SELECTED_BRIDGE := gcc3_linux_x86-64
@@ -140,12 +140,12 @@ bridge_noncallexception_noopt_objects := callvirtualmethod
 bridge_exception_objects := abi cpp2uno except uno2cpp
 endif
 
-else ifeq ($(OS)$(CPU),SOLARISI)
+else ifeq ($(OS)-$(CPUNAME),SOLARIS-INTEL)
 
 bridges_SELECTED_BRIDGE := gcc3_solaris_intel
 bridge_exception_objects := cpp2uno except uno2cpp
 
-else ifeq ($(OS)$(CPU),SOLARISS)
+else ifeq ($(OS)-$(CPUNAME),SOLARIS-SPARC)
 
 bridges_SELECTED_BRIDGE := gcc3_solaris_sparc
 bridge_noopt_objects := cpp2uno uno2cpp
diff --git a/bridges/Module_bridges.mk b/bridges/Module_bridges.mk
index 6c4e3bf6bd3a..534efda6936b 100644
--- a/bridges/Module_bridges.mk
+++ b/bridges/Module_bridges.mk
@@ -16,7 +16,7 @@ $(eval $(call gb_Module_add_targets,bridges,\
 		Library_java_uno \
 		$(if $(filter MACOSX,$(OS)),Package_jnilib_java_uno) \
 	) \
-	$(if $(filter R,$(CPU)),\
+	$(if $(filter ARM,$(CPUNAME)),\
 		$(if $(filter IOS,$(OS)),\
 			CustomTarget_gcc3_ios_arm) \
 		$(if $(filter ANDROID LINUX,$(OS)),\
diff --git a/config_host.mk.in b/config_host.mk.in
index 7b000384a459..4633b6e6dc82 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -68,7 +68,6 @@ export COM_GCC_IS_CLANG=@COM_GCC_IS_CLANG@
 export CPP_LIBRARY=@CPP_LIBRARY@
 export CPPUNIT_CFLAGS=$(gb_SPACE)@CPPUNIT_CFLAGS@
 export CPPUNIT_LIBS=$(gb_SPACE)@CPPUNIT_LIBS@
-export CPU=@CPU@
 export CPUNAME=@CPUNAME@
 export CROSS_COMPILING=@CROSS_COMPILING@
 export CURL=@CURL@
diff --git a/configure.ac b/configure.ac
index 563d8991c2a1..3fbfdcdb169e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3839,7 +3839,7 @@ AC_SUBST(x_OBJCXXFLAGS)
 AC_SUBST(x_LDFLAGS)
 
 #
-# determine CPU, CPUNAME, GUIBASE, ...
+# determine CPUNAME, GUIBASE, ...
 #
 LIB64="lib"
 SOLARINC=
@@ -3848,7 +3848,6 @@ case "$host_os" in
 
 aix*)
     COM=GCC
-    CPU=P
     CPUNAME=POWERPC
     GUIBASE=unx
     OS=AIX
@@ -3869,14 +3868,12 @@ cygwin*)
     case "$host_cpu" in
     i*86|x86_64)
         if test "$BITNESS_OVERRIDE" = 64; then
-            CPU=X
             CPUNAME=X86_64
             RTL_ARCH=X86_64
             LIB64="lib/x64"
             PLATFORMID=windows_x86_64
             OUTPATH=wntmscx$COMEX
         else
-            CPU=I
             CPUNAME=INTEL
             RTL_ARCH=x86
             PLATFORMID=windows_x86
@@ -3899,7 +3896,6 @@ darwin*)
 
     case "$host_cpu" in
     arm*)
-        CPU=R
         CPUNAME=ARM
         RTL_ARCH=ARM_EABI
         PLATFORMID=ios_arm
@@ -3911,7 +3907,6 @@ darwin*)
         if test "$BITNESS_OVERRIDE" = 64; then
             AC_MSG_ERROR([Can't build 64-bit code in 32-bit OS])
         fi
-        CPU=I
         CPUNAME=INTEL
         RTL_ARCH=x86
         PLATFORMID=macosx_x86
@@ -3919,13 +3914,11 @@ darwin*)
         ;;
     x86_64)
         if test "$BITNESS_OVERRIDE" = 64; then
-            CPU=X
             CPUNAME=X86_64
             RTL_ARCH=X86_64
             PLATFORMID=macosx_x86_64
             OUTPATH=unxmacxx
         else
-            CPU=I
             CPUNAME=INTEL
             RTL_ARCH=x86
             PLATFORMID=macosx_x86
@@ -3948,13 +3941,11 @@ dragonfly*)
 
     case "$host_cpu" in
     i*86)
-        CPU=I
         CPUNAME=INTEL
         RTL_ARCH=x86
         PLATFORMID=dragonfly_x86
         ;;
     x86_64)
-        CPU=X
         CPUNAME=X86_64
         RTL_ARCH=X86_64
         PLATFORMID=dragonfly_x86_64
@@ -3975,14 +3966,12 @@ freebsd*)
 
     case "$host_cpu" in
     i*86)
-        CPU=I
         CPUNAME=INTEL
         RTL_ARCH=x86
         PLATFORMID=freebsd_x86
         OUTPATH=unxfbsdi
         ;;
     x86_64)
-        CPU=X
         CPUNAME=X86_64
         RTL_ARCH=X86_64
         PLATFORMID=freebsd_x86_64
@@ -4003,14 +3992,12 @@ kfreebsd*)
     case "$host_cpu" in
 
     i*86)
-        CPU=I
         CPUNAME=INTEL
         RTL_ARCH=x86
         PLATFORMID=kfreebsd_x86
         OUTPATH=unxkfgi6
         ;;
     x86_64)
-        CPU=X
         CPUNAME=X86_64
         RTL_ARCH=X86_64
         LIB64="lib64"
@@ -4033,14 +4020,12 @@ linux-gnu*)
     case "$host_cpu" in
 
     alpha)
-        CPU=L
         CPUNAME=AXP
         RTL_ARCH=ALPHA
         PLATFORMID=linux_alpha
         OUTPATH=unxlngaxp
         ;;
     arm*)
-        CPU=R
         CPUNAME=ARM
         EPM_FLAGS="-a arm"
         OUTPATH=unxlngr
@@ -4054,7 +4039,6 @@ linux-gnu*)
         esac
         ;;
     hppa)
-        CPU=H
         CPUNAME=HPPA
         RTL_ARCH=HPPA
         EPM_FLAGS="-a hppa"
@@ -4062,21 +4046,18 @@ linux-gnu*)
         OUTPATH=unxlnghppa
         ;;
     i*86)
-        CPU=I
         CPUNAME=INTEL
         RTL_ARCH=x86
         PLATFORMID=linux_x86
         OUTPATH=unxlngi6
         ;;
     ia64)
-        CPU=A
         CPUNAME=IA64
         RTL_ARCH=IA64
         PLATFORMID=linux_ia64
         OUTPATH=unxlnga
         ;;
     mips)
-        CPU=M
         CPUNAME=GODSON
         RTL_ARCH=MIPS_EB
         EPM_FLAGS="-a mips"
@@ -4084,7 +4065,6 @@ linux-gnu*)
         OUTPATH=unxlngmips
         ;;
     mips64)
-        CPU=M
         CPUNAME=GODSON
         RTL_ARCH=MIPS_EB
         EPM_FLAGS="-a mips64"
@@ -4092,7 +4072,6 @@ linux-gnu*)
         OUTPATH=unxlngmips
         ;;
     mips64el)
-        CPU=M
         CPUNAME=GODSON
         RTL_ARCH=MIPS_EL
         EPM_FLAGS="-a mips64el"
@@ -4100,7 +4079,6 @@ linux-gnu*)
         OUTPATH=unxlngmips
         ;;
     mipsel)
-        CPU=M
         CPUNAME=GODSON
         RTL_ARCH=MIPS_EL
         EPM_FLAGS="-a mipsel"
@@ -4108,21 +4086,18 @@ linux-gnu*)
         OUTPATH=unxlngmips
         ;;
     m68k)
-        CPU=6
         CPUNAME=M68K
         RTL_ARCH=M68K
         PLATFORMID=linux_m68k
         OUTPATH=unxlngm68k
         ;;
     powerpc)
-        CPU=P
         CPUNAME=POWERPC
         RTL_ARCH=PowerPC
         PLATFORMID=linux_powerpc
         OUTPATH=unxlngppc
         ;;
     powerpc64)
-        CPU=P
         CPUNAME=POWERPC64
         RTL_ARCH=PowerPC_64
         LIB64="lib64"
@@ -4130,21 +4105,18 @@ linux-gnu*)
         OUTPATH=unxlngppc64
         ;;
     sparc)
-        CPU=S
         CPUNAME=SPARC
         RTL_ARCH=SPARC
         PLATFORMID=linux_sparc
         OUTPATH=unxlngs
         ;;
     s390)
-        CPU=3
         CPUNAME=S390
         RTL_ARCH=S390
         PLATFORMID=linux_s390
         OUTPATH=unxlngs390
         ;;
     s390x)
-        CPU=3
         CPUNAME=S390X
         RTL_ARCH=S390x
         LIB64="lib64"
@@ -4152,7 +4124,6 @@ linux-gnu*)
         OUTPATH=unxlngs390x
         ;;
     x86_64)
-        CPU=X
         CPUNAME=X86_64
         RTL_ARCH=X86_64
         LIB64="lib64"
@@ -4175,21 +4146,18 @@ linux-android*)
     case "$host_cpu" in
 
     arm|armel)
-        CPU=R
         CPUNAME=ARM
         RTL_ARCH=ARM_EABI
         PLATFORMID=android_arm_eabi
         OUTPATH=unxandr
         ;;
     mips|mipsel)
-        CPU=M
         CPUNAME=GODSON # Weird, but maybe that's the LO convention?
         RTL_ARCH=MIPS_EL
         PLATFORMID=android_mips_el
         OUTPATH=unxandm
         ;;
     i*86)
-        CPU=I
         CPUNAME=INTEL
         RTL_ARCH=x86
         PLATFORMID=android_x86
@@ -4211,14 +4179,12 @@ mingw*)
     case "$host_cpu" in
     i*86|x86_64)
         if test "$BITNESS_OVERRIDE" = 64; then
-            CPU=X
             CPUNAME=X86_64
             RTL_ARCH=X86_84
             PLATFORMID=windows_x86_64
             OUTPATH=wntgccx$COMEX
             SOLARINC="$SOLARINC -I$SRC_ROOT/include/wntgccx"
         else
-            CPU=I
             CPUNAME=INTEL
             RTL_ARCH=x86
             PLATFORMID=windows_x86
@@ -4244,25 +4210,21 @@ mingw*)
 
     case "$host_cpu" in
     i*86)
-        CPU=I
         CPUNAME=INTEL
         RTL_ARCH=x86
         PLATFORMID=netbsd_x86
         ;;
     powerpc)
-        CPU=P
         CPUNAME=POWERPC
         RTL_ARCH=PowerPC
         PLATFORMID=netbsd_powerpc
         ;;
     sparc)
-        CPU=S
         CPUNAME=SPARC
         RTL_ARCH=SPARC
         PLATFORMID=netbsd_sparc
         ;;
     x86_64)
-        CPU=X
         CPUNAME=X86_64
         RTL_ARCH=X86_64
         PLATFORMID=netbsd_x86_64
@@ -4283,13 +4245,11 @@ openbsd*)
 
     case "$host_cpu" in
     i*86)
-        CPU=I
         CPUNAME=INTEL
         RTL_ARCH=x86
         PLATFORMID=openbsd_x86
         ;;
     x86_64)
-        CPU=X
         CPUNAME=X86_64
         RTL_ARCH=X86_64
         PLATFORMID=openbsd_x86_64
@@ -4313,21 +4273,18 @@ solaris*)
 
     case "$host_cpu" in
     i*86)
-        CPU=I
         CPUNAME=INTEL
         RTL_ARCH=x86
         PLATFORMID=solaris_x86
         OUTPATH=unxsogi
         ;;
     sparc)
-        CPU=S
         CPUNAME=SPARC
         RTL_ARCH=SPARC
         PLATFORMID=solaris_sparc
         OUTPATH=unxsogs
         ;;
     sparc64)
-        CPU=U
         CPUNAME=SPARC64
         RTL_ARCH=SPARC64
         PLATFORMID=solaris_sparc64
@@ -4360,7 +4317,6 @@ INSTDIR="${BUILDDIR}/instdir/${INPATH}"
 INSTROOT="${INSTDIR}${INSTROOTSUFFIX}"
 SOLARINC="-I. -I$SRC_ROOT/include $SOLARINC"
 AC_SUBST(COM)
-AC_SUBST(CPU)
 AC_SUBST(CPUNAME)
 AC_SUBST(RTL_OS)
 AC_SUBST(RTL_ARCH)
@@ -4445,7 +4401,7 @@ if test "$cross_compiling" = "yes"; then
     cp configure CONF-FOR-BUILD
     test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host 2>/dev/null
     (
-    unset COM GUIBASE OS CPU CPUNAME
+    unset COM GUIBASE OS CPUNAME
     unset CC CXX SYSBASE CFLAGS
     unset AR NM OBJDUMP PKG_CONFIG RANLIB STRIP
     unset CPPUNIT_CFLAGS CPPUNIT_LIBS
diff --git a/download.lst b/download.lst
index 00431f0bf914..7a56e0ddb493 100644
--- a/download.lst
+++ b/download.lst
@@ -103,6 +103,6 @@ export WPS_TARBALL := 46eb0e7f213ad61bd5dee0c494132cb0-libwps-0.2.9.tar.bz2
 export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 export ZLIB_TARBALL := 2ab442d169156f34c379c968f3f482dd-zlib-1.2.7.tar.bz2
 
-export MOZ_ZIP_INC := $(OS)$(COM)$(CPU)inc.zip
-export MOZ_ZIP_LIB := $(OS)$(COM)$(CPU)lib.zip
-export MOZ_ZIP_RUNTIME := $(OS)$(COM)$(CPU)runtime.zip
+export MOZ_ZIP_INC := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)inc.zip
+export MOZ_ZIP_LIB := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)lib.zip
+export MOZ_ZIP_RUNTIME := $(OS)$(COM)$(if $(filter INTEL,$(CPUNAME)),I,X)runtime.zip
diff --git a/external/mingw-externals/CustomTarget_jawt.mk b/external/mingw-externals/CustomTarget_jawt.mk
index 2d35d93a24c2..1fb5fa872eb2 100644
--- a/external/mingw-externals/CustomTarget_jawt.mk
+++ b/external/mingw-externals/CustomTarget_jawt.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_CustomTarget_register_targets,external/jawt,\
 	libjawt.dll.a \
 ))
 
-ifeq ($(OS)$(CPU),WNTX)
+ifeq ($(OS)-$(CPUNAME),WNT-X86_64)
 $(call gb_CustomTarget_get_workdir,external/jawt)/jawt.def:
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
 	echo EXPORTS > $@
diff --git a/external/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
index af354e517763..0bd7a38a451a 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -19,7 +19,7 @@ $(call gb_ExternalProject_get_state_target,nss,configure):
 	$(if $(filter MSC,$(COM)),LIB="$(ILIB)") \
 	mozilla/nsprpub/configure --includedir=$(call gb_UnpackedTarball_get_dir,nss)/mozilla/dist/out/include \
 		$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
-		$(if $(filter MSCX,$(COM)$(CPU)),--enable-64bit) \
+		$(if $(filter MSC-X86_64,$(COM)-$(CPUNAME)),--enable-64bit) \
 	,,nss_configure.log)
 
 ifeq ($(OS),WNT)
@@ -28,7 +28,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject
 	$(call gb_ExternalProject_run,build,\
 		$(if $(MSVC_USE_DEBUG_RUNTIME),USE_DEBUG_RTL=1,BUILD_OPT=1) \
 		MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
-		$(if $(filter X,$(CPU)),USE_64=1) \
+		$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
 		LIB="$(ILIB)" \
 		XCFLAGS="$(SOLARINC)" \
 		$(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
@@ -58,7 +58,7 @@ endif
 else # OS!=WNT
 $(call gb_ExternalProject_get_state_target,nss,build): $(call gb_ExternalProject_get_state_target,nss,configure) $(call gb_ExternalExecutable_get_dependencies,python)
 	$(call gb_ExternalProject_run,build,\
-		$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X,$(CPU)),USE_64=1)) \
+		$(if $(filter FREEBSD LINUX MACOSX,$(OS)),$(if $(filter X86_64,$(CPUNAME)),USE_64=1)) \
 		$(if $(filter MACOSX,$(OS)),MACOS_SDK_DIR=$(MACOSX_SDK_PATH) \
 			NSS_USE_SYSTEM_SQLITE=1) \
 		$(if $(filter SOLARIS,$(OS)),NS_USE_GCC=1) \
diff --git a/external/openssl/ExternalProject_openssl.mk b/external/openssl/ExternalProject_openssl.mk
index e41adb868e5a..919e354f6d7f 100644
--- a/external/openssl/ExternalProject_openssl.mk
+++ b/external/openssl/ExternalProject_openssl.mk
@@ -19,10 +19,10 @@ $(eval $(call gb_ExternalProject_register_targets,openssl,\
 
 OPENSSL_PLATFORM := \
   $(if $(filter LINUX FREEBSD ANDROID,$(OS)),\
-    $(if $(filter I,$(CPU)),\
+    $(if $(filter INTEL,$(CPUNAME)),\
       $(if $(filter GNU/kFreeBSD,$(shell uname)),debian-kfreebsd-i386,linux-elf)\
     ,\
-      $(if $(filter X,$(CPU)),\
+      $(if $(filter X86_64,$(CPUNAME)),\
         $(if $(filter GNU/kFreeBSD,$(shell uname)),\
           debian-kfreebsd-amd64\
         ,\
@@ -34,10 +34,8 @@ OPENSSL_PLATFORM := \
     )\
   ,\
     $(if $(filter SOLARIS,$(OS)),\
-      $(if $(filter INTEL,$(CPUNAME)),\
-        $(if $(filter X,$(CPU)),solaris64-x86_64-cc,solaris-x86-cc)\
-      ,\
-        solaris-sparcv9-cc\
+      $(if $(filter INTEL,$(CPUNAME)),solaris-x86-cc,\
+        $(if $(filter X86_64,$(CPUNAME)),solaris64-x86_64-cc,solaris-sparcv9-cc)\
       )\
     ,\
       $(if $(filter IOS,$(OS)),\
@@ -47,11 +45,11 @@ OPENSSL_PLATFORM := \
           $(if $(filter GCC,$(COM)),\
             mingw\
           ,\
-            $(if $(filter I,$(CPU)),VC-WIN32,VC-WIN64A)\
+            $(if $(filter INTEL,$(CPUNAME)),VC-WIN32,VC-WIN64A)\
           )\
         ,\
           $(if $(filter MACOSX,$(OS)),\
-            $(if $(filter I,$(CPU)),darwin-i386-cc,darwin64-x86_64-cc)\
+            $(if $(filter INTEL,$(CPUNAME)),darwin-i386-cc,darwin64-x86_64-cc)\
           )\
         )\
       )\
diff --git a/external/postgresql/postgresql-9.2.1-libreoffice.patch b/external/postgresql/postgresql-9.2.1-libreoffice.patch
index 87d3da716644..174ee8551a78 100644
--- a/external/postgresql/postgresql-9.2.1-libreoffice.patch
+++ b/external/postgresql/postgresql-9.2.1-libreoffice.patch
@@ -9,28 +9,7 @@
 +	@printf '%s\n' 'LIBPQ_DEP_LIBS+=$(SHLIB_LINK)' > '$@'
 --- misc/build/postgresql-9.1.1/src/interfaces/libpq/win32.mak	2011-12-14 14:28:59.000000000 +0100
 +++ misc/build/postgresql-9.1.1.patched/src/interfaces/libpq/win32.mak	2011-12-15 09:11:37.000000000 +0100
-@@ -11,30 +11,29 @@
- 
- # CPU="i386" or CPU environment of nmake.exe (AMD64 or IA64)
- 
--!IF ("$(CPU)" == "")||("$(CPU)" == "i386")
--CPU=i386
-+!IF ("$(CPU)" == "")||("$(CPU)" == "I")
-+MACHINE=i386
- !MESSAGE Building the Win32 static library...
- !MESSAGE
--!ELSEIF ("$(CPU)" == "IA64")||("$(CPU)" == "AMD64")
-+!ELSEIF ("$(CPU)" == "X")
-+MACHINE=AMD64
- ADD_DEFINES=/D "WIN64" /Wp64 /GS
- ADD_SECLIB=bufferoverflowU.lib
- !MESSAGE Building the Win64 static library...
- !MESSAGE
- !ELSE
- !MESSAGE Please check a CPU=$(CPU) ?
--!MESSAGE CPU=i386 or AMD64 or IA64
-+!MESSAGE CPU=I or X
- !ERROR Make aborted.
+@@ -11,14 +11,12 @@
  !ENDIF
  
  !IFDEF DEBUG
@@ -47,15 +26,6 @@
  OUTFILENAME=libpq
  !ENDIF
  
-@@ -54,7 +53,7 @@
- !ENDIF
- 
- !IF "$(KFW_LIB_PATH)" == ""
--KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(CPU)
-+KFW_LIB_PATH=C:\kfw-2.6.5\lib\$(MACHINE)
- !MESSAGE Using default Kerberos Library directory: $(KFW_LIB_PATH)
- !ENDIF
- 
 @@ -67,18 +66,11 @@
  CPP=cl.exe
  RSC=rc.exe
@@ -92,15 +62,6 @@
   /D "_CRT_SECURE_NO_DEPRECATE" $(ADD_DEFINES)
  
  !IFDEF USE_SSL
-@@ -205,7 +198,7 @@
- LINK32=link.exe
- LINK32_FLAGS=kernel32.lib user32.lib advapi32.lib shfolder.lib wsock32.lib ws2_32.lib secur32.lib $(SSL_LIBS)  $(KFW_LIB) $(ADD_SECLIB) \
-  /nologo /subsystem:windows /dll $(LOPT) /incremental:no \
-- /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(CPU) \
-+ /pdb:"$(OUTDIR)\libpqdll.pdb" /machine:$(MACHINE) \
-  /out:"$(OUTDIR)\$(OUTFILENAME).dll"\
-  /implib:"$(OUTDIR)\$(OUTFILENAME)dll.lib"  \
-  /libpath:"$(SSL_LIB_PATH)" /libpath:"$(KFW_LIB_PATH)" \
 @@ -222,7 +215,7 @@
  <<
  
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 86f72896ebfd..6ba73ee94fd9 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -206,7 +206,7 @@ $(eval $(call gb_Library_add_cobjects,sal,\
 	sal/osl/unx/backtrace \
 ))
 endif
-ifneq ($(filter $(OS)$(CPU),SOLARISU SOLARISS NETBSDS LINUXS),)
+ifneq ($(filter $(CPUNAME),SPARC64 SPARC),)
 $(eval $(call gb_Library_add_asmobjects,sal,\
 	sal/osl/unx/asm/interlck_sparc \
 ))