# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 734200619 0
# Node ID 6643737d26ae8590c0fd2795edd03d60417b3285
# Parent  250c60d32a5a9ce70ffa5990dced4aa662e3445d
	* m/imbrs6000.h: If we're using GCC, define ORDINARY_LINK instead
	of defining LINKER to use cc.
	* s/aix3-1.h (LINKER): Don't use cc for linking command if we're
	using GCC.
	* s/aix3-2.h (SYSTEM_MALLOC): Undefine this.

diff -r 250c60d32a5a -r 6643737d26ae src/m/ibmrs6000.h
--- a/src/m/ibmrs6000.h	Wed Apr 07 15:14:21 1993 +0000
+++ b/src/m/ibmrs6000.h	Wed Apr 07 16:36:59 1993 +0000
@@ -131,5 +131,9 @@
 #undef NEED_SIOCTL
 #undef NEED_PTEM_H
 
-#undef LINKER
-#define LINKER cc -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp
+#ifdef __GNUC__
+#  define ORDINARY_LINK
+#else
+#  undef LINKER
+#  define LINKER cc -Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp
+#endif
diff -r 250c60d32a5a -r 6643737d26ae src/s/aix3-1.h
--- a/src/s/aix3-1.h	Wed Apr 07 15:14:21 1993 +0000
+++ b/src/s/aix3-1.h	Wed Apr 07 16:36:59 1993 +0000
@@ -209,7 +209,9 @@
 
 /* #define ADDR_CORRECT(x) (x) */
 
+#ifndef __GNUC__
 #define LINKER cc
+#endif
 
 /* Prevent -lg from being used for debugging.  Not needed.  */
 
diff -r 250c60d32a5a -r 6643737d26ae src/s/aix3-2.h
--- a/src/s/aix3-2.h	Wed Apr 07 15:14:21 1993 +0000
+++ b/src/s/aix3-2.h	Wed Apr 07 16:36:59 1993 +0000
@@ -12,3 +12,8 @@
 #undef index
 
 #define HAVE_FSYNC
+
+/* With this defined, a gcc-compiled Emacs crashed in realloc under AIX
+   3.2, and a cc-compiled Emacs works with this undefined.
+   --karl@cs.umb.edu.  */
+#undef SYSTEM_MALLOC