Page MenuHomeFreeBSD
Files F149833744

D21366.1791005231.diff
No OneTemporary
Actions

Size
8 KB
Referenced Files
None
Subscribers
None

D21366.1791005231.diff
View Options

Index: sys/amd64/linux/linux_proto.h
===================================================================
--- sys/amd64/linux/linux_proto.h
+++ sys/amd64/linux/linux_proto.h
@@ -1556,6 +1556,13 @@
#endif /* COMPAT_FREEBSD11 */
+
+#ifdef COMPAT_FREEBSD12
+
+#define nosys linux_nosys
+
+#endif /* COMPAT_FREEBSD12 */
+
#define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC
#define LINUX_SYS_AUE_linux_newstat AUE_STAT
#define LINUX_SYS_AUE_linux_newfstat AUE_FSTAT
Index: sys/amd64/linux32/linux32_proto.h
===================================================================
--- sys/amd64/linux32/linux32_proto.h
+++ sys/amd64/linux32/linux32_proto.h
@@ -1896,6 +1896,13 @@
#endif /* COMPAT_FREEBSD11 */
+
+#ifdef COMPAT_FREEBSD12
+
+#define nosys linux_nosys
+
+#endif /* COMPAT_FREEBSD12 */
+
#define LINUX32_SYS_AUE_linux_exit AUE_EXIT
#define LINUX32_SYS_AUE_linux_fork AUE_FORK
#define LINUX32_SYS_AUE_linux_open AUE_OPEN_RWTC
Index: sys/arm64/linux/linux_proto.h
===================================================================
--- sys/arm64/linux/linux_proto.h
+++ sys/arm64/linux/linux_proto.h
@@ -1320,6 +1320,13 @@
#endif /* COMPAT_FREEBSD11 */
+
+#ifdef COMPAT_FREEBSD12
+
+#define nosys linux_nosys
+
+#endif /* COMPAT_FREEBSD12 */
+
#define LINUX_SYS_AUE_linux_setxattr AUE_NULL
#define LINUX_SYS_AUE_linux_lsetxattr AUE_NULL
#define LINUX_SYS_AUE_linux_fsetxattr AUE_NULL
Index: sys/compat/freebsd32/freebsd32_proto.h
===================================================================
--- sys/compat/freebsd32/freebsd32_proto.h
+++ sys/compat/freebsd32/freebsd32_proto.h
@@ -1257,6 +1257,30 @@
#endif /* COMPAT_FREEBSD11 */
+
+#ifdef COMPAT_FREEBSD12
+
+#if !defined(PAD64_REQUIRED) && !defined(__amd64__)
+#define PAD64_REQUIRED
+#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
+#ifdef PAD64_REQUIRED
+#else
+#endif
+
+#endif /* COMPAT_FREEBSD12 */
+
#define FREEBSD32_SYS_AUE_freebsd32_wait4 AUE_WAIT4
#define FREEBSD32_SYS_AUE_freebsd4_freebsd32_getfsstat AUE_GETFSSTAT
#define FREEBSD32_SYS_AUE_ofreebsd32_lseek AUE_LSEEK
Index: sys/i386/linux/linux_proto.h
===================================================================
--- sys/i386/linux/linux_proto.h
+++ sys/i386/linux/linux_proto.h
@@ -1916,6 +1916,13 @@
#endif /* COMPAT_FREEBSD11 */
+
+#ifdef COMPAT_FREEBSD12
+
+#define nosys linux_nosys
+
+#endif /* COMPAT_FREEBSD12 */
+
#define LINUX_SYS_AUE_linux_exit AUE_EXIT
#define LINUX_SYS_AUE_linux_fork AUE_FORK
#define LINUX_SYS_AUE_linux_open AUE_OPEN_RWTC
Index: sys/kern/makesyscalls.sh
===================================================================
--- sys/kern/makesyscalls.sh
+++ sys/kern/makesyscalls.sh
@@ -11,6 +11,7 @@
compat7=COMPAT_FREEBSD7
compat10=COMPAT_FREEBSD10
compat11=COMPAT_FREEBSD11
+compat12=COMPAT_FREEBSD12
# output files:
sysnames="syscalls.c"
@@ -39,6 +40,8 @@
syscompat10dcl="sysent.compat10dcl.$$"
syscompat11="sysent.compat11.$$"
syscompat11dcl="sysent.compat11dcl.$$"
+syscompat12="sysent.compat12.$$"
+syscompat12dcl="sysent.compat12dcl.$$"
sysent="sysent.switch.$$"
sysinc="sysinc.switch.$$"
sysarg="sysarg.switch.$$"
@@ -47,9 +50,9 @@
systraceret="systraceret.$$"
capabilities_conf="capabilities.conf"
-trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $syscompat10 $syscompat10dcl $syscompat11 $syscompat11dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp $systraceret" 0
+trap "rm $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $syscompat10 $syscompat10dcl $syscompat11 $syscompat11dcl $syscompat12 $syscompat12dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp $systraceret" 0
-touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $syscompat10 $syscompat10dcl $syscompat11 $syscompat11dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp $systraceret
+touch $sysaue $sysdcl $syscompat $syscompatdcl $syscompat4 $syscompat4dcl $syscompat6 $syscompat6dcl $syscompat7 $syscompat7dcl $syscompat10 $syscompat10dcl $syscompat11 $syscompat11dcl $syscompat12 $syscompat12dcl $sysent $sysinc $sysarg $sysprotoend $systracetmp $systraceret
case $# in
0) echo "usage: $0 input-file <config-file>" 1>&2
@@ -118,6 +121,8 @@
syscompat10dcl = \"$syscompat10dcl\"
syscompat11 = \"$syscompat11\"
syscompat11dcl = \"$syscompat11dcl\"
+ syscompat12 = \"$syscompat12\"
+ syscompat12dcl = \"$syscompat12dcl\"
sysent = \"$sysent\"
syssw = \"$syssw\"
sysinc = \"$sysinc\"
@@ -134,6 +139,7 @@
compat7 = \"$compat7\"
compat10 = \"$compat10\"
compat11 = \"$compat11\"
+ compat12 = \"$compat12\"
syscallprefix = \"$syscallprefix\"
switchname = \"$switchname\"
namesname = \"$namesname\"
@@ -188,6 +194,7 @@
printf "\n#ifdef %s\n\n", compat7 > syscompat7
printf "\n#ifdef %s\n\n", compat10 > syscompat10
printf "\n#ifdef %s\n\n", compat11 > syscompat11
+ printf "\n#ifdef %s\n\n", compat12 > syscompat12
printf "/*\n * System call names.\n *\n" > sysnames
printf " * DO NOT EDIT-- this file is automatically " generated ".\n" > sysnames
@@ -239,6 +246,7 @@
print > syscompat7
print > syscompat10
print > syscompat11
+ print > syscompat12
print > sysnames
print > systrace
print > systracetmp
@@ -256,6 +264,7 @@
print > syscompat7
print > syscompat10
print > syscompat11
+ print > syscompat12
print > sysnames
print > systrace
print > systracetmp
@@ -273,6 +282,7 @@
print > syscompat7
print > syscompat10
print > syscompat11
+ print > syscompat12
print > sysnames
print > systrace
print > systracetmp
@@ -409,6 +419,8 @@
argalias = "freebsd10_" argalias
if (flag("COMPAT11"))
argalias = "freebsd11_" argalias
+ if (flag("COMPAT12"))
+ argalias = "freebsd12_" argalias
}
f++
@@ -569,7 +581,8 @@
next
}
type("COMPAT") || type("COMPAT4") || type("COMPAT6") || \
- type("COMPAT7") || type("COMPAT10") || type("COMPAT11") {
+ type("COMPAT7") || type("COMPAT10") || type("COMPAT11") || \
+ type("COMPAT12") {
if (flag("COMPAT")) {
ncompat++
out = syscompat
@@ -612,6 +625,13 @@
wrap = "compat11"
prefix = "freebsd11_"
descr = "freebsd11"
+ } else if (flag("COMPAT12")) {
+ ncompat12++
+ out = syscompat12
+ outdcl = syscompat12dcl
+ wrap = "compat12"
+ prefix = "freebsd12_"
+ descr = "freebsd12"
}
parseline()
if (argc != 0 && !flag("NOARGS") && !flag("NOPROTO") && \
@@ -734,6 +754,13 @@
printf "#define compat11(n, name) 0, (sy_call_t *)nosys\n" > sysinc
printf "#endif\n" > sysinc
}
+ if (ncompat12 != 0) {
+ printf "\n#ifdef %s\n", compat12 > sysinc
+ printf "#define compat12(n, name) n, (sy_call_t *)__CONCAT(freebsd12_,name)\n" > sysinc
+ printf "#else\n" > sysinc
+ printf "#define compat12(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
@@ -741,6 +768,7 @@
printf("\n#endif /* %s */\n\n", compat7) > syscompat7dcl
printf("\n#endif /* %s */\n\n", compat10) > syscompat10dcl
printf("\n#endif /* %s */\n\n", compat11) > syscompat11dcl
+ printf("\n#endif /* %s */\n\n", compat12) > syscompat12dcl
printf("\n#undef PAD_\n") > sysprotoend
printf("#undef PADL_\n") > sysprotoend
@@ -765,6 +793,7 @@
$syscompat7 $syscompat7dcl \
$syscompat10 $syscompat10dcl \
$syscompat11 $syscompat11dcl \
+ $syscompat12 $syscompat12dcl \
$sysaue $sysprotoend > $sysproto
cat $systracetmp >> $systrace
cat $systraceret >> $systrace
Index: sys/sys/sysproto.h
===================================================================
--- sys/sys/sysproto.h
+++ sys/sys/sysproto.h
@@ -2634,6 +2634,12 @@
#endif /* COMPAT_FREEBSD11 */
+
+#ifdef COMPAT_FREEBSD12
+
+
+#endif /* COMPAT_FREEBSD12 */
+
#define SYS_AUE_syscall AUE_NULL
#define SYS_AUE_exit AUE_EXIT
#define SYS_AUE_fork AUE_FORK

File Metadata

Mime Type
text/plain
Expires
Sat, Oct 3, 5:27 AM (12 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30120109
Default Alt Text
D21366.1791005231.diff (8 KB)

Event Timeline