(START_FILES, LIB_STANDARD): Adjust value according to HAVE_X86_64_LIB64_DIR.

2 files changed, 13 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index f5c648f03af..5e464404310 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-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * s/irix3-3.h:
diff --git a/src/m/ibms390x.h b/src/m/ibms390x.h
index 7c0c577523e..9c4a14895fd 100644
--- a/src/m/ibms390x.h
+++ b/src/m/ibms390x.h
@@ -152,10 +152,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) */