From 6b5dd84f4e939091bfe5e1cd9f6fdf3f6e686acf Mon Sep 17 00:00:00 2001
From: Valery Ushakov <uwe@stderr.spb.ru>
Date: Fri, 13 Jan 2017 16:55:10 +0300
Subject: Don't hardcode OBJTYPE.

---
 emu/NetBSD/mkfile | 2 --
 1 file changed, 2 deletions(-)

(limited to 'emu/NetBSD/mkfile')

diff --git a/emu/NetBSD/mkfile b/emu/NetBSD/mkfile
index effbaefe..fcf5a658 100644
--- a/emu/NetBSD/mkfile
+++ b/emu/NetBSD/mkfile
@@ -1,8 +1,6 @@
 SYSTARG=NetBSD
-OBJTYPE=386
 <../../mkconfig
 SYSTARG=NetBSD
-OBJTYPE=386
 
 #Configurable parameters
 
-- 
cgit v1.2.3


From 887c05cf54e7dbd2381ecc932bd343e73343d1b6 Mon Sep 17 00:00:00 2001
From: Valery Ushakov <uwe@stderr.spb.ru>
Date: Sat, 26 Aug 2017 11:01:25 +0300
Subject: PowerPC needs segflush()

---
 emu/NetBSD/mkfile           |  1 +
 emu/NetBSD/os.c             |  8 --------
 emu/NetBSD/segflush-386.c   |  9 +++++++++
 emu/NetBSD/segflush-power.c | 12 ++++++++++++
 4 files changed, 22 insertions(+), 8 deletions(-)
 create mode 100644 emu/NetBSD/segflush-386.c
 create mode 100644 emu/NetBSD/segflush-power.c

(limited to 'emu/NetBSD/mkfile')

diff --git a/emu/NetBSD/mkfile b/emu/NetBSD/mkfile
index fcf5a658..5af02362 100644
--- a/emu/NetBSD/mkfile
+++ b/emu/NetBSD/mkfile
@@ -22,6 +22,7 @@ X11LIBS= -L/usr/X11R7/lib -R/usr/X11R7/lib -lXext -lX11
 OBJ=\
 	asm-$OBJTYPE.$O\
 	os.$O\
+	segflush-$OBJTYPE.$O\
 	$CONF.root.$O\
 	lock.$O\
 	$DEVS\
diff --git a/emu/NetBSD/os.c b/emu/NetBSD/os.c
index e299a188..b6ffab99 100644
--- a/emu/NetBSD/os.c
+++ b/emu/NetBSD/os.c
@@ -527,11 +527,3 @@ stackalloc(Proc *p, void **tos)
 	*(Proc **)rv = p;
 	return rv;
 }
-
-int
-segflush(void *a, ulong n)
-{
-	USED(a);
-	USED(n);
-	return 0;
-}
diff --git a/emu/NetBSD/segflush-386.c b/emu/NetBSD/segflush-386.c
new file mode 100644
index 00000000..cdf0496b
--- /dev/null
+++ b/emu/NetBSD/segflush-386.c
@@ -0,0 +1,9 @@
+#include "dat.h"
+
+int
+segflush(void *a, ulong n)
+{
+	USED(a);
+	USED(n);
+	return 0;
+}
diff --git a/emu/NetBSD/segflush-power.c b/emu/NetBSD/segflush-power.c
new file mode 100644
index 00000000..845d74f6
--- /dev/null
+++ b/emu/NetBSD/segflush-power.c
@@ -0,0 +1,12 @@
+#include <sys/types.h>
+#include <machine/cpu.h>
+
+#include "dat.h"
+
+
+int
+segflush(void *a, ulong n)
+{
+	__syncicache(a, n);
+	return 0;
+}
-- 
cgit v1.2.3


From f6a76de4c68187d3916866f73e58afce6998111b Mon Sep 17 00:00:00 2001
From: Valery Ushakov <uwe@stderr.spb.ru>
Date: Sat, 26 Aug 2017 11:10:09 +0300
Subject: Tweak to reduce diff with Linux.

---
 emu/NetBSD/mkfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'emu/NetBSD/mkfile')

diff --git a/emu/NetBSD/mkfile b/emu/NetBSD/mkfile
index 5af02362..ce001d96 100644
--- a/emu/NetBSD/mkfile
+++ b/emu/NetBSD/mkfile
@@ -36,8 +36,6 @@ KERNDATE=`{$NDATE}
 
 default:V:	$O.$CONF
 
-<../port/portmkfile
-
 $O.$CONF:	$OBJ $CONF.c $CONF.root.h $LIBFILES
 	$CC $CFLAGS '-DKERNDATE='$KERNDATE $CONF.c
 	$LD $LDFLAGS -o $target $OBJ $CONF.$O $LIBFILES $SYSLIBS
@@ -45,4 +43,6 @@ $O.$CONF:	$OBJ $CONF.c $CONF.root.h $LIBFILES
 install:V: $O.$CONF
 	cp $O.$CONF $INSTALLDIR/$CONF
 
+<../port/portmkfile
+
 devfs.$O:	../port/devfs-posix.c
-- 
cgit v1.2.3