Mercurial > emacs
changeset 107466:b1a085b9e50a
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Tue, 23 Mar 2010 06:43:05 +0000 |
| parents | 7d8c73013195 (current diff) 0eb017273376 (diff) |
| children | e009deee2da4 |
| files | |
| diffstat | 7 files changed, 20 insertions(+), 17 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Tue Mar 23 01:05:35 2010 +0000 +++ b/src/ChangeLog Tue Mar 23 06:43:05 2010 +0000 @@ -1,3 +1,14 @@ +2010-03-23 Dan Nicolaescu <dann@ics.uci.edu> + + * s/gnu-linux.h (LIBS_SYSTEM): Remove, same as default. + + 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. + * s/netbsd.h: Remove commented out code. + 2010-03-22 Dan Nicolaescu <dann@ics.uci.edu> Remove dead code dealing with POSIX_SIGNALS.
--- a/src/m/hp800.h Tue Mar 23 01:05:35 2010 +0000 +++ b/src/m/hp800.h Tue Mar 23 06:43:05 2010 +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. */
--- a/src/m/ibmrs6000.h Tue Mar 23 01:05:35 2010 +0000 +++ b/src/m/ibmrs6000.h Tue Mar 23 06:43:05 2010 +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))
--- a/src/m/iris4d.h Tue Mar 23 01:05:35 2010 +0000 +++ b/src/m/iris4d.h Tue Mar 23 06:43:05 2010 +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. */
--- a/src/s/aix4-2.h Tue Mar 23 01:05:35 2010 +0000 +++ b/src/s/aix4-2.h Tue Mar 23 06:43:05 2010 +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
--- a/src/s/gnu-linux.h Tue Mar 23 01:05:35 2010 +0000 +++ b/src/s/gnu-linux.h Tue Mar 23 06:43:05 2010 +0000 @@ -207,9 +207,6 @@ #define C_DEBUG_SWITCH #endif -/* alane@wozzle.linet.org says that -lipc is not a separate library, - since libc-4.4.1. So -lipc was deleted. */ -#define LIBS_SYSTEM /* _BSD_SOURCE is redundant, at least in glibc2, since we define _GNU_SOURCE. Left in in case it's relevant to libc5 systems and anyone's still using Emacs on those. --fx 2002-12-14 */
--- a/src/s/netbsd.h Tue Mar 23 01:05:35 2010 +0000 +++ b/src/s/netbsd.h Tue Mar 23 06:43:05 2010 +0000 @@ -26,8 +26,6 @@ #define PENDING_OUTPUT_COUNT(FILE) ((FILE)->_p - (FILE)->_bf._base) -/* -lutil is not needed for NetBSD >0.9. */ -/* #define LIBS_SYSTEM -lutil */ #define LIBS_TERMCAP -ltermcap #define NEED_ERRNO