2 files changed, 14 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 25b994e3ab8..ceea594199e 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-17  Glenn Morris  <rgm@gnu.org>
+
+        * m/ibms390x.h (START_FILES, LIB_STANDARD): Adjust value according
+        to HAVE_X86_64_LIB64_DIR.
+
 2008-01-11  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
         * mac.c (mac_emacs_pid) [MAC_OSX]: New variable.
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 89aa3c19335..290b17a3e3f 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -23,7 +23,7 @@ Boston, MA 02110-1301, USA.  */
    into ibms390.h.  */
 
 
-/* The following line tells the configuration script what sort of 
+/* The following line tells the configuration script what sort of
    operating system this machine is likely to run.
    USUAL-OPSYS="<name of system .h file here, without the s- or .h>"
 
@@ -161,10 +161,18 @@ NOTE-END */
 #define XPNTR(a) XUINT (a)
 
 #undef START_FILES
+#ifdef HAVE_X86_64_LIB64_DIR
 #define START_FILES pre-crt0.o /usr/lib64/crt1.o /usr/lib64/crti.o
+#else
+#define START_FILES pre-crt0.o /usr/lib/crt1.o /usr/lib/crti.o
+#endif
 
 #undef LIB_STANDARD
+#ifdef HAVE_X86_64_LIB64_DIR
 #define LIB_STANDARD -lgcc -lc -lgcc /usr/lib64/crtn.o
+#else
+#define LIB_STANDARD -lgcc -lc -lgcc /usr/lib/crtn.o
+#endif
 
 /* arch-tag: 4b87653c-6add-4663-8691-7d9dc17b5519
    (do not change this comment) */