aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRichard M. Stallman1995-06-29 01:40:18 +0000
committerRichard M. Stallman1995-06-29 01:40:18 +0000
commita46849a84344ea9811b3ff3bff72d68f83c1f417 (patch)
tree6a2a81701661391e94e675cfec54d6f2ee5ea877 /src
parentcaaf3c4ed0c2c64517cb5b0175326755a9904961 (diff)
downloademacs-a46849a84344ea9811b3ff3bff72d68f83c1f417.tar.gz
emacs-a46849a84344ea9811b3ff3bff72d68f83c1f417.zip
[MACH]: Use built-in alloca, set START_FILES.
Diffstat (limited to 'src')
-rw-r--r--src/m/pmax.h11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/m/pmax.h b/src/m/pmax.h
index 3e9c93ca025..678f6a420de 100644
--- a/src/m/pmax.h
+++ b/src/m/pmax.h
@@ -18,9 +18,14 @@ NOTE-END */
18#define MAIL_USE_FLOCK 18#define MAIL_USE_FLOCK
19#define HAVE_UNION_WAIT 19#define HAVE_UNION_WAIT
20 20
21
22#ifdef MACH
23#define START_FILES pre-crt0.o /usr/lib/crt0.o
24#else
21/* This line starts being needed with ultrix 4.0. */ 25/* This line starts being needed with ultrix 4.0. */
22/* You must delete it for version 3.1. */ 26/* You must delete it for version 3.1. */
23#define START_FILES pre-crt0.o /usr/lib/cmplrs/cc/crt0.o 27#define START_FILES pre-crt0.o /usr/lib/cmplrs/cc/crt0.o
28#endif
24 29
25/* Supposedly the following will overcome a kernel bug. */ 30/* Supposedly the following will overcome a kernel bug. */
26#undef LD_SWITCH_MACHINE 31#undef LD_SWITCH_MACHINE
@@ -37,7 +42,7 @@ NOTE-END */
37#define SYSTEM_MALLOC 42#define SYSTEM_MALLOC
38#endif 43#endif
39 44
40/* Override what m-mips.h says about this. */ 45/* Override what mips.h says about this. */
41#undef LINKER 46#undef LINKER
42 47
43/* Ultrix 4.2 (perhaps also 4.1) implements O_NONBLOCK 48/* Ultrix 4.2 (perhaps also 4.1) implements O_NONBLOCK
@@ -45,7 +50,7 @@ NOTE-END */
45 and it causes hanging in read_process_output. */ 50 and it causes hanging in read_process_output. */
46#define BROKEN_O_NONBLOCK 51#define BROKEN_O_NONBLOCK
47 52
48#ifdef OSF1 53#if defined (OSF1) || defined (MACH)
49#undef C_ALLOCA 54#undef C_ALLOCA
50#define HAVE_ALLOCA 55#define HAVE_ALLOCA
51#endif 56#endif
@@ -64,6 +69,7 @@ NOTE-END */
64#undef KERNEL_FILE 69#undef KERNEL_FILE
65#define KERNEL_FILE "/vmunix" 70#define KERNEL_FILE "/vmunix"
66 71
72#ifndef MACH
67/* Jim Wilson writes: 73/* Jim Wilson writes:
68 [...] The X11 include files that Dec distributes with Ultrix 74 [...] The X11 include files that Dec distributes with Ultrix
69 are bogus. 75 are bogus.
@@ -89,6 +95,7 @@ NOTE-END */
89 going to disable non-variadic prototypes, we also need to disable 95 going to disable non-variadic prototypes, we also need to disable
90 variadic prototypes. --kwzh@gnu.ai.mit.edu */ 96 variadic prototypes. --kwzh@gnu.ai.mit.edu */
91#define C_SWITCH_X_MACHINE -DNeedFunctionPrototypes=0 -DNeedVarargsPrototypes=0 97#define C_SWITCH_X_MACHINE -DNeedFunctionPrototypes=0 -DNeedVarargsPrototypes=0
98#endif
92 99
93/* Enable a fix in process.c. */ 100/* Enable a fix in process.c. */
94#define SET_CHILD_PTY_PGRP 101#define SET_CHILD_PTY_PGRP