Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/powerpc/include For _LP64, disable members of struc...



details:   https://anonhg.NetBSD.org/src/rev/e8f886f97168
branches:  trunk
changeset: 960076:e8f886f97168
user:      rin <rin%NetBSD.org@localhost>
date:      Sun Mar 07 14:31:53 2021 +0000

description:
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...

diffstat:

 sys/arch/powerpc/include/proc.h |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r dc6832b30526 -r e8f886f97168 sys/arch/powerpc/include/proc.h
--- a/sys/arch/powerpc/include/proc.h   Sun Mar 07 14:31:20 2021 +0000
+++ b/sys/arch/powerpc/include/proc.h   Sun Mar 07 14:31:53 2021 +0000
@@ -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 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



Home | Main Index | Thread Index | Old Index