From 889f5aeaa146a1b8dc4a2512ffdc55e0980275d2 Mon Sep 17 00:00:00 2001
From: Vladimir Glazounov <vg@openoffice.org>
Date: Thu, 16 Mar 2006 12:13:00 +0000
Subject: [PATCH] INTEGRATION: CWS sixtyfour02 (1.5.16); FILE MERGED 2006/02/21
 12:04:20 cmc 1.5.16.1: #i62314# search lib64 on x86_64

---
 jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
index cc02ec81eee2..2bd0527427e9 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: gnujre.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: kz $ $Date: 2006-02-28 10:30:59 $
+ *  last change: $Author: vg $ $Date: 2006-03-16 13:13:00 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -63,11 +63,12 @@ char const* const* GnuInfo::getJavaExePaths(int * size)
 char const* const* GnuInfo::getRuntimePaths(int * size)
 {
     static char const* ar[]= {
+#ifdef X86_64
+          "/lib64/libgcj.so.7",
+          "/lib64/libgcj.so.6"
+#else
           "/lib/libgcj.so.7",
           "/lib/libgcj.so.6"
-#if 0   //unreliable
-    , "/lib/libgcj.so.5"
-        , "/lib/libgcj.so.4"
 #endif
     };
     *size = sizeof(ar) / sizeof (char*);