--- ./config_office/configure.in.dist	2008-01-31 05:45:01.000000000 -0600
+++ ./config_office/configure.in	2008-04-07 21:19:31.000000000 -0500
@@ -2296,16 +2296,25 @@
          AC_MSG_ERROR([Your gcc STL headers are not visibility safe. Try with --with-stlport])
       fi
 
-      sharedlink_ldflags_save=$LDFLAGS
-      LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
+      case "$build" in
+	x86_64-*-linux*|amd64-*-linux*)
+	# forget about -fvisibility-inlines-hidden, it doesn't work here
+	#  and has been removed from solenv/inc/unxlngx6.mk
+	# Other systems may need further attention.
+	;;
+	*)
+		sharedlink_ldflags_save=$LDFLAGS
+		LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared"
 
-      AC_MSG_CHECKING([if gcc is -fvisibility-inlines-hidden safe with STL headers])
-      AC_TRY_LINK([#include <sstream>
+		AC_MSG_CHECKING([if gcc is -fvisibility-inlines-hidden safe with STL headers])
+		AC_TRY_LINK([#include <sstream>
 using namespace std;
 ],[istringstream strm( "test" ); return 0;],
-     gccvisok=yes, gccvisok=no)
+		gccvisok=yes, gccvisok=no)
 
-      LDFLAGS=$sharedlink_ldflags_save
+		LDFLAGS=$sharedlink_ldflags_save
+	;;
+      esac
 
       AC_MSG_RESULT([$gccvisok])
       if test "$gccvisok" = "no"; then
--- ./solenv/inc/unxlngx6.mk.dist	2007-12-12 07:21:19.000000000 -0600
+++ ./solenv/inc/unxlngx6.mk	2008-04-05 13:49:58.000000000 -0500
@@ -100,10 +100,11 @@
 CFLAGSCXX= -pipe $(ARCH_FLAGS)
 CFLAGSCXX+= -Wno-ctor-dtor-privacy
 CFLAGSCXX+= -fno-use-cxa-atexit
-PICSWITCH:=-fpic
-.IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
-CFLAGSCXX += -fvisibility-inlines-hidden
-.ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+PICSWITCH:=-fPIC
+# -fvisibility-inlines-hidden doesn't appear to work properly on amd64, see issue 84965
+# .IF "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
+# CFLAGSCXX += -fvisibility-inlines-hidden
+# .ENDIF # "$(HAVE_GCC_VISIBILITY_FEATURE)" == "TRUE"
 
 # Compiler flags for compiling static object in multi threaded environment with graphical user interface
 CFLAGSOBJGUIMT=