Skip to content

Commit c97654c

Browse files
committed
Merge branch 'netbsd-cvs'
2 parents ac56b67 + bfc46c8 commit c97654c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+1125
-917
lines changed

common/lib/libc/arch/CVS/Entries.Log

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
A D/aarch64////
12
A D/alpha////
23
A D/arm////
34
A D/hppa////
@@ -16,3 +17,4 @@ A D/vax////
1617
A D/x86_64////
1718
R D/sh5////
1819
R D/ns32k////
20+
R D/aarch64////

lib/libc/arch/CVS/Entries.Log

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
A D/aarch64////
12
A D/alpha////
23
A D/arm////
34
A D/arm26////
@@ -24,3 +25,4 @@ R D/ns32k////
2425
R D/hp300////
2526
R D/arm32////
2627
R D/arm26////
28+
R D/aarch64////

lib/libc/compat/arch/CVS/Entries.Log

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
A D/aarch64////
12
A D/alpha////
23
A D/arm////
34
A D/hppa////
@@ -16,3 +17,4 @@ A D/vax////
1617
A D/x86_64////
1718
R D/sh5////
1819
R D/ns32k////
20+
R D/aarch64////

lib/librumpuser/CVS/Entries

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
/rumpuser_dl.c/1.25/Wed Oct 30 13:08:14 2013//D2014.01.08.01.50.00
99
/rumpuser_errtrans.c/1.1/Tue Apr 30 12:39:20 2013//D2014.01.08.01.50.00
1010
/rumpuser_int.h/1.8/Tue Apr 30 12:39:20 2013//D2014.01.08.01.50.00
11-
/rumpuser_port.h/1.25/Wed Jan 8 20:48:55 2014//D2014.01.08.01.50.00
11+
/rumpuser_port.h/1.25/Tue Jan 28 11:36:33 2014//D2014.01.08.01.50.00
1212
/rumpuser_pth.c/1.34/Sun Oct 27 16:39:46 2013//D2014.01.08.01.50.00
1313
/rumpuser_pth_dummy.c/1.16/Wed May 15 14:52:49 2013//D2014.01.08.01.50.00
14-
/rumpuser_sp.c/1.62/Wed Jan 8 20:48:55 2014//D2014.01.08.01.50.00
14+
/rumpuser_sp.c/1.62/Tue Jan 28 11:36:33 2014//D2014.01.08.01.50.00
1515
/shlib_version/1.2/Fri Mar 1 18:15:36 2013//D2014.01.08.01.50.00
16-
/sp_common.c/1.38/Wed Jan 8 20:48:56 2014//D2014.01.08.01.50.00
16+
/sp_common.c/1.38/Tue Jan 28 11:36:34 2014//D2014.01.08.01.50.00
1717
D

sys/compat/linux/CVS/Entries

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
/Makefile.inc/1.5/Sun Dec 11 12:20:12 2005//D2014.01.03.14.00.00
2-
/files.linux/1.20/Wed Nov 19 18:36:03 2008//D2014.01.03.14.00.00
3-
/linux_syscall.h/1.43/Mon Apr 28 20:23:42 2008//D2014.01.03.14.00.00
4-
/linux_syscallargs.h/1.42/Mon Apr 28 20:23:42 2008//D2014.01.03.14.00.00
5-
/linux_syscalls.c/1.43/Mon Apr 28 20:23:42 2008//D2014.01.03.14.00.00
61
D/arch////
72
D/common////
3+
/Makefile.inc/1.6/Tue Jan 28 11:36:38 2014//D2014.01.28.11.00.00
4+
/files.linux/1.20/Wed Nov 19 18:36:03 2008//D2014.01.28.11.00.00
5+
/linux_syscall.h/1.43/Mon Apr 28 20:23:42 2008//D2014.01.28.11.00.00
6+
/linux_syscallargs.h/1.42/Mon Apr 28 20:23:42 2008//D2014.01.28.11.00.00
7+
/linux_syscalls.c/1.43/Mon Apr 28 20:23:42 2008//D2014.01.28.11.00.00

sys/compat/linux/CVS/Tag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
D2014.01.03.14.00.00
1+
D2014.01.28.11.00.00

sys/compat/linux/Makefile.inc

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
1-
# $NetBSD: Makefile.inc,v 1.5 2005/12/11 12:20:12 christos Exp $
1+
# $NetBSD: Makefile.inc,v 1.6 2014/01/14 18:51:25 christos Exp $
22

3-
.include <bsd.sys.mk> # for HOST_SH
3+
SYSCALL_PREFIX=linux
44

5-
DEP= syscalls.conf syscalls.master ../../../../kern/makesyscalls.sh
6-
OBJS= linux_sysent.c linux_syscalls.c linux_syscall.h linux_syscallargs.h
7-
8-
${OBJS}: ${DEP}
9-
${HOST_SH} ../../../../kern/makesyscalls.sh syscalls.conf syscalls.master
10-
11-
all: ${OBJS}
5+
.include <bsd.syscall.mk>

sys/compat/linux/arch/CVS/Entries

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,9 @@
1-
D
1+
D/alpha////
2+
D/amd64////
3+
D/arm////
4+
D/i386////
5+
D/m68k////
6+
D/mips////
7+
D/powerpc////
8+
D/sparc////
9+
D/sparc64////

sys/compat/linux/arch/CVS/Entries.Log

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,2 @@
1-
A D/alpha////
2-
A D/amd64////
3-
A D/arm////
41
A D/arm32////
5-
A D/i386////
6-
A D/m68k////
7-
A D/mips////
8-
A D/powerpc////
9-
A D/sparc////
10-
A D/sparc64////
112
R D/arm32////

sys/compat/linux/arch/CVS/Tag

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
D2014.01.03.14.00.00
1+
D2014.01.28.11.00.00

0 commit comments

Comments
 (0)