2002-08-11 Andrew Choi <akochoi@shaw.ca>

[gnu-emacs] / src / m / ibmrs6000.h

diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index bcd803e1c116c899d0061cbc8108e24ad9ebcc97..51f809c45ff6563d5b20379577021a7ea53bfe44 100644 (file)
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -1,5 +1,5 @@
 /* R2 AIX machine/system dependent defines
-   Copyright (C) 1988 Free Software Foundation, Inc.
+   Copyright (C) 1988, 2002 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -101,19 +101,6 @@ Boston, MA 02111-1307, USA.  */
 #undef ADDR_CORRECT
 #define ADDR_CORRECT(x) ((int)(x))
 
-/* Define C_ALLOCA if this machine does not support a true alloca
-   and the one written in C should be used instead.
-   Define HAVE_ALLOCA to say that the system provides a properly
-   working alloca function and it should be used.
-   Define neither one if an assembler-language alloca
-   in the file alloca.s should be used.         */
-
-/* Note: aix3-2.h defines HAVE_ALLOCA; aix3-1.h doesn't.  */
-#ifndef HAVE_ALLOCA
-#define C_ALLOCA
-#define STACK_DIRECTION -1 /* tell alloca.c which way it grows */
-#endif
-
 /* Specify the font for X to use.
    This used to be Rom14.500; that's nice on the X server shipped with
    the RS/6000, but it's not available on other servers.  */
@@ -148,9 +135,16 @@ Boston, MA 02111-1307, USA.  */
 
 #define START_FILES
 #define HAVE_SYSVIPC
-#define HAVE_GETWD
 /*** BUILD 9008 - FIONREAD problem still exists in X-Windows. ***/
 #define BROKEN_FIONREAD
+/* As we define BROKEN_FIONREAD, SIGIO will be undefined in systty.h.
+   But, on AIX, SIGAIO, SIGPTY, and SIGPOLL are defined as SIGIO,
+   which causes compilation error at init_signals in sysdep.c.  So, we
+   define these macros so that syssignal.h detects them and undefine
+   SIGAIO, SIGPTY and SIGPOLL.  */
+#define BROKEN_SIGAIO
+#define BROKEN_SIGPTY
+#define BROKEN_SIGPOLL
 
 /* Don't try to include sioctl.h or ptem.h.  */
 #undef NEED_SIOCTL
@@ -159,13 +153,13 @@ Boston, MA 02111-1307, USA.  */
 #define ORDINARY_LINK
 
 #ifndef USG5_4
-#ifndef __GNUC__
 /* sfreed@unm.edu says add -bI:/usr/lpp/X11/bin/smt.exp for AIX 3.2.4.  */
 /* marc@sti.com (Marc Pawliger) says ibmrs6000.inp is needed to avoid
    linker error for updated X11R5 libraries, which references pthread library
    which most machines don't have.  We use the name .inp instead of .imp
    because .inp is a better convention to use in make-dist for naming
    random input files.  */
+#ifdef THIS_IS_MAKEFILE /* Don't use this in configure.  */
 #ifdef AIX4
 #define LD_SWITCH_MACHINE -Wl,-bnodelcsect
 #else /* not AIX4 */
@@ -175,9 +169,16 @@ Boston, MA 02111-1307, USA.  */
 #define LD_SWITCH_MACHINE -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp
 #endif
 #endif /* not AIX4 */
-#endif /* not __GNUC__ */
+#endif /* THIS_IS_MAKEFILE */
 
+/* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead.  */
+#if __GNUC__ == 2 && __GNUC_MINOR__ == 7
+#define LD_SWITCH_SITE -B/bin/
+#endif
+
+#ifndef NLIST_STRUCT
 /* AIX supposedly doesn't use this interface, but on the RS/6000
    it apparently does.  */
 #define NLIST_STRUCT
+#endif
 #endif /* USG5_4 */