* 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.

3 files changed, 13 insertions, 2 deletions

diff --git a/src/m/ibmrs6000.h b/src/m/ibmrs6000.h
index 87fc82c66f6..921a4cc0b23 100644
--- a/src/m/ibmrs6000.h
+++ b/src/m/ibmrs6000.h
@@ -131,5 +131,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #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 --git a/src/s/aix3-1.h b/src/s/aix3-1.h
index 83d65b384df..e4a4612a67a 100644
--- a/src/s/aix3-1.h
+++ b/src/s/aix3-1.h
@@ -209,7 +209,9 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 /* #define ADDR_CORRECT(x) (x) */
 
+#ifndef __GNUC__
 #define LINKER cc
+#endif
 
 /* Prevent -lg from being used for debugging.  Not needed.  */
 
diff --git a/src/s/aix3-2.h b/src/s/aix3-2.h
index 504b1548aad..e5c9859b8d7 100644
--- a/src/s/aix3-2.h
+++ b/src/s/aix3-2.h
@@ -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