[src/pgoyette-compat]: src/sys/arch/sparc64/sparc64 Remove conditional compil...

[pgoyette <pgoyette%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0fa66e6c8199
branches:  pgoyette-compat
changeset: 830851:0fa66e6c8199
user:      pgoyette <pgoyette%NetBSD.org@localhost>
date:      Tue Oct 02 22:00:15 2018 +0000

description:
Remove conditional compilation based on COMPAT_SUNOS - just update the
sf_scp field regardless.  We've previously removed the comparison that
checks if a lwp's emul is emul_sunos, so now we can also remove the
include for "opt_sunos.h"

diffstat:

 sys/arch/sparc64/sparc64/netbsd32_machdep_13.c |  5 ++---
 sys/arch/sparc64/sparc64/netbsd32_machdep_16.c |  7 ++-----
 2 files changed, 4 insertions(+), 8 deletions(-)

diffs (54 lines):

diff -r 80940a45724e -r 0fa66e6c8199 sys/arch/sparc64/sparc64/netbsd32_machdep_13.c
--- a/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c    Tue Oct 02 01:43:53 2018 +0000
+++ b/sys/arch/sparc64/sparc64/netbsd32_machdep_13.c    Tue Oct 02 22:00:15 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_machdep_13.c,v 1.1.2.1 2018/09/30 00:17:55 pgoyette Exp $     */
+/*     $NetBSD: netbsd32_machdep_13.c,v 1.1.2.2 2018/10/02 22:00:15 pgoyette Exp $     */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,11 +27,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_13.c,v 1.1.2.1 2018/09/30 00:17:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_13.c,v 1.1.2.2 2018/10/02 22:00:15 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
-#include "opt_compat_sunos.h"
 #include "opt_modular.h"
 #include "opt_execfmt.h"
 #include "firm_events.h"
diff -r 80940a45724e -r 0fa66e6c8199 sys/arch/sparc64/sparc64/netbsd32_machdep_16.c
--- a/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c    Tue Oct 02 01:43:53 2018 +0000
+++ b/sys/arch/sparc64/sparc64/netbsd32_machdep_16.c    Tue Oct 02 22:00:15 2018 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: netbsd32_machdep_16.c,v 1.1.2.1 2018/09/30 00:17:55 pgoyette Exp $     */
+/*     $NetBSD: netbsd32_machdep_16.c,v 1.1.2.2 2018/10/02 22:00:15 pgoyette Exp $     */
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,11 +27,10 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.1 2018/09/30 00:17:55 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep_16.c,v 1.1.2.2 2018/10/02 22:00:15 pgoyette Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_compat_netbsd.h"
-#include "opt_compat_sunos.h"
 #include "opt_modular.h"
 #include "opt_execfmt.h"
 #include "firm_events.h"
@@ -153,9 +152,7 @@
         */
        sf.sf_signo = sig;
        sf.sf_code = (u_int)ksi->ksi_trap;
-#if defined(COMPAT_SUNOS) || defined(MODULAR)
        sf.sf_scp = (u_long)&fp->sf_sc;
-#endif
        sf.sf_addr = 0;                 /* XXX */
 
        /*