diff options
| author | mjacob <mjacob@FreeBSD.org> | 2002-01-17 02:16:35 +0000 |
|---|---|---|
| committer | mjacob <mjacob@FreeBSD.org> | 2002-01-17 02:16:35 +0000 |
| commit | 30e4a25f3062bbf6e045493f7e89c9fb9b832d25 (patch) | |
| tree | 87c043face5073d62e0bc477ce029dc3b7cf6cfa | |
| parent | adc513481a6c07a06b3a9cbd6c74884346562a78 (diff) | |
| download | FreeBSD-src-30e4a25f3062bbf6e045493f7e89c9fb9b832d25.zip FreeBSD-src-30e4a25f3062bbf6e045493f7e89c9fb9b832d25.tar.gz | |
Allow alpha kernels to compile again- make sure opt_ddb.h is included
and the reference to db_regs is *extern* from alpha/include/db_machdep.h
(put it in alpha/alpha/machdep.c)- this avoids the problems we've had
about different 'common' sizes prohibiting the kernel from linking.
| -rw-r--r-- | sys/alpha/alpha/machdep.c | 1 | ||||
| -rw-r--r-- | sys/alpha/include/db_machdep.h | 5 | ||||
| -rw-r--r-- | sys/modules/osf1/Makefile | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/sys/alpha/alpha/machdep.c b/sys/alpha/alpha/machdep.c index d43b841..001a684 100644 --- a/sys/alpha/alpha/machdep.c +++ b/sys/alpha/alpha/machdep.c @@ -169,6 +169,7 @@ SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, ""); #ifdef DDB /* start and end of kernel symbol table */ void *ksym_start, *ksym_end; +db_regs_t ddb_regs; #endif int alpha_unaligned_print = 1; /* warn about unaligned accesses */ diff --git a/sys/alpha/include/db_machdep.h b/sys/alpha/include/db_machdep.h index 8e95af8..786f271 100644 --- a/sys/alpha/include/db_machdep.h +++ b/sys/alpha/include/db_machdep.h @@ -35,6 +35,7 @@ * Machine-dependent defines for new kernel debugger. */ +#include "opt_ddb.h" #include "opt_simos.h" #include <sys/param.h> @@ -47,7 +48,9 @@ typedef vm_offset_t db_addr_t; /* address - unsigned */ typedef long db_expr_t; /* expression - signed */ typedef struct trapframe db_regs_t; -db_regs_t ddb_regs; /* register state */ +#ifdef DDB +extern db_regs_t ddb_regs; /* register state */ +#endif #define DDB_REGS (&ddb_regs) #define PC_REGS(regs) ((db_addr_t)(regs)->tf_regs[FRAME_PC]) diff --git a/sys/modules/osf1/Makefile b/sys/modules/osf1/Makefile index 33fec68..0d8d22b 100644 --- a/sys/modules/osf1/Makefile +++ b/sys/modules/osf1/Makefile @@ -7,7 +7,7 @@ MAINTAINER= gallatin@FreeBSD.org KMOD= osf1 SRCS= osf1_ioctl.c osf1_misc.c osf1_signal.c osf1_sysent.c \ osf1_mount.c imgact_osf1.c osf1_sysvec.c opt_compat.h \ - opt_simos.h opt_nfs.h device_if.h bus_if.h vnode_if.h + opt_simos.h opt_ddb.h opt_nfs.h device_if.h bus_if.h vnode_if.h #CFLAGS+= -g |
