From c08af2c11ad1f3bedef4a2dd307d98e162f19f4e Mon Sep 17 00:00:00 2001
From: Siva Chandra Reddy <sivachandra@google.com>
Date: Tue, 21 Apr 2020 09:58:12 -0700
Subject: [PATCH] [libc][NFC] Cleanup dependencies in src/signal and
 test/src/signal.

Reviewers: abrachet

Differential Revision: https://reviews.llvm.org/D78585
---
 libc/src/signal/linux/CMakeLists.txt    |  2 +-
 libc/test/src/signal/CMakeLists.txt     | 16 ++++++----------
 libc/test/src/signal/sigaddset_test.cpp |  1 -
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/libc/src/signal/linux/CMakeLists.txt b/libc/src/signal/linux/CMakeLists.txt
index 47442f6a1b6f..fc4a7aa32bf2 100644
--- a/libc/src/signal/linux/CMakeLists.txt
+++ b/libc/src/signal/linux/CMakeLists.txt
@@ -38,10 +38,10 @@ add_entrypoint_object(
     ../sigaction.h
   DEPENDS
     .__restore
-    .raise
     libc.config.linux.linux_syscall_h
     libc.include.signal
     libc.include.sys_syscall
+    libc.src.errno.__errno_location
 )
 
 add_entrypoint_object(
diff --git a/libc/test/src/signal/CMakeLists.txt b/libc/test/src/signal/CMakeLists.txt
index 2a9dce860f6e..b5c1281b8102 100644
--- a/libc/test/src/signal/CMakeLists.txt
+++ b/libc/test/src/signal/CMakeLists.txt
@@ -18,11 +18,10 @@ add_libc_unittest(
   SRCS
     sigaction_test.cpp
   DEPENDS
-    libc.src.signal.sigaction
-    libc.src.signal.raise
-    libc.include.signal
     libc.include.errno
-    libc.src.errno.__errno_location
+    libc.include.signal
+    libc.src.signal.raise
+    libc.src.signal.sigaction
 )
 
 add_libc_unittest(
@@ -32,12 +31,12 @@ add_libc_unittest(
   SRCS
     sigprocmask_test.cpp
   DEPENDS
-    libc.include.signal
+    libc.include.errno
     libc.src.errno.__errno_location
     libc.src.signal.raise
-    libc.src.signal.sigprocmask
     libc.src.signal.sigaddset
     libc.src.signal.sigemptyset
+    libc.src.signal.sigprocmask
 )
 
 add_libc_unittest(
@@ -47,8 +46,8 @@ add_libc_unittest(
   SRCS
     sigaddset_test.cpp
   DEPENDS
+    libc.include.errno
     libc.include.signal
-    libc.src.errno.__errno_location
     libc.src.signal.sigaddset
 )
 
@@ -63,7 +62,6 @@ add_libc_unittest(
     libc.include.signal
     libc.src.errno.__errno_location
     libc.src.signal.raise
-    libc.src.signal.sigaction
     libc.src.signal.signal
 )
 
@@ -76,7 +74,6 @@ add_libc_unittest(
   DEPENDS
     libc.include.errno
     libc.include.signal
-    libc.src.errno.__errno_location
     libc.src.signal.raise
     libc.src.signal.sigfillset
     libc.src.signal.sigprocmask
@@ -91,7 +88,6 @@ add_libc_unittest(
   DEPENDS
     libc.include.errno
     libc.include.signal
-    libc.src.errno.__errno_location
     libc.src.signal.raise
     libc.src.signal.sigdelset
     libc.src.signal.sigfillset
diff --git a/libc/test/src/signal/sigaddset_test.cpp b/libc/test/src/signal/sigaddset_test.cpp
index d0e67ea01e95..f106edb57f90 100644
--- a/libc/test/src/signal/sigaddset_test.cpp
+++ b/libc/test/src/signal/sigaddset_test.cpp
@@ -8,7 +8,6 @@
 
 #include "include/errno.h"
 #include "include/signal.h"
-#include "src/errno/llvmlibc_errno.h"
 #include "src/signal/sigaddset.h"
 
 #include "utils/UnitTest/ErrnoSetterMatcher.h"