XEmacs 21.2.36 "Notos"

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

diff --git a/src/s/linux.h b/src/s/linux.h
index 55f1f42..4e85f20 100644 (file)
--- a/src/s/linux.h
+++ b/src/s/linux.h
@@ -26,6 +26,12 @@ Boston, MA 02111-1307, USA.  */
 #define USG
 #define LINUX
 
+/* powerpc gcc 2.8.0 doesn't define __ELF__, but it is */
+
+#if defined(__ELF__) || defined(powerpc)
+#define LINUX_ELF
+#endif
+
 /* SYSTEM_TYPE should indicate the kind of system you are using.
  It sets the Lisp variable system-type.  */
 
@@ -81,7 +87,7 @@ Boston, MA 02111-1307, USA.  */
 /* Ask GCC where to find libgcc.a.  */
 #define LIB_GCC "`$(CC) $(C_SWITCH_X_SITE) -print-libgcc-file-name`"
 
-#ifndef __ELF__
+#ifndef LINUX_ELF
 /* Linux has crt0.o in a non-standard place */
 #define START_FILES "pre-crt0.o /usr/lib/crt0.o"
 #else
@@ -106,7 +112,7 @@ Boston, MA 02111-1307, USA.  */
 /* Best not to include -lg, unless it is last on the command line */
 #define LIBS_DEBUG
 #define LIBS_TERMCAP "-ltermcap -lcurses" /* save some space with shared libs*/
-#ifndef __ELF__
+#ifndef LINUX_ELF
 #define LIB_STANDARD "-lc" /* avoid -lPW */
 #else
 /*#undef LIB_GCC
@@ -124,18 +130,25 @@ Boston, MA 02111-1307, USA.  */
 #define LIBS_SYSTEM
 #endif
 
-#ifdef __ELF__
+#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 ... :-( */
 #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.
+   However, the user (i.e. me!) should be able to specify ORDINARY_LINK via
+   configure --cppflags=-DORDINARY_LINK ... */
+#ifdef ORDINARY_LINK
 #undef LIB_STANDARD
 #undef START_FILES
 #undef LIB_GCC
 #endif
-#endif /* __ELF__ */
+#endif /* LINUX_ELF */
 
 #ifdef LINUX_QMAGIC
 
@@ -194,3 +207,4 @@ Boston, MA 02111-1307, USA.  */
 
 /* XEmacs: removed setpgrp() definition because we use setpgid() when
    it's available, and autodetect it. */
+