Module Name: src
Committed By: matt
Date: Wed Aug 21 06:07:26 UTC 2013
Modified Files:
src/sys/arch/acorn26/stand: Makefile.buildboot
src/sys/arch/acorn26/stand/lib: riscoscalls.S
Log Message:
Unified syntax
<bsd.klinks.mk> (remove uneeded lines)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/acorn26/stand/Makefile.buildboot
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/acorn26/stand/lib/riscoscalls.S
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/acorn26/stand/Makefile.buildboot
diff -u src/sys/arch/acorn26/stand/Makefile.buildboot:1.16 src/sys/arch/acorn26/stand/Makefile.buildboot:1.17
--- src/sys/arch/acorn26/stand/Makefile.buildboot:1.16 Thu Aug 15 21:41:08 2013
+++ src/sys/arch/acorn26/stand/Makefile.buildboot Wed Aug 21 06:07:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.buildboot,v 1.16 2013/08/15 21:41:08 matt Exp $
+# $NetBSD: Makefile.buildboot,v 1.17 2013/08/21 06:07:26 matt Exp $
S?= ${.CURDIR}/../../../..
@@ -39,15 +39,6 @@ CFLAGS= -O2
CFLAGS+= -ffreestanding -fno-unwind-tables
CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes
-.if !make(obj) && !make(clean) && !make(cleandir)
-.BEGIN:
- -rm -f machine ${MACHINE_ARCH}
- ln -s $S/arch/${MACHINE}/include machine
- ln -s $S/arch/${MACHINE_ARCH}/include ${MACHINE_ARCH}
-.endif
-
-CLEANFILES+= machine ${MACHINE_ARCH}
-
### find out what to use for libkern
KERN_AS= library
.include "${S}/lib/libkern/Makefile.inc"
Index: src/sys/arch/acorn26/stand/lib/riscoscalls.S
diff -u src/sys/arch/acorn26/stand/lib/riscoscalls.S:1.4 src/sys/arch/acorn26/stand/lib/riscoscalls.S:1.5
--- src/sys/arch/acorn26/stand/lib/riscoscalls.S:1.4 Thu Jul 20 23:35:20 2006
+++ src/sys/arch/acorn26/stand/lib/riscoscalls.S Wed Aug 21 06:07:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: riscoscalls.S,v 1.4 2006/07/20 23:35:20 bjh21 Exp $ */
+/* $NetBSD: riscoscalls.S,v 1.5 2013/08/21 06:07:26 matt Exp $ */
/*-
* Copyright (c) 2001 Ben Harris
@@ -92,7 +92,7 @@ ENTRY(xosargs_read)
sub fp, ip, #4
mov r3, r2
swi OS_Args
- ldmvsdb fp, {fp, sp, pc}
+ ldmdbvs fp, {fp, sp, pc}
teq r3, #0
strne r2, [r3]
mov r0, #0
@@ -151,7 +151,7 @@ ENTRY(xosfind_open)
stmfd sp!, {fp, ip, lr, pc}
sub fp, ip, #4
swi XOS_Find
- ldmvsdb fp, {fp, sp, pc}
+ ldmdbvs fp, {fp, sp, pc}
teq r3, #0
strne r0, [r3]
mov r0, #0
@@ -226,7 +226,7 @@ ENTRY(xos_swi_number_from_string)
mov r2, r1
mov r1, r0
swi XOS_SWINumberFromString
- ldmvsdb fp, {fp, sp, pc}
+ ldmdbvs fp, {fp, sp, pc}
str r0, [r2]
mov r0, #0
ldmdb fp, {fp, sp, pc}
@@ -311,7 +311,7 @@ ENTRY(xcache_control)
stmfd sp!, {fp, ip, lr, pc}
sub fp, ip, #4
swi XCache_Control
- ldmvsdb fp, {fp, sp, pc}
+ ldmdbvs fp, {fp, sp, pc}
teq r2, #0
strne r0, [r2]
mov r0, #0
