socsvn commit: r223086 - in soc2011/gk/ino64-head/sys:
compat/freebsd32 kern
gk at FreeBSD.org
gk at FreeBSD.org
Fri Jun 10 20:55:19 UTC 2011
Author: gk
Date: Fri Jun 10 20:55:17 2011
New Revision: 223086
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=223086
Log:
Add a new COMPAT8 flag for FreeBSD 8.x compatibility system calls.
Modified:
soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master
soc2011/gk/ino64-head/sys/kern/makesyscalls.sh
soc2011/gk/ino64-head/sys/kern/syscalls.master
Modified: soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master
==============================================================================
--- soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master Fri Jun 10 20:55:06 2011 (r223085)
+++ soc2011/gk/ino64-head/sys/compat/freebsd32/syscalls.master Fri Jun 10 20:55:17 2011 (r223086)
@@ -13,7 +13,7 @@
; case where the event exists, but we don't want auditing, the
; event should be #defined to AUE_NULL in audit_kevents.h.
; type one of STD, OBSOL, UNIMPL, COMPAT, COMPAT4, COMPAT6,
-; COMPAT7, NODEF, NOARGS, NOPROTO, NOSTD
+; COMPAT7, COMPAT8, NODEF, NOARGS, NOPROTO, NOSTD
; The COMPAT* options may be combined with one or more NO*
; options separated by '|' with no spaces (e.g. COMPAT|NOARGS)
; name psuedo-prototype of syscall routine
@@ -29,6 +29,7 @@
; COMPAT4 included on COMPAT4 #ifdef (FreeBSD 4 compat)
; COMPAT6 included on COMPAT6 #ifdef (FreeBSD 6 compat)
; COMPAT7 included on COMPAT7 #ifdef (FreeBSD 7 compat)
+; COMPAT8 included on COMPAT8 #ifdef (FreeBSD 8 compat)
; OBSOL obsolete, not included in system, only specifies name
; UNIMPL not implemented, placeholder only
; NOSTD implemented but as a lkm that can be statically
Modified: soc2011/gk/ino64-head/sys/kern/makesyscalls.sh
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/makesyscalls.sh Fri Jun 10 20:55:06 2011 (r223085)
+++ soc2011/gk/ino64-head/sys/kern/makesyscalls.sh Fri Jun 10 20:55:17 2011 (r223086)
@@ -9,6 +9,7 @@
compat4=COMPAT_FREEBSD4
compat6=COMPAT_FREEBSD6
compat7=COMPAT_FREEBSD7
+compat8=COMPAT_FREEBSD8
# output files:
sysnames="syscalls.c"
@@ -33,6 +34,8 @@
syscompat6dcl="sysent.compat6dcl.$$"
syscompat7="sysent.compat7.$$"
syscompat7dcl="sysent.compat7dcl.$$"
+syscompat8="sysent.compat8.$$"
+syscompat8dcl="sysent.compat8dcl.$$"
sysent="sysent.switch.$$"
sysinc="sysinc.switch.$$"
sysarg="sysarg.switch.$$"
@@ -46,9 +49,9 @@
capenabled=""
fi
-trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp" 0
+trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $syscompat8 $syscompat8dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp" 0
-touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp
+touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $syscompat8 $syscompat8dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp
case $# in
0) echo "usage: $0 input-file <config-file>" 1>&2
@@ -87,6 +90,8 @@
syscompat6dcl = \"$syscompat6dcl\"
syscompat7 = \"$syscompat7\"
syscompat7dcl = \"$syscompat7dcl\"
+ syscompat8 = \"$syscompat8\"
+ syscompat8dcl = \"$syscompat8dcl\"
sysent = \"$sysent\"
syssw = \"$syssw\"
sysinc = \"$sysinc\"
@@ -100,6 +105,7 @@
compat4 = \"$compat4\"
compat6 = \"$compat6\"
compat7 = \"$compat7\"
+ compat8 = \"$compat8\"
syscallprefix = \"$syscallprefix\"
switchname = \"$switchname\"
namesname = \"$namesname\"
@@ -121,6 +127,7 @@
printf "\n#ifdef %s\n\n", compat4 > syscompat4
printf "\n#ifdef %s\n\n", compat6 > syscompat6
printf "\n#ifdef %s\n\n", compat7 > syscompat7
+ printf "\n#ifdef %s\n\n", compat8 > syscompat8
printf "/*\n * System call names.\n *\n" > sysnames
printf " * DO NOT EDIT-- this file is automatically generated.\n" > sysnames
@@ -199,6 +206,7 @@
print > syscompat4
print > syscompat6
print > syscompat7
+ print > syscompat8
print > sysnames
print > systrace
print > systracetmp
@@ -213,6 +221,7 @@
print > syscompat4
print > syscompat6
print > syscompat7
+ print > syscompat8
print > sysnames
print > systrace
print > systracetmp
@@ -227,6 +236,7 @@
print > syscompat4
print > syscompat6
print > syscompat7
+ print > syscompat8
print > sysnames
print > systrace
print > systracetmp
@@ -330,6 +340,8 @@
argalias = "freebsd6_" argalias
if (flag("COMPAT7"))
argalias = "freebsd7_" argalias
+ if (flag("COMPAT8"))
+ argalias = "freebsd8_" argalias
}
f++
@@ -452,7 +464,7 @@
next
}
type("COMPAT") || type("COMPAT4") || type("COMPAT6") || \
- type("COMPAT7") {
+ type("COMPAT7") || type("COMPAT8") {
if (flag("COMPAT")) {
ncompat++
out = syscompat
@@ -481,6 +493,13 @@
wrap = "compat7"
prefix = "freebsd7_"
descr = "freebsd7"
+ } else if (flag("COMPAT8")) {
+ ncompat8++
+ out = syscompat8
+ outdcl = syscompat8dcl
+ wrap = "compat8"
+ prefix = "freebsd8_"
+ descr = "freebsd8"
}
parseline()
if (argc != 0 && !flag("NOARGS") && !flag("NOPROTO") && \
@@ -555,7 +574,7 @@
END {
printf "\n#define AS(name) (sizeof(struct name) / sizeof(register_t))\n" > sysinc
- if (ncompat != 0 || ncompat4 != 0 || ncompat6 != 0 || ncompat7 != 0)
+ if (ncompat != 0 || ncompat4 != 0 || ncompat6 != 0 || ncompat7 != 0 || ncompat8 != 0)
printf "#include \"opt_compat.h\"\n\n" > syssw
if (ncompat != 0) {
@@ -590,10 +609,19 @@
printf "#endif\n" > sysinc
}
+ if (ncompat8 != 0) {
+ printf "\n#ifdef %s\n", compat8 > sysinc
+ printf "#define compat8(n, name) n, (sy_call_t *)__CONCAT(freebsd8_,name)\n" > sysinc
+ printf "#else\n" > sysinc
+ printf "#define compat8(n, name) 0, (sy_call_t *)nosys\n" > sysinc
+ printf "#endif\n" > sysinc
+ }
+
printf("\n#endif /* %s */\n\n", compat) > syscompatdcl
printf("\n#endif /* %s */\n\n", compat4) > syscompat4dcl
printf("\n#endif /* %s */\n\n", compat6) > syscompat6dcl
printf("\n#endif /* %s */\n\n", compat7) > syscompat7dcl
+ printf("\n#endif /* %s */\n\n", compat8) > syscompat8dcl
printf("\n#undef PAD_\n") > sysprotoend
printf("#undef PADL_\n") > sysprotoend
@@ -615,6 +643,7 @@
$syscompat4 $syscompat4dcl \
$syscompat6 $syscompat6dcl \
$syscompat7 $syscompat7dcl \
+ $syscompat8 $syscompat8dcl \
$sysaue $sysprotoend > $sysproto
cat $systracetmp >> $systrace
Modified: soc2011/gk/ino64-head/sys/kern/syscalls.master
==============================================================================
--- soc2011/gk/ino64-head/sys/kern/syscalls.master Fri Jun 10 20:55:06 2011 (r223085)
+++ soc2011/gk/ino64-head/sys/kern/syscalls.master Fri Jun 10 20:55:17 2011 (r223086)
@@ -12,7 +12,7 @@
; case where the event exists, but we don't want auditing, the
; event should be #defined to AUE_NULL in audit_kevents.h.
; type one of STD, OBSOL, UNIMPL, COMPAT, COMPAT4, COMPAT6,
-; COMPAT7, NODEF, NOARGS, NOPROTO, NOSTD
+; COMPAT7, COMPAT8, NODEF, NOARGS, NOPROTO, NOSTD
; The COMPAT* options may be combined with one or more NO*
; options separated by '|' with no spaces (e.g. COMPAT|NOARGS)
; name psuedo-prototype of syscall routine
@@ -28,6 +28,7 @@
; COMPAT4 included on COMPAT4 #ifdef (FreeBSD 4 compat)
; COMPAT6 included on COMPAT6 #ifdef (FreeBSD 6 compat)
; COMPAT7 included on COMPAT7 #ifdef (FreeBSD 7 compat)
+; COMPAT8 included on COMPAT8 #ifdef (FreeBSD 8 compat)
; OBSOL obsolete, not included in system, only specifies name
; UNIMPL not implemented, placeholder only
; NOSTD implemented but as a lkm that can be statically
More information about the svn-soc-all
mailing list