XEmacs 21.4.13 "Rational FORTRAN".

[chise/xemacs-chise.git.1] / src / s / linux.h

diff --git a/src/s/linux.h b/src/s/linux.h
index 4e85f20..2de582a 100644 (file)
--- a/src/s/linux.h
+++ b/src/s/linux.h
@@ -95,8 +95,11 @@ Boston, MA 02111-1307, USA.  */
 #if    defined(__linux__) && defined(powerpc)  /*Added by Fukui*/
 #define START_FILES            /*Added by Fukui*/
 #else                          /*Added by Fukui*/
-
+#if defined __s390x__ || defined __x86_64__
+#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
 #endif                         /*Added by Fukui*/
 #endif
 
@@ -117,7 +120,11 @@ Boston, MA 02111-1307, USA.  */
 #else
 /*#undef LIB_GCC
   #define LIB_GCC*/
+#if defined __s390x__  || defined __x86_64__
+#define LIB_STANDARD "-lgcc -lc -lgcc /usr/lib64/crtn.o"
+#else
 #define LIB_STANDARD "-lgcc -lc -lgcc /usr/lib/crtn.o"
+#endif
 #define LINKER "$(CC) -nostdlib"
 #endif
 
@@ -133,11 +140,9 @@ Boston, MA 02111-1307, USA.  */
 #ifdef LINUX_ELF
 #define UNEXEC "unexelf.o"
 #define UNEXEC_USE_MAP_PRIVATE
-#if 0
-/* mrb - Ordinary link is simple and effective */
-/* slb - Not any more ... :-( */
+/* Although slb thinks ORDINARY_LINK does not work on linux, ORDINARY_LINK
+   has been enabled in 21.5 for some time with no ill effects. */
 #define ORDINARY_LINK
-#endif /* 0 */
 
 /* I still think ORDINARY_LINK should be the default, but since slb
    insists, ORDINARY_LINK will stay on until we expunge the dump code.