[Emacs-diffs] /srv/bzr/emacs/trunk r99721: Simplify LIBS_MACHINE definitions.

[Dan Nicolaescu]

------------------------------------------------------------
revno: 99721
committer: Dan Nicolaescu <address@hidden>
branch nick: trunk
timestamp: Mon 2010-03-22 19:39:19 -0700
message:
  Simplify LIBS_MACHINE definitions.
  * m/hp800.h (LIBS_MACHINE): Remove, same as default.
  * m/iris4d.h (LIBS_MACHINE): Likewise.
  * m/ibmrs6000.h (LIBS_MACHINE): Rename to LIBS_SYSTEM and move ...
  * s/aix4-2.h (LIBS_SYSTEM): ... here.
modified:
  src/ChangeLog
  src/m/hp800.h
  src/m/ibmrs6000.h
  src/m/iris4d.h
  src/s/aix4-2.h

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-03-22 19:51:59 +0000
+++ b/src/ChangeLog     2010-03-23 02:39:19 +0000
@@ -1,3 +1,11 @@
+2010-03-23  Dan Nicolaescu  <address@hidden>
+
+       Simplify LIBS_MACHINE definitions.
+       * m/hp800.h (LIBS_MACHINE): Remove, same as default.
+       * m/iris4d.h (LIBS_MACHINE): Likewise.
+       * m/ibmrs6000.h (LIBS_MACHINE): Rename to LIBS_SYSTEM and move ...
+       * s/aix4-2.h (LIBS_SYSTEM): ... here.
+
 2010-03-22  Dan Nicolaescu  <address@hidden>
 
        Remove dead code dealing with POSIX_SIGNALS.

=== modified file 'src/m/hp800.h'
--- a/src/m/hp800.h     2010-01-13 08:35:10 +0000
+++ b/src/m/hp800.h     2010-03-23 02:39:19 +0000
@@ -93,7 +93,6 @@
 
 #define UNEXEC unexhp9k800.o
 
-#define LIBS_MACHINE
 #define LIBS_DEBUG
 
 /* Include the file bsdtty.h, since this machine has job control.  */

=== modified file 'src/m/ibmrs6000.h'
--- a/src/m/ibmrs6000.h 2010-03-21 19:32:38 +0000
+++ b/src/m/ibmrs6000.h 2010-03-23 02:39:19 +0000
@@ -57,15 +57,6 @@
 #define NLIST_STRUCT
 #endif
 
-/* -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
-#define LIBS_MACHINE -lrts -lIM -liconv -lpthreads
-#else
-/* IBM's X11R5 use -lIM and -liconv in AIX 3.2.2.  */
-#define LIBS_MACHINE -lrts -lIM -liconv
-#endif
-
 #undef ADDR_CORRECT
 #define ADDR_CORRECT(x) ((int)(x))
 

=== modified file 'src/m/iris4d.h'
--- a/src/m/iris4d.h    2010-01-13 08:35:10 +0000
+++ b/src/m/iris4d.h    2010-03-23 02:39:19 +0000
@@ -53,8 +53,6 @@
 #define DATA_START 0x10000000
 #define DATA_SEG_BITS  0x10000000
 
-#undef LIBS_MACHINE
-#define LIBS_MACHINE
 #define LIBS_DEBUG
 
 /* Use terminfo instead of termcap.  */

=== modified file 'src/s/aix4-2.h'
--- a/src/s/aix4-2.h    2010-03-21 19:32:38 +0000
+++ b/src/s/aix4-2.h    2010-03-23 02:39:19 +0000
@@ -95,6 +95,15 @@
 
 #define LIB_STANDARD
 
+/* -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
+#define LIBS_SYSTEM -lrts -lIM -liconv -lpthreads
+#else
+/* IBM's X11R5 use -lIM and -liconv in AIX 3.2.2.  */
+#define LIBS_SYSTEM -lrts -lIM -liconv
+#endif
+
 /* Use terminfo instead of termcap.  */
 
 #define TERMINFO