Module Name:    src
Committed By:   rin
Date:           Sun Mar  7 14:31:53 UTC 2021

Modified Files:
        src/sys/arch/powerpc/include: proc.h

Log Message:
For _LP64, disable members of struct mdproc just for compatible with
booke and ibm4xx, even if MODULAR or _MODULE is defined.

Fix build failure for evbppc64 due to CTASSERT in COND_SET_STRUCT,
which restricts sizeof(struct mdproc) < 31 for unknown reason...


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/include/proc.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/arch/powerpc/include/proc.h
diff -u src/sys/arch/powerpc/include/proc.h:1.14 src/sys/arch/powerpc/include/proc.h:1.15
--- src/sys/arch/powerpc/include/proc.h:1.14	Sat Mar  6 08:08:19 2021
+++ src/sys/arch/powerpc/include/proc.h	Sun Mar  7 14:31:53 2021
@@ -1,4 +1,4 @@
-/*	$NetBSD: proc.h,v 1.14 2021/03/06 08:08:19 rin Exp $	*/
+/*	$NetBSD: proc.h,v 1.15 2021/03/07 14:31:53 rin Exp $	*/
 
 /*-
  * Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -53,7 +53,7 @@ struct trapframe;
 struct mdproc {
 	void (*md_syscall)(struct trapframe *);
 #if defined(PPC_BOOKE) || defined(PPC_IBM4XX) || \
-    defined(MODULAR) || defined(_MODULE)
+    ((defined(MODULAR) || defined(_MODULE)) && !defined(_LP64))
 	vaddr_t md_ss_addr[2];
 	uint32_t md_ss_insn[2];
 #endif

Reply via email to