4 files changed, 5 insertions, 4 deletions

diff --git a/sys/tools/syscalls/core/syscall.lua b/sys/tools/syscalls/core/syscall.lua
index ca96fc160211..e7e3dc3aac33 100644
--- a/sys/tools/syscalls/core/syscall.lua
+++ b/sys/tools/syscalls/core/syscall.lua
@@ -27,6 +27,7 @@ syscall.known_flags = util.set {
 
 	-- flags beyond this point are modifiers
 	"CAPENABLED",
+	"NOLIB",
 	"NOTSTATIC",
 	"SYSMUX",
 }
diff --git a/sys/tools/syscalls/scripts/libsys_h.lua b/sys/tools/syscalls/scripts/libsys_h.lua
index 75627f08750f..91349d5dc870 100755
--- a/sys/tools/syscalls/scripts/libsys_h.lua
+++ b/sys/tools/syscalls/scripts/libsys_h.lua
@@ -31,7 +31,7 @@ function libsys_h.generate(tbl, config, fh)
 
 	local print_decl = function (sc)
 		return sc:native() and not sc.type.NODEF and
-		    not sc.type.SYSMUX and sc.name ~= "yield"
+		    not sc.type.NOLIB and not sc.type.SYSMUX
 	end
 
 	-- Bind the generator to the parameter file.
diff --git a/sys/tools/syscalls/scripts/syscall_mk.lua b/sys/tools/syscalls/scripts/syscall_mk.lua
index 68438ee8d90c..49d3f6f86c20 100755
--- a/sys/tools/syscalls/scripts/syscall_mk.lua
+++ b/sys/tools/syscalls/scripts/syscall_mk.lua
@@ -44,7 +44,7 @@ function syscall_mk.generate(tbl, config, fh)
 	for _, v in pairs(s) do
 		local c = v:compatLevel()
 		idx = idx + 1
-		if v:native() and not v.type.NODEF then
+		if v:native() and not v.type.NODEF and not v.type.NOLIB then
 			if idx >= size then
 				-- At last system call, no backslash.
 				gen:write(string.format("\t%s.o\n", v:symbol()))
@@ -53,7 +53,7 @@ function syscall_mk.generate(tbl, config, fh)
 				gen:write(string.format("\t%s.o \\\n", v:symbol()))
 			end
 		-- Handle compat (everything >= FREEBSD3):
-		elseif c >= 7 and not v.type.NODEF then
+		elseif c >= 7 and not v.type.NODEF and not v.type.NOLIB then
 			if idx >= size then
 				-- At last system call, no backslash.
 				gen:write(string.format("\t%s.o\n", v:symbol()))
diff --git a/sys/tools/syscalls/scripts/syscalls_map.lua b/sys/tools/syscalls/scripts/syscalls_map.lua
index 57bb5e9da93b..023b43052921 100755
--- a/sys/tools/syscalls/scripts/syscalls_map.lua
+++ b/sys/tools/syscalls/scripts/syscalls_map.lua
@@ -38,7 +38,7 @@ function syscalls_map.generate(tbl, config, fh)
 
 	for _, v in pairs(s) do
 		--print("num " .. v.num .. " name " .. v.name)
-		if v:native() and not v.type.NODEF and v.name ~= "yield" then
+		if v:native() and not v.type.NODEF and not v.type.NOLIB then
 			if v.name ~= "exit" and v.name ~= "vfork" then
 				gen:write(string.format("\t_%s;\n", v.name))
 			end