[Emacs-diffs] Changes to emacs/src/m/ibmrs6000.h,v

[Dan Nicolaescu]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Dan Nicolaescu <dann>   08/06/26 04:24:54

Index: src/m/ibmrs6000.h
===================================================================
RCS file: /cvsroot/emacs/emacs/src/m/ibmrs6000.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- src/m/ibmrs6000.h   7 May 2008 07:05:58 -0000       1.51
+++ src/m/ibmrs6000.h   26 Jun 2008 04:24:41 -0000      1.52
@@ -107,15 +107,11 @@
 
 /* Here override various assumptions in ymakefile */
 
-#ifdef AIXHFT
-#define OBJECTS_MACHINE hftctl.o
-#endif
-
 #ifndef USG5
 #define C_SWITCH_MACHINE -D_BSD
 #endif
 
-#ifdef AIX3_2
+#ifdef AIX
 /* -lpthreads seems to be necessary for Xlib in X11R6, and should be harmless
    on older versions of X where it happens to exist.  */
 #ifdef HAVE_LIBPTHREADS
@@ -159,15 +155,15 @@
    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
+#ifdef AIX
 #define LD_SWITCH_MACHINE -Wl,-bnodelcsect
-#else /* not AIX4 */
+#else /* not AIX */
 #ifdef HAVE_AIX_SMT_EXP
 #define LD_SWITCH_MACHINE 
-Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp,-bI:/usr/lpp/X11/bin/smt.exp
 #else
 #define LD_SWITCH_MACHINE 
-Wl,-bnso,-bnodelcsect,-bI:/lib/syscalls.exp,-bI:$(srcdir)/m/ibmrs6000.inp
 #endif
-#endif /* not AIX4 */
+#endif /* not AIX */
 #endif /* THIS_IS_MAKEFILE */
 
 /* Avoid gcc 2.7.x collect2 bug by using /bin/ld instead.  */