Skip to content

Commit c70d28d

Browse files
MaskRaygithub-actions[bot]
MaskRay
authored and
github-actions[bot]
committed
Automerge: [CMake] Remove some unneeded HAVE_*_H
Pull Request: llvm/llvm-project#123282
2 parents 444be87 + f999b11 commit c70d28d

File tree

10 files changed

+2
-55
lines changed

10 files changed

+2
-55
lines changed

‎llvm/cmake/config-ix.cmake‎

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,9 @@ if (ANDROID OR CYGWIN OR CMAKE_SYSTEM_NAME MATCHES "AIX|DragonFly|FreeBSD|Haiku|
2222
set(HAVE_MACH_MACH_H 0)
2323
set(HAVE_MALLOC_MALLOC_H 0)
2424
set(HAVE_PTHREAD_H 1)
25-
set(HAVE_SIGNAL_H 1)
2625
set(HAVE_SYS_IOCTL_H 1)
2726
set(HAVE_SYS_MMAN_H 1)
28-
set(HAVE_SYS_PARAM_H 1)
2927
set(HAVE_SYS_RESOURCE_H 1)
30-
set(HAVE_SYS_STAT_H 1)
31-
set(HAVE_SYS_TIME_H 1)
3228
set(HAVE_SYSEXITS_H 1)
3329
set(HAVE_TERMIOS_H 1)
3430
set(HAVE_UNISTD_H 1)
@@ -37,13 +33,9 @@ elseif (APPLE)
3733
set(HAVE_MACH_MACH_H 1)
3834
set(HAVE_MALLOC_MALLOC_H 1)
3935
set(HAVE_PTHREAD_H 1)
40-
set(HAVE_SIGNAL_H 1)
4136
set(HAVE_SYS_IOCTL_H 1)
4237
set(HAVE_SYS_MMAN_H 1)
43-
set(HAVE_SYS_PARAM_H 1)
4438
set(HAVE_SYS_RESOURCE_H 1)
45-
set(HAVE_SYS_STAT_H 1)
46-
set(HAVE_SYS_TIME_H 1)
4739
set(HAVE_SYSEXITS_H 1)
4840
set(HAVE_TERMIOS_H 1)
4941
set(HAVE_UNISTD_H 1)
@@ -52,13 +44,9 @@ elseif (PURE_WINDOWS)
5244
set(HAVE_MACH_MACH_H 0)
5345
set(HAVE_MALLOC_MALLOC_H 0)
5446
set(HAVE_PTHREAD_H 0)
55-
set(HAVE_SIGNAL_H 1)
5647
set(HAVE_SYS_IOCTL_H 0)
5748
set(HAVE_SYS_MMAN_H 0)
58-
set(HAVE_SYS_PARAM_H 0)
5949
set(HAVE_SYS_RESOURCE_H 0)
60-
set(HAVE_SYS_STAT_H 1)
61-
set(HAVE_SYS_TIME_H 0)
6250
set(HAVE_SYSEXITS_H 0)
6351
set(HAVE_TERMIOS_H 0)
6452
set(HAVE_UNISTD_H 0)
@@ -69,13 +57,9 @@ elseif (ZOS)
6957
set(HAVE_MACH_MACH_H 0)
7058
set(HAVE_MALLOC_MALLOC_H 0)
7159
set(HAVE_PTHREAD_H 1)
72-
set(HAVE_SIGNAL_H 1)
7360
set(HAVE_SYS_IOCTL_H 1)
7461
set(HAVE_SYS_MMAN_H 1)
75-
set(HAVE_SYS_PARAM_H 0)
7662
set(HAVE_SYS_RESOURCE_H 1)
77-
set(HAVE_SYS_STAT_H 1)
78-
set(HAVE_SYS_TIME_H 1)
7963
set(HAVE_SYSEXITS_H 0)
8064
set(HAVE_TERMIOS_H 1)
8165
set(HAVE_UNISTD_H 1)
@@ -85,13 +69,9 @@ else()
8569
check_include_file(mach/mach.h HAVE_MACH_MACH_H)
8670
check_include_file(malloc/malloc.h HAVE_MALLOC_MALLOC_H)
8771
check_include_file(pthread.h HAVE_PTHREAD_H)
88-
check_include_file(signal.h HAVE_SIGNAL_H)
8972
check_include_file(sys/ioctl.h HAVE_SYS_IOCTL_H)
9073
check_include_file(sys/mman.h HAVE_SYS_MMAN_H)
91-
check_include_file(sys/param.h HAVE_SYS_PARAM_H)
9274
check_include_file(sys/resource.h HAVE_SYS_RESOURCE_H)
93-
check_include_file(sys/stat.h HAVE_SYS_STAT_H)
94-
check_include_file(sys/time.h HAVE_SYS_TIME_H)
9575
check_include_file(sysexits.h HAVE_SYSEXITS_H)
9676
check_include_file(termios.h HAVE_TERMIOS_H)
9777
check_include_file(unistd.h HAVE_UNISTD_H)
@@ -364,7 +344,7 @@ check_symbol_exists(futimes sys/time.h HAVE_FUTIMES)
364344
# Avoid sigaltstack on Apple platforms, where backtrace() cannot handle it
365345
# (rdar://7089625) and _Unwind_Backtrace is unusable because it cannot unwind
366346
# past the signal handler after an assertion failure (rdar://29866587).
367-
if( HAVE_SIGNAL_H AND NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE )
347+
if( NOT LLVM_USE_SANITIZER MATCHES ".*Address.*" AND NOT APPLE )
368348
check_symbol_exists(sigaltstack signal.h HAVE_SIGALTSTACK)
369349
endif()
370350
check_symbol_exists(mallctl malloc_np.h HAVE_MALLCTL)

‎llvm/include/llvm/Config/config.h.cmake‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@
171171
/* Define to 1 if you have the `sigaltstack' function. */
172172
#cmakedefine HAVE_SIGALTSTACK ${HAVE_SIGALTSTACK}
173173

174-
/* Define to 1 if you have the <signal.h> header file. */
175-
#cmakedefine HAVE_SIGNAL_H ${HAVE_SIGNAL_H}
176-
177174
/* Define to 1 if you have the `strerror_r' function. */
178175
#cmakedefine HAVE_STRERROR_R ${HAVE_STRERROR_R}
179176

@@ -189,9 +186,6 @@
189186
/* Define to 1 if you have the <sys/resource.h> header file. */
190187
#cmakedefine HAVE_SYS_RESOURCE_H ${HAVE_SYS_RESOURCE_H}
191188

192-
/* Define to 1 if you have the <sys/time.h> header file. */
193-
#cmakedefine HAVE_SYS_TIME_H ${HAVE_SYS_TIME_H}
194-
195189
/* Define to 1 if stat struct has st_mtimespec member .*/
196190
#cmakedefine HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC ${HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC}
197191

‎llvm/lib/Support/Unix/Process.inc‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,12 @@
1818
#include <mutex>
1919
#include <optional>
2020
#include <fcntl.h>
21-
#ifdef HAVE_SYS_TIME_H
2221
#include <sys/time.h>
23-
#endif
2422
#ifdef HAVE_SYS_RESOURCE_H
2523
#include <sys/resource.h>
2624
#endif
2725
#include <sys/stat.h>
28-
#if HAVE_SIGNAL_H
2926
#include <signal.h>
30-
#endif
3127
#if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2)
3228
#include <malloc.h>
3329
#endif

‎llvm/lib/Support/Unix/Program.inc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@
3232
#if HAVE_SYS_RESOURCE_H
3333
#include <sys/resource.h>
3434
#endif
35-
#if HAVE_SIGNAL_H
3635
#include <signal.h>
37-
#endif
3836
#include <fcntl.h>
3937
#if HAVE_UNISTD_H
4038
#include <unistd.h>

‎llvm/lib/Support/Unix/Signals.inc‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,7 @@
5050
#ifdef HAVE_BACKTRACE
5151
#include BACKTRACE_HEADER // For backtrace().
5252
#endif
53-
#if HAVE_SIGNAL_H
5453
#include <signal.h>
55-
#endif
5654
#include <sys/stat.h>
5755
#if HAVE_DLFCN_H
5856
#include <dlfcn.h>

‎llvm/lib/Support/Unix/Unix.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,7 @@
3636
#include <unistd.h>
3737
#endif
3838

39-
#ifdef HAVE_SYS_TIME_H
40-
# include <sys/time.h>
41-
#endif
39+
#include <sys/time.h>
4240
#include <time.h>
4341

4442
#ifdef HAVE_DLFCN_H

‎llvm/unittests/Support/CrashRecoveryTest.cpp‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@
2626
#endif
2727

2828
#ifdef LLVM_ON_UNIX
29-
#ifdef HAVE_SIGNAL_H
3029
#include <signal.h>
3130
#endif
32-
#endif
3331

3432
using namespace llvm;
3533
using namespace llvm::sys;

‎llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ write_cmake_config("config") {
9797
"HAVE_MALLCTL=",
9898
"HAVE_PTHREAD_GET_NAME_NP=",
9999
"HAVE_PTHREAD_SET_NAME_NP=",
100-
"HAVE_SIGNAL_H=1",
101100
"HAVE_VALGRIND_VALGRIND_H=",
102101
"HAVE__ALLOCA=",
103102
"HAVE___ALLOCA=",
@@ -225,7 +224,6 @@ write_cmake_config("config") {
225224
"HAVE_SYS_IOCTL_H=",
226225
"HAVE_SYS_MMAN_H=",
227226
"HAVE_SYS_RESOURCE_H=",
228-
"HAVE_SYS_TIME_H=",
229227
"HAVE_TERMIOS_H=",
230228
"HAVE_UNISTD_H=",
231229
"HAVE__CHSIZE_S=1",
@@ -260,7 +258,6 @@ write_cmake_config("config") {
260258
"HAVE_SYS_IOCTL_H=1",
261259
"HAVE_SYS_MMAN_H=1",
262260
"HAVE_SYS_RESOURCE_H=1",
263-
"HAVE_SYS_TIME_H=1",
264261
"HAVE_TERMIOS_H=1",
265262
"HAVE_UNISTD_H=1",
266263
"HAVE__CHSIZE_S=",

‎utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,6 @@
174174
/* Define to 1 if you have the `sigaltstack' function. */
175175
#define HAVE_SIGALTSTACK 1
176176

177-
/* Define to 1 if you have the <signal.h> header file. */
178-
#define HAVE_SIGNAL_H 1
179-
180177
/* Define to 1 if you have the `strerror_r' function. */
181178
/* HAVE_STRERROR_R defined in Bazel */
182179

@@ -192,9 +189,6 @@
192189
/* Define to 1 if you have the <sys/resource.h> header file. */
193190
#define HAVE_SYS_RESOURCE_H 1
194191

195-
/* Define to 1 if you have the <sys/time.h> header file. */
196-
#define HAVE_SYS_TIME_H 1
197-
198192
/* Define to 1 if stat struct has st_mtimespec member .*/
199193
/* #undef HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC */
200194

‎utils/bazel/llvm_configs/config.h.cmake‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@
171171
/* Define to 1 if you have the `sigaltstack' function. */
172172
#cmakedefine HAVE_SIGALTSTACK ${HAVE_SIGALTSTACK}
173173

174-
/* Define to 1 if you have the <signal.h> header file. */
175-
#cmakedefine HAVE_SIGNAL_H ${HAVE_SIGNAL_H}
176-
177174
/* Define to 1 if you have the `strerror_r' function. */
178175
#cmakedefine HAVE_STRERROR_R ${HAVE_STRERROR_R}
179176

@@ -189,9 +186,6 @@
189186
/* Define to 1 if you have the <sys/resource.h> header file. */
190187
#cmakedefine HAVE_SYS_RESOURCE_H ${HAVE_SYS_RESOURCE_H}
191188

192-
/* Define to 1 if you have the <sys/time.h> header file. */
193-
#cmakedefine HAVE_SYS_TIME_H ${HAVE_SYS_TIME_H}
194-
195189
/* Define to 1 if stat struct has st_mtimespec member .*/
196190
#cmakedefine HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC ${HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC}
197191

0 commit comments

Comments
 (0)