Skip to content

Commit 133492f

Browse files
[libc] add proxy header for struct_sigaction (#96224)
1 parent a89a541 commit 133492f

File tree

8 files changed

+41
-15
lines changed

8 files changed

+41
-15
lines changed

libc/hdr/types/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,3 +126,12 @@ add_proxy_header_library(
126126
libc.include.llvm-libc-types.atexithandler_t
127127
libc.include.stdlib
128128
)
129+
130+
add_proxy_header_library(
131+
struct_sigaction
132+
HDRS
133+
struct_sigaction.h
134+
FULL_BUILD_DEPENDS
135+
libc.include.llvm-libc-types.struct_sigaction
136+
libc.include.signal
137+
)

libc/hdr/types/struct_sigaction.h

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
//===-- Proxy for struct sigaction ---------------------------------------===//
2+
//
3+
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
4+
// See https://llvm.org/LICENSE.txt for license information.
5+
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
6+
//
7+
//===----------------------------------------------------------------------===//
8+
#ifndef LLVM_LIBC_HDR_TYPES_STRUCT_SIGACTION_H
9+
#define LLVM_LIBC_HDR_TYPES_STRUCT_SIGACTION_H
10+
11+
#ifdef LIBC_FULL_BUILD
12+
13+
#include "include/llvm-libc-types/struct_sigaction.h"
14+
15+
#else
16+
17+
#include <signal.h>
18+
19+
#endif // LIBC_FULL_BUILD
20+
21+
#endif // LLVM_LIBC_HDR_TYPES_STRUCT_SIGACTION_H

libc/src/signal/linux/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ add_entrypoint_object(
6060
DEPENDS
6161
.__restore
6262
libc.hdr.types.sigset_t
63+
libc.hdr.types.struct_sigaction
6364
libc.include.sys_syscall
6465
libc.src.__support.OSUtil.osutil
6566
libc.src.errno.errno
@@ -124,7 +125,7 @@ add_entrypoint_object(
124125
../signal.h
125126
DEPENDS
126127
.sigaction
127-
libc.include.signal
128+
libc.hdr.signal_macros
128129
)
129130

130131
add_entrypoint_object(

libc/src/signal/linux/signal.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,9 @@
77
//===----------------------------------------------------------------------===//
88

99
#include "src/signal/signal.h"
10-
#include "src/signal/sigaction.h"
11-
10+
#include "hdr/signal_macros.h"
1211
#include "src/__support/common.h"
13-
14-
#include <signal.h>
12+
#include "src/signal/sigaction.h"
1513

1614
namespace LIBC_NAMESPACE {
1715

libc/src/signal/sigaction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#ifndef LLVM_LIBC_SRC_SIGNAL_SIGACTION_H
1010
#define LLVM_LIBC_SRC_SIGNAL_SIGACTION_H
1111

12-
#include <signal.h>
12+
#include "hdr/types/struct_sigaction.h"
1313

1414
namespace LIBC_NAMESPACE {
1515

libc/test/src/signal/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ add_libc_unittest(
3232
SRCS
3333
sigaction_test.cpp
3434
DEPENDS
35-
libc.include.errno
36-
libc.include.signal
35+
libc.hdr.errno_macros
36+
libc.hdr.signal_macros
3737
libc.src.signal.raise
3838
libc.src.signal.sigaction
3939
libc.test.UnitTest.ErrnoSetterMatcher
@@ -119,7 +119,7 @@ add_libc_unittest(
119119
SRCS
120120
sigaltstack_test.cpp
121121
DEPENDS
122-
libc.include.signal
122+
libc.hdr.signal_macros
123123
libc.src.errno.errno
124124
libc.src.signal.raise
125125
libc.src.signal.sigaltstack

libc/test/src/signal/sigaction_test.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/errno_macros.h"
10+
#include "hdr/signal_macros.h"
911
#include "src/signal/raise.h"
1012
#include "src/signal/sigaction.h"
11-
1213
#include "test/UnitTest/ErrnoSetterMatcher.h"
1314
#include "test/UnitTest/Test.h"
1415

15-
#include <errno.h>
16-
#include <signal.h>
17-
1816
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Fails;
1917
using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
2018

libc/test/src/signal/sigaltstack_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9+
#include "hdr/signal_macros.h"
910
#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
1011
#include "src/errno/libc_errno.h"
1112
#include "src/signal/linux/signal_utils.h"
1213
#include "src/signal/raise.h"
1314
#include "src/signal/sigaction.h"
1415
#include "src/signal/sigaltstack.h"
15-
1616
#include "test/UnitTest/ErrnoSetterMatcher.h"
1717
#include "test/UnitTest/Test.h"
1818

19-
#include <signal.h>
2019
#include <stdint.h>
2120
#include <sys/syscall.h>
2221

0 commit comments

Comments
 (0)