From 857dfc7058bac019eed3f56f40b13100938b28e5 Mon Sep 17 00:00:00 2001
From: kleink <kleink@NetBSD.org>
Date: Tue, 15 Jun 1999 15:26:34 +0000
Subject: [PATCH] Slightly rearrange the SSIR inline assembly implementation in
 order to avoid making assumptions on C symbol name prefixes.

---
 sys/arch/hp300/include/intr.h   | 6 +++---
 sys/arch/mac68k/include/intr.h  | 6 +++---
 sys/arch/next68k/include/intr.h | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/arch/hp300/include/intr.h b/sys/arch/hp300/include/intr.h
index 38255c0c6488..06eb0e51568f 100644
--- a/sys/arch/hp300/include/intr.h
+++ b/sys/arch/hp300/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.4 1998/05/18 17:37:38 kleink Exp $	*/
+/*	$NetBSD: intr.h,v 1.5 1999/06/15 15:26:34 kleink Exp $	*/
 
 /*-
  * Copyright (c) 1996, 1997 The NetBSD Foundation, Inc.
@@ -165,9 +165,9 @@ extern volatile u_int8_t ssir;
 #define	SIR_CLOCK	0x02
 
 #define	siron(mask)	\
-	__asm __volatile ( "orb %0,_ssir" : : "i" ((mask)))
+	__asm __volatile ( "orb %1,%0" : "=m" (ssir) : "i" ((mask)))
 #define	siroff(mask)	\
-	__asm __volatile ( "andb %0,_ssir" : : "ir" (~(mask)));
+	__asm __volatile ( "andb %1,%0" : "=m" (ssir) : "ir" (~(mask)));
 
 #define	setsoftnet()	siron(SIR_NET)
 #define	setsoftclock()	siron(SIR_CLOCK)
diff --git a/sys/arch/mac68k/include/intr.h b/sys/arch/mac68k/include/intr.h
index 01c65c19ad1d..c0dc66817511 100644
--- a/sys/arch/mac68k/include/intr.h
+++ b/sys/arch/mac68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.13 1999/02/28 04:52:07 scottr Exp $	*/
+/*	$NetBSD: intr.h,v 1.14 1999/06/15 15:26:34 kleink Exp $	*/
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -129,9 +129,9 @@ extern volatile u_int8_t ssir;
 #define SIR_ADB		0x10
 
 #define	siron(mask)	\
-	__asm __volatile ( "orb %0,_ssir" : : "i" (mask))
+	__asm __volatile ( "orb %1,%0" : "=m" (ssir) : "i" (mask))
 #define	siroff(mask)	\
-	__asm __volatile ( "andb %0,_ssir" : : "ir" (~(mask)));
+	__asm __volatile ( "andb %1,%0" : "=m" (ssir) : "ir" (~(mask)));
 
 #define	setsoftnet()	siron(SIR_NET)
 #define	setsoftclock()	siron(SIR_CLOCK)
diff --git a/sys/arch/next68k/include/intr.h b/sys/arch/next68k/include/intr.h
index 203612ceb227..bf05c0c22608 100644
--- a/sys/arch/next68k/include/intr.h
+++ b/sys/arch/next68k/include/intr.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.2 1998/11/10 22:45:44 dbj Exp $	*/
+/*	$NetBSD: intr.h,v 1.3 1999/06/15 15:26:34 kleink Exp $	*/
 
 /*
  * Copyright (C) 1997 Scott Reynolds
@@ -137,9 +137,9 @@ extern volatile u_int8_t ssir;
 #define SIR_ADB		0x10
 
 #define	siron(mask)	\
-	__asm __volatile ( "orb %0,_ssir" : : "i" (mask))
+	__asm __volatile ( "orb %1,%0" : "=m" (ssir) : "i" (mask))
 #define	siroff(mask)	\
-	__asm __volatile ( "andb %0,_ssir" : : "ir" (~(mask)));
+	__asm __volatile ( "andb %1,%0" : "=m" (ssir) : "ir" (~(mask)));
 
 #define	setsoftnet()	siron(SIR_NET)
 #define	setsoftclock()	siron(SIR_CLOCK)