1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-18 10:16:51 +00:00

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.
This commit is contained in:
Dan Nicolaescu 2010-03-22 19:39:19 -07:00
parent 002787475f
commit 5845f0ed5a
5 changed files with 17 additions and 12 deletions

View File

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

View File

@ -93,7 +93,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define UNEXEC unexhp9k800.o
#define LIBS_MACHINE
#define LIBS_DEBUG
/* Include the file bsdtty.h, since this machine has job control. */

View File

@ -57,15 +57,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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))

View File

@ -53,8 +53,6 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#define DATA_START 0x10000000
#define DATA_SEG_BITS 0x10000000
#undef LIBS_MACHINE
#define LIBS_MACHINE
#define LIBS_DEBUG
/* Use terminfo instead of termcap. */

View File

@ -95,6 +95,15 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#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