Mercurial > emacs
changeset 107462:6efbd7584cd8
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.
| author | Dan Nicolaescu <dann@ics.uci.edu> |
|---|---|
| date | Mon, 22 Mar 2010 19:39:19 -0700 |
| parents | 7cf379c501e1 |
| children | 6de06f3dcac9 |
| files | src/ChangeLog src/m/hp800.h src/m/ibmrs6000.h src/m/iris4d.h src/s/aix4-2.h |
| diffstat | 5 files changed, 17 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Mon Mar 22 20:59:49 2010 -0400 +++ b/src/ChangeLog Mon Mar 22 19:39:19 2010 -0700 @@ -1,3 +1,11 @@ +2010-03-23 Dan Nicolaescu <dann@ics.uci.edu> + + 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 <dann@ics.uci.edu> Remove dead code dealing with POSIX_SIGNALS.
--- a/src/m/hp800.h Mon Mar 22 20:59:49 2010 -0400 +++ b/src/m/hp800.h Mon Mar 22 19:39:19 2010 -0700 @@ -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. */
--- a/src/m/ibmrs6000.h Mon Mar 22 20:59:49 2010 -0400 +++ b/src/m/ibmrs6000.h Mon Mar 22 19:39:19 2010 -0700 @@ -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))
--- a/src/m/iris4d.h Mon Mar 22 20:59:49 2010 -0400 +++ b/src/m/iris4d.h Mon Mar 22 19:39:19 2010 -0700 @@ -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. */
--- a/src/s/aix4-2.h Mon Mar 22 20:59:49 2010 -0400 +++ b/src/s/aix4-2.h Mon Mar 22 19:39:19 2010 -0700 @@ -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