17 files changed, 17 insertions, 15 deletions

diff --git a/tests/sys/aio/Makefile.depend b/tests/sys/aio/Makefile.depend
index 5915a38b10f4f..53bbf5dedee75 100644
--- a/tests/sys/aio/Makefile.depend
+++ b/tests/sys/aio/Makefile.depend
@@ -3,13 +3,14 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
 	lib/atf/libatf-c \
 	lib/libc \
 	lib/libcompiler_rt \
+	lib/librt \
+	lib/libthr \
 	lib/libutil \
 
 
diff --git a/tests/sys/fifo/Makefile.depend b/tests/sys/fifo/Makefile.depend
index 3646e2e2b1afa..6cfaab1c36440 100644
--- a/tests/sys/fifo/Makefile.depend
+++ b/tests/sys/fifo/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/file/Makefile.depend b/tests/sys/file/Makefile.depend
index 1c2cb193ad93c..31e8adb0b2f9d 100644
--- a/tests/sys/file/Makefile.depend
+++ b/tests/sys/file/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/geom/class/eli/Makefile.depend b/tests/sys/geom/class/eli/Makefile.depend
index f80275d86ab17..bf15a3771e710 100644
--- a/tests/sys/geom/class/eli/Makefile.depend
+++ b/tests/sys/geom/class/eli/Makefile.depend
@@ -2,6 +2,14 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/atf/libatf-c \
+	lib/libc \
+	lib/libcompiler_rt \
+	secure/lib/libcrypto \
 
 
 .include <dirdeps.mk>
diff --git a/tests/sys/kern/Makefile.depend b/tests/sys/kern/Makefile.depend
index e2d637cb0fc59..779c178f27a08 100644
--- a/tests/sys/kern/Makefile.depend
+++ b/tests/sys/kern/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/kern/acct/Makefile.depend b/tests/sys/kern/acct/Makefile.depend
index 1e94e70f7739b..6dadc2e214348 100644
--- a/tests/sys/kern/acct/Makefile.depend
+++ b/tests/sys/kern/acct/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/kern/execve/Makefile.depend b/tests/sys/kern/execve/Makefile.depend
index 9cb890b58360a..cae7e645ef6a1 100644
--- a/tests/sys/kern/execve/Makefile.depend
+++ b/tests/sys/kern/execve/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	lib/${CSU_DIR} \
 	lib/libc \
diff --git a/tests/sys/kern/pipe/Makefile.depend b/tests/sys/kern/pipe/Makefile.depend
index 3646e2e2b1afa..6cfaab1c36440 100644
--- a/tests/sys/kern/pipe/Makefile.depend
+++ b/tests/sys/kern/pipe/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/kqueue/libkqueue/Makefile.depend b/tests/sys/kqueue/libkqueue/Makefile.depend
index 3646e2e2b1afa..6cfaab1c36440 100644
--- a/tests/sys/kqueue/libkqueue/Makefile.depend
+++ b/tests/sys/kqueue/libkqueue/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/mac/bsdextended/Makefile.depend b/tests/sys/mac/bsdextended/Makefile.depend
index 24a1de909f18d..65c3644dbf399 100644
--- a/tests/sys/mac/bsdextended/Makefile.depend
+++ b/tests/sys/mac/bsdextended/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/mqueue/Makefile.depend b/tests/sys/mqueue/Makefile.depend
index 24e69ea5bc4ce..05a315e8dff96 100644
--- a/tests/sys/mqueue/Makefile.depend
+++ b/tests/sys/mqueue/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/netinet/Makefile.depend b/tests/sys/netinet/Makefile.depend
index 54c1f6f1442ea..d5ed563ecfc8a 100644
--- a/tests/sys/netinet/Makefile.depend
+++ b/tests/sys/netinet/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/arpa \
 	include/xlocale \
diff --git a/tests/sys/pjdfstest/pjdfstest/Makefile.depend b/tests/sys/pjdfstest/pjdfstest/Makefile.depend
index 3646e2e2b1afa..6cfaab1c36440 100644
--- a/tests/sys/pjdfstest/pjdfstest/Makefile.depend
+++ b/tests/sys/pjdfstest/pjdfstest/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/posixshm/Makefile.depend b/tests/sys/posixshm/Makefile.depend
index 74074b9588ec4..c062f6026d946 100644
--- a/tests/sys/posixshm/Makefile.depend
+++ b/tests/sys/posixshm/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/sys/Makefile.depend b/tests/sys/sys/Makefile.depend
index 74074b9588ec4..c062f6026d946 100644
--- a/tests/sys/sys/Makefile.depend
+++ b/tests/sys/sys/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \
diff --git a/tests/sys/vfs/Makefile.depend b/tests/sys/vfs/Makefile.depend
index f80275d86ab17..c062f6026d946 100644
--- a/tests/sys/vfs/Makefile.depend
+++ b/tests/sys/vfs/Makefile.depend
@@ -2,6 +2,13 @@
 # Autogenerated - do NOT edit!
 
 DIRDEPS = \
+	gnu/lib/csu \
+	include \
+	include/xlocale \
+	lib/${CSU_DIR} \
+	lib/atf/libatf-c \
+	lib/libc \
+	lib/libcompiler_rt \
 
 
 .include <dirdeps.mk>
diff --git a/tests/sys/vm/Makefile.depend b/tests/sys/vm/Makefile.depend
index 74074b9588ec4..c062f6026d946 100644
--- a/tests/sys/vm/Makefile.depend
+++ b/tests/sys/vm/Makefile.depend
@@ -3,7 +3,6 @@
 
 DIRDEPS = \
 	gnu/lib/csu \
-	gnu/lib/libgcc \
 	include \
 	include/xlocale \
 	lib/${CSU_DIR} \