* configure.in: Remove references to obsolete variables and
systems. * configure: Regenerate. * Makefile.in (NO_SHORTNAMES): * emacsclient.c (NO_SHORTNAMES): * fakemail.c (NO_SHORTNAMES): * make-docfile.c (NO_SHORTNAMES): * movemail.c (NO_SHORTNAMES): * pop.c (NO_SHORTNAMES): Remove references to obsolete variable. * config.nt (SHORTNAMES): Remove reference to obsolete variable. * s/vms4-0.h: * s/vms4-2.h: * s/vms4-4.h: * s/vms5-5.h: Remove, unused. * s/irix5-2.h: * s/irix6-0.h: * s/riscos5.h: * s/mach-bsd4-3.h: * m/mips4.h: Remove files for obsolete systems * Makefile.in: * filelock.c: * unexmips.c: * m/hp9000s300.h: * m/iris4d.h: * s/aix3-1.h: * s/hpux.h: * s/msdos.h: * s/usg5-0.h: * s/usg5-2-2.h: * s/usg5-2.h: * s/usg5-3.h: Remove references to obsolete variables. * s/irix5-0.h: Remove, move all the contents ... * s/irix6-5.h: ... here. Simplify. * config.in: Regenerate.
This commit is contained in:
Dan Nicolaescu
parent
5cd53af59e
commit
9d2818d676
37 changed files with 188 additions and 700 deletions
|
|
@ -1,3 +1,9 @@
|
|||
2008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
* configure.in: Remove references to obsolete variables and
|
||||
systems.
|
||||
* configure: Regenerate.
|
||||
|
||||
2008-02-21 Glenn Morris <rgm@gnu.org>
|
||||
|
||||
* Makefile.in (set_installuser): New.
|
||||
|
|
|
|||
162
configure
vendored
162
configure
vendored
|
|
@ -1345,7 +1345,6 @@ Optional Features:
|
|||
Optional Packages:
|
||||
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
|
||||
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
|
||||
--without-gcc don't use GCC to compile Emacs even if GCC is found
|
||||
--without-pop don't support POP mail retrieval with movemail
|
||||
--with-kerberos support Kerberos-authenticated POP
|
||||
--with-kerberos5 support Kerberos version 5 authenticated POP
|
||||
|
|
@ -1363,7 +1362,6 @@ Optional Packages:
|
|||
--without-xft don't use XFT for anti aliased fonts
|
||||
--without-libotf don't use libotf for OpenType font support
|
||||
--without-m17n-flt don't use m17n-flt for text shaping
|
||||
--with-gtk use GTK toolkit
|
||||
--without-toolkit-scroll-bars
|
||||
don't use Motif or Xaw3d scroll bars
|
||||
--without-xaw3d don't use Xaw3d
|
||||
|
|
@ -1372,6 +1370,7 @@ Optional Packages:
|
|||
--without-gpm don't use -lgpm for mouse support on a GNU/Linux
|
||||
console
|
||||
--without-dbus don't compile with D-Bus support
|
||||
|
||||
--with-pkg-config-prog=PATH
|
||||
Path to pkg-config for finding GTK and librsvg
|
||||
--with-x use the X Window System
|
||||
|
|
@ -1852,13 +1851,6 @@ gameuser=games
|
|||
|
||||
|
||||
|
||||
# Check whether --with-gcc was given.
|
||||
if test "${with_gcc+set}" = set; then
|
||||
withval=$with_gcc;
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-pop was given.
|
||||
if test "${with_pop+set}" = set; then
|
||||
withval=$with_pop;
|
||||
|
|
@ -2046,14 +2038,6 @@ fi
|
|||
|
||||
|
||||
|
||||
# Check whether --with-gtk was given.
|
||||
if test "${with_gtk+set}" = set; then
|
||||
withval=$with_gtk;
|
||||
else
|
||||
with_gtk=no
|
||||
fi
|
||||
|
||||
|
||||
# Check whether --with-toolkit-scroll-bars was given.
|
||||
if test "${with_toolkit_scroll_bars+set}" = set; then
|
||||
withval=$with_toolkit_scroll_bars;
|
||||
|
|
@ -2104,6 +2088,28 @@ fi
|
|||
|
||||
|
||||
|
||||
# Check whether --with-gtk was given.
|
||||
if test "${with_gtk+set}" = set; then
|
||||
withval=$with_gtk; { { echo "$as_me:$LINENO: error: --with-gtk has been removed. Use --with-x-toolkit to
|
||||
specify a toolkit." >&5
|
||||
echo "$as_me: error: --with-gtk has been removed. Use --with-x-toolkit to
|
||||
specify a toolkit." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-gcc was given.
|
||||
if test "${with_gcc+set}" = set; then
|
||||
withval=$with_gcc; { { echo "$as_me:$LINENO: error: --with-gcc has been removed. Set the \`CC' environment
|
||||
variable to specify a compiler." >&5
|
||||
echo "$as_me: error: --with-gcc has been removed. Set the \`CC' environment
|
||||
variable to specify a compiler." >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
|
||||
|
||||
# Check whether --with-pkg-config-prog was given.
|
||||
if test "${with_pkg_config_prog+set}" = set; then
|
||||
withval=$with_pkg_config_prog;
|
||||
|
|
@ -2451,23 +2457,6 @@ _ACEOF
|
|||
esac
|
||||
;;
|
||||
|
||||
## Alpha (DEC) machines.
|
||||
alpha*-dec-osf* )
|
||||
machine=alpha opsys=osf1
|
||||
# This is needed to find X11R6.1 libraries for certain tests.
|
||||
NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
|
||||
GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
|
||||
# NON_GNU_CPP is necessary on 5.0 to avoid mangling src/Makefile
|
||||
# due to non-traditional preprocessing with the current compiler
|
||||
# defaults. OSF 4 can also have that compiler version, and there
|
||||
# seems always to have been a usable /usr/bin/cpp.
|
||||
NON_GNU_CPP=/usr/bin/cpp
|
||||
case "${canonical}" in
|
||||
alpha*-dec-osf[5-9]*)
|
||||
opsys=osf5-0 ;;
|
||||
esac
|
||||
;;
|
||||
|
||||
alpha*-*-linux-gnu* )
|
||||
machine=alpha opsys=gnu-linux
|
||||
;;
|
||||
|
|
@ -2513,13 +2502,6 @@ _ACEOF
|
|||
mips-dec-ultrix* )
|
||||
machine=pmax opsys=ultrix4-3
|
||||
;;
|
||||
mips-dec-osf* )
|
||||
machine=pmax opsys=osf1
|
||||
;;
|
||||
mips-dec-mach_bsd4.3* )
|
||||
machine=pmax opsys=mach-bsd4-3
|
||||
;;
|
||||
|
||||
## HP 9000 series 200 or 300
|
||||
m68*-hp-bsd* )
|
||||
machine=hp9000s300 opsys=bsd4-3
|
||||
|
|
@ -2644,27 +2626,6 @@ _ACEOF
|
|||
## This is not necessarily all workstations using the MIPS processor -
|
||||
## Irises are produced by SGI, and DECstations by DEC.
|
||||
|
||||
## etc/MACHINES lists mips.h and mips4.h as possible machine files,
|
||||
## and usg5-2-2 and bsd4-3 as possible OS files. The only guidance
|
||||
## it gives for choosing between the alternatives seems to be "Use
|
||||
## -machine=mips4 for RISCOS version 4; use -opsystem=bsd4-3 with
|
||||
## the BSD world." I'll assume that these are instructions for
|
||||
## handling two odd situations, and that every other situation
|
||||
## should use mips.h and usg5-2-2, they being listed first.
|
||||
mips-mips-usg* )
|
||||
machine=mips4
|
||||
## Fall through to the general code at the bottom to decide on the OS.
|
||||
;;
|
||||
mips-mips-riscos4* )
|
||||
machine=mips4 opsys=bsd4-3
|
||||
NON_GNU_CC="cc -systype bsd43"
|
||||
NON_GNU_CPP="cc -systype bsd43 -E"
|
||||
;;
|
||||
mips-mips-riscos5* )
|
||||
machine=mips4 opsys=riscos5
|
||||
NON_GNU_CC="cc -systype bsd43"
|
||||
NON_GNU_CPP="cc -systype bsd43 -E"
|
||||
;;
|
||||
mips-mips-bsd* )
|
||||
machine=mips opsys=bsd4-3
|
||||
;;
|
||||
|
|
@ -2699,20 +2660,6 @@ _ACEOF
|
|||
NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C"
|
||||
NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C"
|
||||
;;
|
||||
mips-sgi-irix6* )
|
||||
machine=iris4d opsys=irix6-0
|
||||
# It's not clear whether -D_LANGUAGE_C is necessary as it is for 6.5,
|
||||
# but presumably it does no harm.
|
||||
NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C"
|
||||
# -32 probably isn't necessary in later v.6s -- anyone know which?
|
||||
NON_GCC_TEST_OPTIONS=-32
|
||||
;;
|
||||
mips-sgi-irix5.[01]* )
|
||||
machine=iris4d opsys=irix5-0
|
||||
;;
|
||||
mips-sgi-irix5* | mips-sgi-irix* )
|
||||
machine=iris4d opsys=irix5-2
|
||||
;;
|
||||
|
||||
## Suns
|
||||
sparc-*-linux-gnu* | sparc64-*-linux-gnu* )
|
||||
|
|
@ -2805,7 +2752,6 @@ _ACEOF
|
|||
*-darwin* ) opsys=darwin
|
||||
CPP="${CC-cc} -E -no-cpp-precomp"
|
||||
;;
|
||||
*-xenix* ) opsys=xenix ;;
|
||||
*-linux-gnu* ) opsys=gnu-linux ;;
|
||||
*-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
|
||||
*-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
|
||||
|
|
@ -2906,11 +2852,6 @@ test -n "$CC" && cc_specified=yes
|
|||
# Save the value of CFLAGS that the user specified.
|
||||
SPECIFIED_CFLAGS="$CFLAGS"
|
||||
|
||||
case ${with_gcc} in
|
||||
"yes" ) CC="gcc" GCC=yes ;;
|
||||
"no" ) : ${CC=cc} ;;
|
||||
* )
|
||||
esac
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
|
|
@ -5154,14 +5095,10 @@ configure___ c_switch_machine=C_SWITCH_MACHINE
|
|||
#define LIB_X11_LIB -lX11
|
||||
#endif
|
||||
|
||||
#ifndef LIBX11_MACHINE
|
||||
#define LIBX11_MACHINE
|
||||
#endif
|
||||
|
||||
#ifndef LIBX11_SYSTEM
|
||||
#define LIBX11_SYSTEM
|
||||
#endif
|
||||
configure___ LIBX=LIB_X11_LIB LIBX11_MACHINE LIBX11_SYSTEM
|
||||
configure___ LIBX=LIB_X11_LIB LIBX11_SYSTEM
|
||||
|
||||
#ifdef UNEXEC
|
||||
configure___ unexec=UNEXEC
|
||||
|
|
@ -9272,7 +9209,7 @@ fi
|
|||
if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
|
||||
if test "${with_carbon+set}" != set \
|
||||
&& test "${carbon_appdir_x+set}" != set; then
|
||||
for var in with_x with_x_toolkit with_gtk with_xim \
|
||||
for var in with_x with_x_toolkit with_xim \
|
||||
with_xpm with_jpeg with_tiff with_gif with_png; do
|
||||
if eval test \"\${$var+set}\" = set; then
|
||||
HAVE_CARBON=no
|
||||
|
|
@ -9295,13 +9232,7 @@ case "${window_system}" in
|
|||
gtk ) with_gtk=yes
|
||||
USE_X_TOOLKIT=none ;;
|
||||
no ) USE_X_TOOLKIT=none ;;
|
||||
* )
|
||||
if test x"$with_gtk" = xyes; then
|
||||
USE_X_TOOLKIT=none
|
||||
else
|
||||
USE_X_TOOLKIT=maybe
|
||||
fi
|
||||
;;
|
||||
* ) USE_X_TOOLKIT=maybe ;;
|
||||
esac
|
||||
;;
|
||||
mac | none )
|
||||
|
|
@ -10267,17 +10198,6 @@ _ACEOF
|
|||
fi
|
||||
|
||||
|
||||
{ echo "$as_me:$LINENO: checking for XFree86 in /usr/X386" >&5
|
||||
echo $ECHO_N "checking for XFree86 in /usr/X386... $ECHO_C" >&6; }
|
||||
if test -d /usr/X386/include; then
|
||||
HAVE_XFREE386=yes
|
||||
: ${C_SWITCH_X_SITE="-I/usr/X386/include"}
|
||||
else
|
||||
HAVE_XFREE386=no
|
||||
fi
|
||||
{ echo "$as_me:$LINENO: result: $HAVE_XFREE386" >&5
|
||||
echo "${ECHO_T}$HAVE_XFREE386" >&6; }
|
||||
|
||||
|
||||
case ${host_os} in
|
||||
aix*)
|
||||
|
|
@ -10828,16 +10748,7 @@ fi
|
|||
|
||||
|
||||
HAVE_GTK=no
|
||||
if test "${with_gtk}" = "yes" && test "$USE_X_TOOLKIT" = "gtk"; then
|
||||
USE_X_TOOLKIT=none
|
||||
fi
|
||||
if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "gtk" || \
|
||||
test "$USE_X_TOOLKIT" = "maybe"; then
|
||||
if test "$USE_X_TOOLKIT" != "none" && test "$USE_X_TOOLKIT" != "maybe"; then
|
||||
{ { echo "$as_me:$LINENO: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&5
|
||||
echo "$as_me: error: Conflicting options, --with-gtk is incompatible with --with-x-toolkit=${with_x_toolkit}" >&2;}
|
||||
{ (exit 1); exit 1; }; };
|
||||
fi
|
||||
if test "${with_gtk}" = "yes" || test "$USE_X_TOOLKIT" = "maybe"; then
|
||||
GLIB_REQUIRED=2.6
|
||||
GTK_REQUIRED=2.6
|
||||
GTK_MODULES="gtk+-2.0 >= $GTK_REQUIRED glib-2.0 >= $GLIB_REQUIRED"
|
||||
|
|
@ -18637,13 +18548,11 @@ _ACEOF
|
|||
cat confdefs.h >>conftest.$ac_ext
|
||||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#include <sys/types.h> /* for off_t */
|
||||
#include <stdio.h>
|
||||
#include <stdio.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
int (*fp) (FILE *, off_t, int) = fseeko;
|
||||
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
|
||||
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -18683,13 +18592,11 @@ cat confdefs.h >>conftest.$ac_ext
|
|||
cat >>conftest.$ac_ext <<_ACEOF
|
||||
/* end confdefs.h. */
|
||||
#define _LARGEFILE_SOURCE 1
|
||||
#include <sys/types.h> /* for off_t */
|
||||
#include <stdio.h>
|
||||
#include <stdio.h>
|
||||
int
|
||||
main ()
|
||||
{
|
||||
int (*fp) (FILE *, off_t, int) = fseeko;
|
||||
return fseeko (stdin, 0, 0) && fp (stdin, 0, 0);
|
||||
return fseeko (stdin, 0, 0) && (fseeko) (stdin, 0, 0);
|
||||
;
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -23886,13 +23793,6 @@ cat >>confdefs.h <<\_ACEOF
|
|||
#define HAVE_X11 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
if test "${HAVE_XFREE386}" = "yes" ; then
|
||||
|
||||
cat >>confdefs.h <<\_ACEOF
|
||||
#define HAVE_XFREE386 1
|
||||
_ACEOF
|
||||
|
||||
fi
|
||||
if test "${HAVE_MENUS}" = "yes" ; then
|
||||
|
||||
|
|
|
|||
71
configure.in
71
configure.in
|
|
@ -377,23 +377,6 @@ dnl see the `changequote' comment above.
|
|||
esac
|
||||
;;
|
||||
|
||||
## Alpha (DEC) machines.
|
||||
alpha*-dec-osf* )
|
||||
machine=alpha opsys=osf1
|
||||
# This is needed to find X11R6.1 libraries for certain tests.
|
||||
NON_GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
|
||||
GCC_LINK_TEST_OPTIONS=-Wl,-rpath,/usr/X11R6/lib
|
||||
# NON_GNU_CPP is necessary on 5.0 to avoid mangling src/Makefile
|
||||
# due to non-traditional preprocessing with the current compiler
|
||||
# defaults. OSF 4 can also have that compiler version, and there
|
||||
# seems always to have been a usable /usr/bin/cpp.
|
||||
NON_GNU_CPP=/usr/bin/cpp
|
||||
case "${canonical}" in
|
||||
alpha*-dec-osf[5-9]*)
|
||||
opsys=osf5-0 ;;
|
||||
esac
|
||||
;;
|
||||
|
||||
alpha*-*-linux-gnu* )
|
||||
machine=alpha opsys=gnu-linux
|
||||
;;
|
||||
|
|
@ -439,13 +422,6 @@ dnl see the `changequote' comment above.
|
|||
mips-dec-ultrix* )
|
||||
machine=pmax opsys=ultrix4-3
|
||||
;;
|
||||
mips-dec-osf* )
|
||||
machine=pmax opsys=osf1
|
||||
;;
|
||||
mips-dec-mach_bsd4.3* )
|
||||
machine=pmax opsys=mach-bsd4-3
|
||||
;;
|
||||
|
||||
## HP 9000 series 200 or 300
|
||||
m68*-hp-bsd* )
|
||||
machine=hp9000s300 opsys=bsd4-3
|
||||
|
|
@ -570,27 +546,6 @@ dnl see the `changequote' comment above.
|
|||
## This is not necessarily all workstations using the MIPS processor -
|
||||
## Irises are produced by SGI, and DECstations by DEC.
|
||||
|
||||
## etc/MACHINES lists mips.h and mips4.h as possible machine files,
|
||||
## and usg5-2-2 and bsd4-3 as possible OS files. The only guidance
|
||||
## it gives for choosing between the alternatives seems to be "Use
|
||||
## -machine=mips4 for RISCOS version 4; use -opsystem=bsd4-3 with
|
||||
## the BSD world." I'll assume that these are instructions for
|
||||
## handling two odd situations, and that every other situation
|
||||
## should use mips.h and usg5-2-2, they being listed first.
|
||||
mips-mips-usg* )
|
||||
machine=mips4
|
||||
## Fall through to the general code at the bottom to decide on the OS.
|
||||
;;
|
||||
mips-mips-riscos4* )
|
||||
machine=mips4 opsys=bsd4-3
|
||||
NON_GNU_CC="cc -systype bsd43"
|
||||
NON_GNU_CPP="cc -systype bsd43 -E"
|
||||
;;
|
||||
mips-mips-riscos5* )
|
||||
machine=mips4 opsys=riscos5
|
||||
NON_GNU_CC="cc -systype bsd43"
|
||||
NON_GNU_CPP="cc -systype bsd43 -E"
|
||||
;;
|
||||
mips-mips-bsd* )
|
||||
machine=mips opsys=bsd4-3
|
||||
;;
|
||||
|
|
@ -625,20 +580,6 @@ dnl see the `changequote' comment above.
|
|||
NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C"
|
||||
NON_GCC_TEST_OPTIONS="-D_LANGUAGE_C"
|
||||
;;
|
||||
mips-sgi-irix6* )
|
||||
machine=iris4d opsys=irix6-0
|
||||
# It's not clear whether -D_LANGUAGE_C is necessary as it is for 6.5,
|
||||
# but presumably it does no harm.
|
||||
NON_GNU_CPP="/lib/cpp -D_LANGUAGE_C"
|
||||
# -32 probably isn't necessary in later v.6s -- anyone know which?
|
||||
NON_GCC_TEST_OPTIONS=-32
|
||||
;;
|
||||
mips-sgi-irix5.[01]* )
|
||||
machine=iris4d opsys=irix5-0
|
||||
;;
|
||||
mips-sgi-irix5* | mips-sgi-irix* )
|
||||
machine=iris4d opsys=irix5-2
|
||||
;;
|
||||
|
||||
## Suns
|
||||
sparc-*-linux-gnu* | sparc64-*-linux-gnu* )
|
||||
|
|
@ -731,7 +672,6 @@ dnl see the `changequote' comment above.
|
|||
*-darwin* ) opsys=darwin
|
||||
CPP="${CC-cc} -E -no-cpp-precomp"
|
||||
;;
|
||||
*-xenix* ) opsys=xenix ;;
|
||||
*-linux-gnu* ) opsys=gnu-linux ;;
|
||||
*-sysv4.2uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
|
||||
*-sysv5uw* ) opsys=unixware; NON_GNU_CPP=/lib/cpp ;;
|
||||
|
|
@ -2809,17 +2749,6 @@ AH_BOTTOM([
|
|||
#include config_opsysfile
|
||||
#include config_machfile
|
||||
|
||||
/* Load in the conversion definitions if this system
|
||||
needs them and the source file being compiled has not
|
||||
said to inhibit this. There should be no need for you
|
||||
to alter these lines. */
|
||||
|
||||
#ifdef SHORTNAMES
|
||||
#ifndef NO_SHORTNAMES
|
||||
#include "../shortnames/remap.h"
|
||||
#endif /* not NO_SHORTNAMES */
|
||||
#endif /* SHORTNAMES */
|
||||
|
||||
/* If no remapping takes place, static variables cannot be dumped as
|
||||
pure, so don't worry about the `static' keyword. */
|
||||
#ifdef NO_REMAP
|
||||
|
|
|
|||
|
|
@ -1,3 +1,12 @@
|
|||
2008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
* Makefile.in (NO_SHORTNAMES):
|
||||
* emacsclient.c (NO_SHORTNAMES):
|
||||
* fakemail.c (NO_SHORTNAMES):
|
||||
* make-docfile.c (NO_SHORTNAMES):
|
||||
* movemail.c (NO_SHORTNAMES):
|
||||
* pop.c (NO_SHORTNAMES): Remove references to obsolete variable.
|
||||
|
||||
2008-02-23 Jason Rumney <jasonr@gnu.org>
|
||||
|
||||
* makefile.w32-in (MOUSE_SUPPORT): Remove duplicate tooltip.elc.
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ MOVE_FLAGS=
|
|||
# ========================== start of cpp stuff =======================
|
||||
/* From here on, comments must be done in C syntax. */
|
||||
|
||||
#define NO_SHORTNAMES
|
||||
#define THIS_IS_MAKEFILE
|
||||
#define NOT_C_CODE
|
||||
#include "../src/config.h"
|
||||
|
|
|
|||
|
|
@ -20,8 +20,6 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|||
Boston, MA 02110-1301, USA. */
|
||||
|
||||
|
||||
#define NO_SHORTNAMES
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -19,7 +19,6 @@ along with GNU Emacs; see the file COPYING. If not, write to
|
|||
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA. */
|
||||
|
||||
#define NO_SHORTNAMES
|
||||
#define _XOPEN_SOURCE 500 /* for cuserid */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ Boston, MA 02110-1301, USA. */
|
|||
Then comes the documentation for that function or variable.
|
||||
*/
|
||||
|
||||
#define NO_SHORTNAMES /* Tell config not to load remap.h */
|
||||
#include <config.h>
|
||||
|
||||
/* defined to be emacs_main, sys_fopen, etc. in config.h */
|
||||
|
|
|
|||
|
|
@ -55,7 +55,6 @@ Boston, MA 02110-1301, USA. */
|
|||
*
|
||||
*/
|
||||
|
||||
#define NO_SHORTNAMES /* Tell config not to load remap.h */
|
||||
#include <config.h>
|
||||
#include <sys/types.h>
|
||||
#include <sys/stat.h>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,6 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|||
Boston, MA 02110-1301, USA. */
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#define NO_SHORTNAMES /* Tell config not to load remap.h */
|
||||
#include <config.h>
|
||||
#else
|
||||
#define MAIL_USE_POP
|
||||
|
|
|
|||
|
|
@ -1,3 +1,7 @@
|
|||
2008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
* config.nt (SHORTNAMES): Remove reference to obsolete variable.
|
||||
|
||||
2008-02-11 Eli Zaretskii <eliz@gnu.org>
|
||||
|
||||
* configure.bat (checkgcc): Move "del junk.o" to here, and make it
|
||||
|
|
|
|||
11
nt/config.nt
11
nt/config.nt
|
|
@ -311,17 +311,6 @@ Boston, MA 02110-1301, USA. */
|
|||
#undef config_machfile
|
||||
#include "m/intel386.h"
|
||||
|
||||
/* Load in the conversion definitions if this system
|
||||
needs them and the source file being compiled has not
|
||||
said to inhibit this. There should be no need for you
|
||||
to alter these lines. */
|
||||
|
||||
#ifdef SHORTNAMES
|
||||
#ifndef NO_SHORTNAMES
|
||||
#include "../shortnames/remap.h"
|
||||
#endif /* not NO_SHORTNAMES */
|
||||
#endif /* SHORTNAMES */
|
||||
|
||||
/* If no remapping takes place, static variables cannot be dumped as
|
||||
pure, so don't worry about the `static' keyword. */
|
||||
#ifdef NO_REMAP
|
||||
|
|
|
|||
|
|
@ -1,3 +1,33 @@
|
|||
2008-02-24 Dan Nicolaescu <dann@ics.uci.edu>
|
||||
|
||||
* s/vms4-0.h:
|
||||
* s/vms4-2.h:
|
||||
* s/vms4-4.h:
|
||||
* s/vms5-5.h: Remove, unused.
|
||||
|
||||
* s/irix5-2.h:
|
||||
* s/irix6-0.h:
|
||||
* s/riscos5.h:
|
||||
* s/mach-bsd4-3.h:
|
||||
* m/mips4.h: Remove files for obsolete systems
|
||||
|
||||
* Makefile.in:
|
||||
* filelock.c:
|
||||
* unexmips.c:
|
||||
* m/hp9000s300.h:
|
||||
* m/iris4d.h:
|
||||
* s/aix3-1.h:
|
||||
* s/hpux.h:
|
||||
* s/msdos.h:
|
||||
* s/usg5-0.h:
|
||||
* s/usg5-2-2.h:
|
||||
* s/usg5-2.h:
|
||||
* s/usg5-3.h: Remove references to obsolete variables.
|
||||
|
||||
* s/irix5-0.h: Remove, move all the contents ...
|
||||
* s/irix6-5.h: ... here. Simplify.
|
||||
* config.in: Regenerate.
|
||||
|
||||
2008-02-24 Jason Rumney <jasonr@gnu.org>
|
||||
|
||||
* w32term.c: (x_draw_glyph_string_background): Clear the background
|
||||
|
|
|
|||
|
|
@ -78,7 +78,6 @@ C_SWITCH_SYSTEM=
|
|||
SHELL=/bin/sh
|
||||
|
||||
#define THIS_IS_MAKEFILE
|
||||
#define NO_SHORTNAMES
|
||||
#define NOT_C_CODE
|
||||
#include "config.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -1003,17 +1003,6 @@ Boston, MA 02110-1301, USA. */
|
|||
#include config_opsysfile
|
||||
#include config_machfile
|
||||
|
||||
/* Load in the conversion definitions if this system
|
||||
needs them and the source file being compiled has not
|
||||
said to inhibit this. There should be no need for you
|
||||
to alter these lines. */
|
||||
|
||||
#ifdef SHORTNAMES
|
||||
#ifndef NO_SHORTNAMES
|
||||
#include "../shortnames/remap.h"
|
||||
#endif /* not NO_SHORTNAMES */
|
||||
#endif /* SHORTNAMES */
|
||||
|
||||
/* If no remapping takes place, static variables cannot be dumped as
|
||||
pure, so don't worry about the `static' keyword. */
|
||||
#ifdef NO_REMAP
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ static void get_boot_time_1 P_ ((char *, int));
|
|||
static time_t
|
||||
get_boot_time ()
|
||||
{
|
||||
#if defined (BOOT_TIME) && ! defined (NO_WTMP_FILE)
|
||||
#if defined (BOOT_TIME)
|
||||
int counter;
|
||||
#endif
|
||||
|
||||
|
|
@ -166,7 +166,7 @@ get_boot_time ()
|
|||
}
|
||||
}
|
||||
|
||||
#if defined (BOOT_TIME) && ! defined (NO_WTMP_FILE)
|
||||
#if defined (BOOT_TIME)
|
||||
#ifndef CANNOT_DUMP
|
||||
/* The utmp routines maintain static state.
|
||||
Don't touch that state unless we are initialized,
|
||||
|
|
|
|||
|
|
@ -35,20 +35,6 @@ HP 9000 series 200 or 300 (-machine=hp9000s300)
|
|||
NOTE-END */
|
||||
|
||||
/* I don't understand why we have to do this at all! -JimB */
|
||||
#if 0
|
||||
|
||||
/* Do this here at the top of the file; including sys/wait.h may
|
||||
include <endian.h>, which defines BIG_ENDIAN, which will conflict
|
||||
with our definition of BIG_ENDIAN if we do this at the bottom. */
|
||||
#ifndef NOT_C_CODE
|
||||
#ifndef NO_SHORTNAMES
|
||||
#include <sys/wait.h>
|
||||
#define WAITTYPE int
|
||||
#endif
|
||||
#define WRETCODE(w) (((w) >> 8) & 0377)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
/* Define NOMULTIPLEJOBS on versions of HPUX before 6.5. */
|
||||
|
||||
|
|
|
|||
|
|
@ -121,16 +121,7 @@ Boston, MA 02110-1301, USA. */
|
|||
#define DATA_SEG_BITS 0x10000000
|
||||
|
||||
#undef LIBS_MACHINE
|
||||
/* -lsun in case using Yellow Pages for passwords. */
|
||||
#if defined(__GNUC__) && defined(_ABIN32)
|
||||
#define LIBS_MACHINE
|
||||
#else
|
||||
#ifndef IRIX6_5
|
||||
#define LIBS_MACHINE -lmld
|
||||
#else
|
||||
#define LIBS_MACHINE
|
||||
#endif
|
||||
#endif
|
||||
#define LIBS_DEBUG
|
||||
|
||||
/* Define this if you have a fairly recent system,
|
||||
|
|
@ -173,20 +164,5 @@ Boston, MA 02110-1301, USA. */
|
|||
((var) = ((int)(type) << VALBITS) + (((unsigned) (ptr) << BITS_PER_INT-VALBITS) >> BITS_PER_INT-VALBITS))
|
||||
#endif /* _LP64 */
|
||||
|
||||
#ifndef __GNUC__
|
||||
/* Turn off some "helpful" error checks for type mismatches
|
||||
that we can't fix without breaking other machines. */
|
||||
#ifdef IRIX_FORCE_32_BITS
|
||||
#ifdef THIS_IS_MAKEFILE
|
||||
#ifndef IRIX6_5
|
||||
#define C_SWITCH_MACHINE -32
|
||||
#else
|
||||
#define C_SWITCH_MACHINE -n32
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif /* not __GNUC__ */
|
||||
|
||||
/* arch-tag: fff5e139-9ae0-465d-afec-837c41ea0aa6
|
||||
(do not change this comment) */
|
||||
|
|
|
|||
|
|
@ -1,83 +0,0 @@
|
|||
/* machine description file for Mips running RISCOS version 4.
|
||||
|
||||
Copyright (C) 1992, 1999, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Emacs.
|
||||
|
||||
GNU Emacs is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3, or (at your option)
|
||||
any later version.
|
||||
|
||||
GNU Emacs is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GNU Emacs; see the file COPYING. If not, write to
|
||||
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA. */
|
||||
|
||||
|
||||
#include "mips.h"
|
||||
|
||||
/* The following line tells the configuration script what sort of
|
||||
operating system this machine is likely to run.
|
||||
USUAL-OPSYS="note"
|
||||
|
||||
NOTE-START
|
||||
Use -opsystem=usg5-2-2 normally, or -opsystem=bsd4-3 with the BSD
|
||||
world.
|
||||
NOTE-END */
|
||||
|
||||
#if 0
|
||||
/* Define MIPS2 if you have an R6000 or R4000. */
|
||||
#define MIPS2
|
||||
#endif
|
||||
|
||||
#ifdef __GNUC__
|
||||
#define C_DEBUG_SWITCH -g -O
|
||||
#else
|
||||
/* We used to have -systype bsd43, but a configure change
|
||||
now takes care of that option. */
|
||||
#ifdef MIPS2
|
||||
#define C_DEBUG_SWITCH -DMips -g3 -Wf,-XNd4000 -O -Olimit 2000 -mips2
|
||||
#else
|
||||
#define C_DEBUG_SWITCH -DMips -g3 -Wf,-XNd4000 -O -Olimit 2000
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef TERMINFO
|
||||
#undef TERMINFO
|
||||
#endif
|
||||
|
||||
#define START_FILES pre-crt0.o /lib/crt1.o
|
||||
/* Used to have -lisode, but jlp@math.byu.edu says remove it
|
||||
(for RISCOS 4.52). */
|
||||
/* ethanb@ptolemy.astro.washington.edu says crtn.o uses _ctype
|
||||
and therefore we must search libc again after crtn.o.
|
||||
The -L is used to force second -lc to find the sysv version
|
||||
of libc.a, which is needed because the BSD libc.a
|
||||
doesn't have _ctype. */
|
||||
#define LIB_STANDARD -lmld -lc /lib/crtn.o -L/usr/lib -lc
|
||||
|
||||
|
||||
#define COFF
|
||||
#undef LD_SWITCH_MACHINE
|
||||
#define LD_SWITCH_MACHINE -systype bsd43 -g3 -D 800000
|
||||
|
||||
#define NO_MODE_T
|
||||
|
||||
/* These are needed on Riscos 4.0.
|
||||
It appears that's the only system which uses mips4.h and defines BSD. */
|
||||
#ifdef BSD_SYSTEM
|
||||
#undef HAVE_STRERROR
|
||||
#undef HAVE_XRMSETDATABASE
|
||||
#undef HAVE_XSCREENRESOURCESTRING
|
||||
#undef HAVE_SETSID
|
||||
#endif
|
||||
|
||||
/* arch-tag: 56050454-0df5-4de9-b1b7-0c6ab400313c
|
||||
(do not change this comment) */
|
||||
|
|
@ -134,12 +134,6 @@ Boston, MA 02110-1301, USA. */
|
|||
|
||||
/* #define CLASH_DETECTION */
|
||||
|
||||
/* Define SHORTNAMES if the C compiler can distinguish only
|
||||
short names. It means that the stuff in ../shortnames
|
||||
must be run to convert the long names to short ones. */
|
||||
|
||||
/* #define SHORTNAMES */
|
||||
|
||||
/* The file containing the kernel's symbol table is called /unix. */
|
||||
|
||||
#define KERNEL_FILE "/unix"
|
||||
|
|
|
|||
10
src/s/hpux.h
10
src/s/hpux.h
|
|
@ -115,16 +115,6 @@ Boston, MA 02110-1301, USA. */
|
|||
|
||||
#define CLASH_DETECTION
|
||||
|
||||
/* Define SHORTNAMES if the C compiler can distinguish only
|
||||
short names. It means that the stuff in ../shortnames
|
||||
must be run to convert the long names to short ones.
|
||||
|
||||
Some USG systems support long names.
|
||||
If yours is one, DO NOT change this file!
|
||||
Do #undef SHORTNAMES in the m- file or in config.h. */
|
||||
|
||||
/* #define SHORTNAMES */
|
||||
|
||||
/* The file containing the kernel's symbol table is called /hp-ux. */
|
||||
|
||||
#define KERNEL_FILE "/hp-ux"
|
||||
|
|
|
|||
141
src/s/irix5-0.h
141
src/s/irix5-0.h
|
|
@ -1,141 +0,0 @@
|
|||
/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 5.0.
|
||||
|
||||
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Emacs.
|
||||
|
||||
GNU Emacs is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3, or (at your option)
|
||||
any later version.
|
||||
|
||||
GNU Emacs is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GNU Emacs; see the file COPYING. If not, write to
|
||||
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA. */
|
||||
|
||||
|
||||
#include "usg5-4.h"
|
||||
|
||||
#define IRIX5
|
||||
|
||||
#undef sigsetmask /* use sys_sigsetmask */
|
||||
#undef _longjmp /* use system versions, not conservative aliases */
|
||||
#undef _setjmp
|
||||
|
||||
#define SETPGRP_RELEASES_CTTY
|
||||
|
||||
#ifdef LIBS_SYSTEM
|
||||
#undef LIBS_SYSTEM
|
||||
#endif
|
||||
|
||||
#ifdef LIB_STANDARD
|
||||
#undef LIB_STANDARD
|
||||
#endif
|
||||
|
||||
#ifdef SYSTEM_TYPE
|
||||
#undef SYSTEM_TYPE
|
||||
#endif
|
||||
#define SYSTEM_TYPE "irix"
|
||||
|
||||
#ifdef SETUP_SLAVE_PTY
|
||||
#undef SETUP_SLAVE_PTY
|
||||
#endif
|
||||
|
||||
/* thomas@mathematik.uni-bremen.de says this is needed. */
|
||||
/* Make process_send_signal work by "typing" a signal character on the pty. */
|
||||
#define SIGNALS_VIA_CHARACTERS
|
||||
|
||||
/* SGI has all the fancy wait stuff, but we can't include sys/wait.h
|
||||
because it defines BIG_ENDIAN and LITTLE_ENDIAN (ugh!.) Instead
|
||||
we'll just define WNOHANG right here.
|
||||
(An implicit decl is good enough for wait3.) */
|
||||
|
||||
/* #define WNOHANG 0x1 */
|
||||
|
||||
/* No need to use sprintf to get the tty name--we get that from _getpty. */
|
||||
#ifdef PTY_TTY_NAME_SPRINTF
|
||||
#undef PTY_TTY_NAME_SPRINTF
|
||||
#endif
|
||||
#define PTY_TTY_NAME_SPRINTF
|
||||
/* No need to get the pty name at all. */
|
||||
#ifdef PTY_NAME_SPRINTF
|
||||
#undef PTY_NAME_SPRINTF
|
||||
#endif
|
||||
#define PTY_NAME_SPRINTF
|
||||
#ifdef emacs
|
||||
char *_getpty();
|
||||
#endif
|
||||
/* We need only try once to open a pty. */
|
||||
#define PTY_ITERATION
|
||||
/* Here is how to do it. */
|
||||
#define PTY_OPEN \
|
||||
{ \
|
||||
struct sigaction ocstat, cstat; \
|
||||
char * name; \
|
||||
sigemptyset(&cstat.sa_mask); \
|
||||
cstat.sa_handler = SIG_DFL; \
|
||||
cstat.sa_flags = 0; \
|
||||
sigaction(SIGCLD, &cstat, &ocstat); \
|
||||
name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); \
|
||||
sigaction(SIGCLD, &ocstat, (struct sigaction *)0); \
|
||||
if (name == 0) \
|
||||
return -1; \
|
||||
if (fd < 0) \
|
||||
return -1; \
|
||||
if (fstat (fd, &stb) < 0) \
|
||||
return -1; \
|
||||
strcpy (pty_name, name); \
|
||||
}
|
||||
|
||||
/* Since we use POSIX constructs in PTY_OPEN, we must force POSIX
|
||||
throughout. */
|
||||
#define POSIX_SIGNALS
|
||||
|
||||
/* Info from simon@lia.di.epfl.ch (Simon Leinen) suggests this is needed. */
|
||||
#define GETPGRP_NO_ARG
|
||||
|
||||
/* Ulimit(UL_GMEMLIM) is busted... */
|
||||
#define ULIMIT_BREAK_VALUE 0x14000000
|
||||
|
||||
/* Tell process_send_signal to use VSUSP instead of VSWTCH. */
|
||||
#define PREFER_VSUSP
|
||||
|
||||
/* define MAIL_USE_FLOCK if the mailer uses flock
|
||||
to interlock access to /usr/spool/mail/$USER.
|
||||
The alternative is that a lock file named
|
||||
/usr/spool/mail/$USER.lock. */
|
||||
|
||||
#define MAIL_USE_FLOCK
|
||||
|
||||
/* use K&R C */
|
||||
#if 0
|
||||
#ifndef __GNUC__
|
||||
#define C_SWITCH_SYSTEM -cckr
|
||||
#endif
|
||||
#endif
|
||||
|
||||
/* -g used not to work on Irix unless you used gas, and since gcc
|
||||
warns if you use it, turn off the warning. */
|
||||
/* -g does now work, at least on recent Irix 6 versions with gcc 2.95;
|
||||
I'm not sure about Irix 5 -- fx */
|
||||
#ifdef __GNUC__
|
||||
#define C_DEBUG_SWITCH
|
||||
#endif
|
||||
|
||||
/* Prevent the variable ospeed from being defined by -lcurses
|
||||
because it defines it with too few bytes. */
|
||||
#define ospeed ospeed_
|
||||
|
||||
#define NARROWPROTO 1
|
||||
|
||||
#define USE_MMAP_FOR_BUFFERS 1
|
||||
|
||||
/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
|
||||
(do not change this comment) */
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
#include "irix5-0.h"
|
||||
|
||||
/* as of version 5.2, irix no longer uses flock,
|
||||
according to jackr@wpd.sgi.com. */
|
||||
#undef MAIL_USE_FLOCK
|
||||
|
||||
/* C-g in select is not handled properly with restartable
|
||||
system calls. So don't use them. */
|
||||
#undef SA_RESTART
|
||||
|
||||
/* schoepf@goofy.zdv.Uni-Mainz.de reports he needed -lw with X11R6
|
||||
on Irix 5.3. I don't know which Irix version that need starts with. */
|
||||
#define NEED_LIBW
|
||||
|
||||
/* Looking at the wtmp file in filelock.c causes a crash
|
||||
for jpff@maths.bath.ac.uk.
|
||||
Note that irix6-0.h does not include this file, only irix5-0.h. */
|
||||
#define NO_WTMP_FILE
|
||||
|
||||
/* arch-tag: e2f820c1-2a3e-4cee-b5f1-6ce8ab21f439
|
||||
(do not change this comment) */
|
||||
|
|
@ -1,63 +0,0 @@
|
|||
/* Definitions file for GNU Emacs running on Silicon Graphics Irix system 6.0.
|
||||
|
||||
Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
|
||||
2007, 2008 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Emacs.
|
||||
|
||||
GNU Emacs is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 3, or (at your option)
|
||||
any later version.
|
||||
|
||||
GNU Emacs is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GNU Emacs; see the file COPYING. If not, write to
|
||||
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
||||
Boston, MA 02110-1301, USA. */
|
||||
|
||||
|
||||
#include "irix5-0.h"
|
||||
|
||||
/* Irix 6 tries to do 64 bits, but doesn't do it fully,
|
||||
so inhibit that. */
|
||||
#define IRIX_FORCE_32_BITS
|
||||
|
||||
#ifndef __GNUC__
|
||||
#define LD_SWITCH_SYSTEM -32
|
||||
#endif
|
||||
|
||||
/* This macro definition, which we inherited from irix5-0.h,
|
||||
is needed in configure on Irix 5, but gets in the way there
|
||||
on Irix 6. So get rid of it except in Makefile.in where we need it. */
|
||||
#ifndef THIS_IS_MAKEFILE
|
||||
#undef C_SWITCH_SYSTEM
|
||||
#endif
|
||||
|
||||
/* The only supported 32-bit configuration of GCC under IRIX6.x produces
|
||||
n32 MIPS ABI binaries and also supports -g. */
|
||||
#ifdef __GNUC__
|
||||
#undef C_DEBUG_SWITCH
|
||||
#define C_DEBUG_SWITCH -g
|
||||
#endif
|
||||
|
||||
#undef SA_RESTART
|
||||
|
||||
/* It turns out that the #define in irix5-0.h is needed in Irix 6 as well. */
|
||||
#if 0
|
||||
/* Cancel the #define that is in irix5-0.h. */
|
||||
#undef ospeed
|
||||
#endif
|
||||
|
||||
#undef TIOCSIGSEND
|
||||
|
||||
/* Tested on Irix 6.5. SCM worked on earlier versions. */
|
||||
#define GC_SETJMP_WORKS 1
|
||||
#define GC_MARK_STACK GC_MAKE_GCPROS_NOOPS
|
||||
|
||||
/* arch-tag: a775e465-a619-4655-a58f-5982aad0c624
|
||||
(do not change this comment) */
|
||||
117
src/s/irix6-5.h
117
src/s/irix6-5.h
|
|
@ -22,19 +22,117 @@ Boston, MA 02110-1301, USA. */
|
|||
|
||||
|
||||
#define IRIX6_5 /* used in m/iris4d */
|
||||
#include "irix5-0.h"
|
||||
#include "usg5-4.h"
|
||||
|
||||
#undef sigsetmask /* use sys_sigsetmask */
|
||||
#undef _longjmp /* use system versions, not conservative aliases */
|
||||
#undef _setjmp
|
||||
|
||||
#define SETPGRP_RELEASES_CTTY
|
||||
|
||||
#ifdef LIBS_SYSTEM
|
||||
#undef LIBS_SYSTEM
|
||||
#endif
|
||||
|
||||
#ifdef LIB_STANDARD
|
||||
#undef LIB_STANDARD
|
||||
#endif
|
||||
|
||||
#ifdef SYSTEM_TYPE
|
||||
#undef SYSTEM_TYPE
|
||||
#endif
|
||||
#define SYSTEM_TYPE "irix"
|
||||
|
||||
#ifdef SETUP_SLAVE_PTY
|
||||
#undef SETUP_SLAVE_PTY
|
||||
#endif
|
||||
|
||||
/* thomas@mathematik.uni-bremen.de says this is needed. */
|
||||
/* Make process_send_signal work by "typing" a signal character on the pty. */
|
||||
#define SIGNALS_VIA_CHARACTERS
|
||||
|
||||
/* SGI has all the fancy wait stuff, but we can't include sys/wait.h
|
||||
because it defines BIG_ENDIAN and LITTLE_ENDIAN (ugh!.) Instead
|
||||
we'll just define WNOHANG right here.
|
||||
(An implicit decl is good enough for wait3.) */
|
||||
|
||||
/* #define WNOHANG 0x1 */
|
||||
|
||||
/* No need to use sprintf to get the tty name--we get that from _getpty. */
|
||||
#ifdef PTY_TTY_NAME_SPRINTF
|
||||
#undef PTY_TTY_NAME_SPRINTF
|
||||
#endif
|
||||
#define PTY_TTY_NAME_SPRINTF
|
||||
/* No need to get the pty name at all. */
|
||||
#ifdef PTY_NAME_SPRINTF
|
||||
#undef PTY_NAME_SPRINTF
|
||||
#endif
|
||||
#define PTY_NAME_SPRINTF
|
||||
#ifdef emacs
|
||||
char *_getpty();
|
||||
#endif
|
||||
/* We need only try once to open a pty. */
|
||||
#define PTY_ITERATION
|
||||
/* Here is how to do it. */
|
||||
#define PTY_OPEN \
|
||||
{ \
|
||||
struct sigaction ocstat, cstat; \
|
||||
char * name; \
|
||||
sigemptyset(&cstat.sa_mask); \
|
||||
cstat.sa_handler = SIG_DFL; \
|
||||
cstat.sa_flags = 0; \
|
||||
sigaction(SIGCLD, &cstat, &ocstat); \
|
||||
name = _getpty (&fd, O_RDWR | O_NDELAY, 0600, 0); \
|
||||
sigaction(SIGCLD, &ocstat, (struct sigaction *)0); \
|
||||
if (name == 0) \
|
||||
return -1; \
|
||||
if (fd < 0) \
|
||||
return -1; \
|
||||
if (fstat (fd, &stb) < 0) \
|
||||
return -1; \
|
||||
strcpy (pty_name, name); \
|
||||
}
|
||||
|
||||
/* Since we use POSIX constructs in PTY_OPEN, we must force POSIX
|
||||
throughout. */
|
||||
#define POSIX_SIGNALS
|
||||
|
||||
/* Info from simon@lia.di.epfl.ch (Simon Leinen) suggests this is needed. */
|
||||
#define GETPGRP_NO_ARG
|
||||
|
||||
/* Ulimit(UL_GMEMLIM) is busted... */
|
||||
#define ULIMIT_BREAK_VALUE 0x14000000
|
||||
|
||||
/* Tell process_send_signal to use VSUSP instead of VSWTCH. */
|
||||
#define PREFER_VSUSP
|
||||
|
||||
/* define MAIL_USE_FLOCK if the mailer uses flock
|
||||
to interlock access to /usr/spool/mail/$USER.
|
||||
The alternative is that a lock file named
|
||||
/usr/spool/mail/$USER.lock. */
|
||||
|
||||
#define MAIL_USE_FLOCK
|
||||
|
||||
/* -g used not to work on Irix unless you used gas, and since gcc
|
||||
warns if you use it, turn off the warning. */
|
||||
/* -g does now work, at least on recent Irix 6 versions with gcc 2.95;
|
||||
I'm not sure about Irix 5 -- fx */
|
||||
#ifdef __GNUC__
|
||||
#define C_DEBUG_SWITCH
|
||||
#endif
|
||||
|
||||
#define NARROWPROTO 1
|
||||
|
||||
#define USE_MMAP_FOR_BUFFERS 1
|
||||
|
||||
/* arch-tag: ad0660e0-acf8-46ae-b866-4f3df5b1101b
|
||||
(do not change this comment) */
|
||||
|
||||
|
||||
#if _MIPS_SZLONG == 64 /* -mabi=64 (gcc) or -64 (MIPSpro) */
|
||||
#define _LP64 /* lisp.h takes care of the rest */
|
||||
#endif /* _MIPS_SZLONG */
|
||||
|
||||
/* This macro definition, which we inherited from irix5-0.h,
|
||||
is needed in configure on Irix 5, but gets in the way there
|
||||
on Irix 6. So get rid of it except in Makefile.in where we need it. */
|
||||
#ifndef THIS_IS_MAKEFILE
|
||||
#undef C_SWITCH_SYSTEM
|
||||
#endif
|
||||
|
||||
/* The only supported 32-bit configuration of GCC under IRIX6.x produces
|
||||
n32 MIPS ABI binaries and also supports -g. */
|
||||
#ifdef __GNUC__
|
||||
|
|
@ -51,9 +149,6 @@ Boston, MA 02110-1301, USA. */
|
|||
|
||||
#undef SA_RESTART
|
||||
|
||||
/* Cancel the #define that is in irix5-0.h. */
|
||||
#undef ospeed
|
||||
|
||||
#undef TIOCSIGSEND /* defined in usg5-4.h */
|
||||
|
||||
/* Tested on Irix 6.5. SCM worked on earlier versions. */
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
/* I don't care if this doesn't do more than including bsd4-3.h;
|
||||
Mach is not bsd4-3 and the moment you forget it chances are that
|
||||
you're in deep shit. */
|
||||
|
||||
#include "bsd4-3.h"
|
||||
|
||||
/* arch-tag: 7f7f00f6-ae34-413e-9e6a-1d3b3e3d07e8
|
||||
(do not change this comment) */
|
||||
|
|
@ -160,8 +160,6 @@ You lose; /* Emacs for DOS must be compiled with DJGPP */
|
|||
|
||||
#if __DJGPP__ < 2
|
||||
|
||||
#define NO_MODE_T
|
||||
|
||||
/* New chdir () routine.
|
||||
DJGPP v2.0 and later doesn't need it because its chdir() does
|
||||
set the drive itself. */
|
||||
|
|
|
|||
|
|
@ -1,14 +0,0 @@
|
|||
#include "bsd4-3.h"
|
||||
|
||||
/* This file has changes that Jost Krieger <x920031@rubb.rz.ruhr-uni-bochum.de>
|
||||
says are necessary. */
|
||||
|
||||
/* No declaration in system header files. */
|
||||
extern double atof ();
|
||||
|
||||
#define LD_SWITCH_SYSTEM -non_shared
|
||||
|
||||
#define GETPGRP_NO_ARG
|
||||
|
||||
/* arch-tag: e8ddf21d-72a0-476d-b33e-364f8b20e3b7
|
||||
(do not change this comment) */
|
||||
|
|
@ -103,12 +103,6 @@ Boston, MA 02110-1301, USA. */
|
|||
|
||||
/* #define CLASH_DETECTION */
|
||||
|
||||
/* Define SHORTNAMES if the C compiler can distinguish only
|
||||
short names. It means that the stuff in ../shortnames
|
||||
must be run to convert the long names to short ones. */
|
||||
|
||||
#define SHORTNAMES
|
||||
|
||||
/* The file containing the kernel's symbol table is called /unix. */
|
||||
|
||||
#define KERNEL_FILE "/unix"
|
||||
|
|
|
|||
|
|
@ -102,12 +102,6 @@ Boston, MA 02110-1301, USA. */
|
|||
|
||||
/* #define CLASH_DETECTION */
|
||||
|
||||
/* Define SHORTNAMES if the C compiler can distinguish only
|
||||
short names. It means that the stuff in ../shortnames
|
||||
must be run to convert the long names to short ones. */
|
||||
|
||||
/* #define SHORTNAMES */
|
||||
|
||||
/* The file containing the kernel's symbol table is called /unix. */
|
||||
|
||||
#define KERNEL_FILE "/unix"
|
||||
|
|
|
|||
|
|
@ -102,12 +102,6 @@ Boston, MA 02110-1301, USA. */
|
|||
|
||||
/* #define CLASH_DETECTION */
|
||||
|
||||
/* Define SHORTNAMES if the C compiler can distinguish only
|
||||
short names. It means that the stuff in ../shortnames
|
||||
must be run to convert the long names to short ones. */
|
||||
|
||||
/* #define SHORTNAMES */
|
||||
|
||||
/* The file containing the kernel's symbol table is called /unix. */
|
||||
|
||||
#define KERNEL_FILE "/unix"
|
||||
|
|
|
|||
|
|
@ -113,12 +113,6 @@ Boston, MA 02110-1301, USA. */
|
|||
|
||||
/* #define CLASH_DETECTION */
|
||||
|
||||
/* Define SHORTNAMES if the C compiler can distinguish only
|
||||
short names. It means that the stuff in ../shortnames
|
||||
must be run to convert the long names to short ones. */
|
||||
|
||||
/* #define SHORTNAMES */
|
||||
|
||||
/* The file containing the kernel's symbol table is called /unix. */
|
||||
|
||||
#define KERNEL_FILE "/unix"
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
#include "vms.h"
|
||||
#define VMS4_0
|
||||
|
||||
/* arch-tag: 734e1c69-d514-4441-bbcd-8b5db8ab1892
|
||||
(do not change this comment) */
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
#include "vms.h"
|
||||
#define VMS4_2
|
||||
|
||||
/* arch-tag: d9ff67bc-a899-44b2-a618-a73c821bb559
|
||||
(do not change this comment) */
|
||||
|
|
@ -1,7 +0,0 @@
|
|||
#include "vms.h"
|
||||
#define VMS4_4
|
||||
|
||||
#undef NO_HYPHENS_IN_FILENAMES
|
||||
|
||||
/* arch-tag: 2e65c7ad-0d17-45a0-b4cb-3e76c72ea9d5
|
||||
(do not change this comment) */
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
#include "vms.h"
|
||||
#define VMS5_5
|
||||
#define VMS4_4
|
||||
|
||||
#undef NO_HYPHENS_IN_FILENAMES
|
||||
|
||||
/* The bug that SHARABLE_LIB_BUG fixes is gone in version 5.5 of VMS.
|
||||
And defining it causes lossage because sys_errlist has a different
|
||||
number of elements. */
|
||||
#undef SHARABLE_LIB_BUG
|
||||
|
||||
/* arch-tag: 92acc416-61fe-44ae-b0e0-710cb9e38ec6
|
||||
(do not change this comment) */
|
||||
|
|
@ -149,20 +149,6 @@ unexec (new_name, a_name, data_start, bss_start, entry_address)
|
|||
if (new < 0) fatal_unexec ("creating %s", new_name);
|
||||
|
||||
hdr = *((struct headers *)TEXT_START);
|
||||
#ifdef MIPS2
|
||||
if (hdr.fhdr.f_magic != MIPSELMAGIC
|
||||
&& hdr.fhdr.f_magic != MIPSEBMAGIC
|
||||
&& hdr.fhdr.f_magic != (MIPSELMAGIC | 1)
|
||||
&& hdr.fhdr.f_magic != (MIPSEBMAGIC | 1))
|
||||
{
|
||||
fprintf (stderr,
|
||||
"unexec: input file magic number is %x, not %x, %x, %x or %x.\n",
|
||||
hdr.fhdr.f_magic,
|
||||
MIPSELMAGIC, MIPSEBMAGIC,
|
||||
MIPSELMAGIC | 1, MIPSEBMAGIC | 1);
|
||||
exit(1);
|
||||
}
|
||||
#else /* not MIPS2 */
|
||||
if (hdr.fhdr.f_magic != MIPSELMAGIC
|
||||
&& hdr.fhdr.f_magic != MIPSEBMAGIC)
|
||||
{
|
||||
|
|
@ -170,7 +156,6 @@ unexec (new_name, a_name, data_start, bss_start, entry_address)
|
|||
hdr.fhdr.f_magic, MIPSELMAGIC, MIPSEBMAGIC);
|
||||
exit (1);
|
||||
}
|
||||
#endif /* not MIPS2 */
|
||||
if (hdr.fhdr.f_opthdr != sizeof (hdr.aout))
|
||||
{
|
||||
fprintf (stderr, "unexec: input a.out header is %d bytes, not %d.\n",
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue