d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow alpha kernels to compile again- make sure opt_ddb.h is included

Browse Source 
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.
This commit is contained in:
Matt Jacob 2002-01-17 02:16:35 +00:00
parent e30e3e9e48
commit d5befad6dd
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/alpha/alpha/machdep.c
View File

@ -169,6 +169,7 @@ SYSCTL_STRING(_hw, HW_MODEL, model, CTLFLAG_RD, cpu_model, 0, "");
#ifdef DDB #ifdef DDB
/* start and end of kernel symbol table */ /* start and end of kernel symbol table */
void *ksym_start, *ksym_end; void *ksym_start, *ksym_end;
db_regs_t ddb_regs;
#endif #endif
int alpha_unaligned_print = 1; /* warn about unaligned accesses */ int alpha_unaligned_print = 1; /* warn about unaligned accesses */

5
sys/alpha/include/db_machdep.h
View File

@ -35,6 +35,7 @@
* Machine-dependent defines for new kernel debugger. * Machine-dependent defines for new kernel debugger.
*/ */
#include "opt_ddb.h"
#include "opt_simos.h" #include "opt_simos.h"
#include <sys/param.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 long db_expr_t; /* expression - signed */
typedef struct trapframe db_regs_t; 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 DDB_REGS (&ddb_regs)
#define PC_REGS(regs) ((db_addr_t)(regs)->tf_regs[FRAME_PC]) #define PC_REGS(regs) ((db_addr_t)(regs)->tf_regs[FRAME_PC])

2
sys/modules/osf1/Makefile
View File

@ -7,7 +7,7 @@ MAINTAINER= gallatin@FreeBSD.org
KMOD= osf1 KMOD= osf1
SRCS= osf1_ioctl.c osf1_misc.c osf1_signal.c osf1_sysent.c \ 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 \ 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 #CFLAGS+= -g