diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index bb63fb000c820..0cc3a4aa5cccd 100644 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -23,7 +23,6 @@ if (ANDROID OR CYGWIN OR CMAKE_SYSTEM_NAME MATCHES "AIX|DragonFly|FreeBSD|Haiku| set(HAVE_MALLOC_MALLOC_H 0) set(HAVE_PTHREAD_H 1) set(HAVE_SYS_MMAN_H 1) - set(HAVE_SYS_RESOURCE_H 1) set(HAVE_SYSEXITS_H 1) set(HAVE_UNISTD_H 1) elseif (APPLE) @@ -32,7 +31,6 @@ elseif (APPLE) set(HAVE_MALLOC_MALLOC_H 1) set(HAVE_PTHREAD_H 1) set(HAVE_SYS_MMAN_H 1) - set(HAVE_SYS_RESOURCE_H 1) set(HAVE_SYSEXITS_H 1) set(HAVE_UNISTD_H 1) elseif (PURE_WINDOWS) @@ -41,7 +39,6 @@ elseif (PURE_WINDOWS) set(HAVE_MALLOC_MALLOC_H 0) set(HAVE_PTHREAD_H 0) set(HAVE_SYS_MMAN_H 0) - set(HAVE_SYS_RESOURCE_H 0) set(HAVE_SYSEXITS_H 0) set(HAVE_UNISTD_H 0) elseif (ZOS) @@ -52,7 +49,6 @@ elseif (ZOS) set(HAVE_MALLOC_MALLOC_H 0) set(HAVE_PTHREAD_H 1) set(HAVE_SYS_MMAN_H 1) - set(HAVE_SYS_RESOURCE_H 1) set(HAVE_SYSEXITS_H 0) set(HAVE_UNISTD_H 1) else() @@ -62,7 +58,6 @@ else() check_include_file(malloc/malloc.h HAVE_MALLOC_MALLOC_H) check_include_file(pthread.h HAVE_PTHREAD_H) check_include_file(sys/mman.h HAVE_SYS_MMAN_H) - check_include_file(sys/resource.h HAVE_SYS_RESOURCE_H) check_include_file(sysexits.h HAVE_SYSEXITS_H) check_include_file(unistd.h HAVE_UNISTD_H) endif() @@ -326,7 +321,6 @@ check_symbol_exists(_Unwind_Backtrace "unwind.h" HAVE__UNWIND_BACKTRACE) check_symbol_exists(getpagesize unistd.h HAVE_GETPAGESIZE) check_symbol_exists(sysconf unistd.h HAVE_SYSCONF) check_symbol_exists(getrusage sys/resource.h HAVE_GETRUSAGE) -check_symbol_exists(setrlimit sys/resource.h HAVE_SETRLIMIT) check_symbol_exists(isatty unistd.h HAVE_ISATTY) check_symbol_exists(futimens sys/stat.h HAVE_FUTIMENS) check_symbol_exists(futimes sys/time.h HAVE_FUTIMES) @@ -342,7 +336,6 @@ check_symbol_exists(mallinfo malloc.h HAVE_MALLINFO) check_symbol_exists(mallinfo2 malloc.h HAVE_MALLINFO2) check_symbol_exists(malloc_zone_statistics malloc/malloc.h HAVE_MALLOC_ZONE_STATISTICS) -check_symbol_exists(getrlimit "sys/types.h;sys/time.h;sys/resource.h" HAVE_GETRLIMIT) check_symbol_exists(posix_spawn spawn.h HAVE_POSIX_SPAWN) check_symbol_exists(pread unistd.h HAVE_PREAD) check_symbol_exists(sbrk unistd.h HAVE_SBRK) diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake index 62bf533f0d92d..1d2d00a3b758b 100644 --- a/llvm/include/llvm/Config/config.h.cmake +++ b/llvm/include/llvm/Config/config.h.cmake @@ -90,9 +90,6 @@ /* Define to 1 if you have the `getpagesize' function. */ #cmakedefine HAVE_GETPAGESIZE ${HAVE_GETPAGESIZE} -/* Define to 1 if you have the `getrlimit' function. */ -#cmakedefine HAVE_GETRLIMIT ${HAVE_GETRLIMIT} - /* Define to 1 if you have the `getrusage' function. */ #cmakedefine HAVE_GETRUSAGE ${HAVE_GETRUSAGE} @@ -165,9 +162,6 @@ /* Define to 1 if you have the `setenv' function. */ #cmakedefine HAVE_SETENV ${HAVE_SETENV} -/* Define to 1 if you have the `setrlimit' function. */ -#cmakedefine HAVE_SETRLIMIT ${HAVE_SETRLIMIT} - /* Define to 1 if you have the `sigaltstack' function. */ #cmakedefine HAVE_SIGALTSTACK ${HAVE_SIGALTSTACK} @@ -180,9 +174,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_MMAN_H ${HAVE_SYS_MMAN_H} -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_RESOURCE_H ${HAVE_SYS_RESOURCE_H} - /* Define to 1 if stat struct has st_mtimespec member .*/ #cmakedefine HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC ${HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC} diff --git a/llvm/lib/Support/Unix/Process.inc b/llvm/lib/Support/Unix/Process.inc index dcfc38fa9f973..550b0de2e0455 100644 --- a/llvm/lib/Support/Unix/Process.inc +++ b/llvm/lib/Support/Unix/Process.inc @@ -19,9 +19,7 @@ #include #include #include -#ifdef HAVE_SYS_RESOURCE_H #include -#endif #include #include #if defined(HAVE_MALLINFO) || defined(HAVE_MALLINFO2) @@ -128,7 +126,6 @@ void Process::GetTimeUsage(TimePoint<> &elapsed, // their operation. To prevent the disk from filling up, this function // does what's necessary to prevent their generation. void Process::PreventCoreFiles() { -#if HAVE_SETRLIMIT struct rlimit rlim; getrlimit(RLIMIT_CORE, &rlim); #ifdef __linux__ @@ -151,7 +148,6 @@ void Process::PreventCoreFiles() { rlim.rlim_cur = 0; #endif setrlimit(RLIMIT_CORE, &rlim); -#endif #if defined(HAVE_MACH_MACH_H) && !defined(__GNU__) // Disable crash reporting on Mac OS X 10.0-10.4 diff --git a/llvm/lib/Support/Unix/Program.inc b/llvm/lib/Support/Unix/Program.inc index 10632e8fa7e03..0708df1eed0a3 100644 --- a/llvm/lib/Support/Unix/Program.inc +++ b/llvm/lib/Support/Unix/Program.inc @@ -29,9 +29,7 @@ #include "llvm/Support/SystemZ/zOSSupport.h" #include "llvm/Support/raw_ostream.h" #include -#if HAVE_SYS_RESOURCE_H #include -#endif #include #include #if HAVE_UNISTD_H @@ -140,7 +138,6 @@ static bool RedirectIO_PS(const std::string *Path, int FD, std::string *ErrMsg, static void TimeOutHandler(int Sig) {} static void SetMemoryLimits(unsigned size) { -#if HAVE_SYS_RESOURCE_H && HAVE_GETRLIMIT && HAVE_SETRLIMIT struct rlimit r; __typeof__(r.rlim_cur) limit = (__typeof__(r.rlim_cur))(size)*1048576; @@ -154,7 +151,6 @@ static void SetMemoryLimits(unsigned size) { r.rlim_cur = limit; setrlimit(RLIMIT_RSS, &r); #endif -#endif } static std::vector diff --git a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn index 75477ec7bb498..9b8990b5a6bcf 100644 --- a/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn +++ b/llvm/utils/gn/secondary/llvm/include/llvm/Config/BUILD.gn @@ -206,7 +206,6 @@ write_cmake_config("config") { "HAVE_DLOPEN=", "HAVE_FUTIMES=", "HAVE_GETPAGESIZE=", - "HAVE_GETRLIMIT=", "HAVE_GETRUSAGE=", "HAVE_ISATTY=", "HAVE_LIBPTHREAD=", @@ -217,12 +216,10 @@ write_cmake_config("config") { "HAVE_PTHREAD_RWLOCK_INIT=", "HAVE_SBRK=", "HAVE_SETENV=", - "HAVE_SETRLIMIT=", "HAVE_SIGALTSTACK=", "HAVE_STRERROR_R=", "HAVE_SYSCONF=", "HAVE_SYS_MMAN_H=", - "HAVE_SYS_RESOURCE_H=", "HAVE_UNISTD_H=", "HAVE__CHSIZE_S=1", "HAVE__UNWIND_BACKTRACE=", @@ -238,7 +235,6 @@ write_cmake_config("config") { "HAVE_DLOPEN=1", "HAVE_FUTIMES=1", "HAVE_GETPAGESIZE=1", - "HAVE_GETRLIMIT=1", "HAVE_GETRUSAGE=1", "HAVE_ISATTY=1", "HAVE_LIBPTHREAD=1", @@ -249,12 +245,10 @@ write_cmake_config("config") { "HAVE_PTHREAD_RWLOCK_INIT=1", "HAVE_SBRK=1", "HAVE_SETENV=1", - "HAVE_SETRLIMIT=1", "HAVE_SIGALTSTACK=1", "HAVE_STRERROR_R=1", "HAVE_SYSCONF=1", "HAVE_SYS_MMAN_H=1", - "HAVE_SYS_RESOURCE_H=1", "HAVE_UNISTD_H=1", "HAVE__CHSIZE_S=", "HAVE__UNWIND_BACKTRACE=1", diff --git a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h index 9436aef2e75a2..7a8e14e06ddc5 100644 --- a/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h +++ b/utils/bazel/llvm-project-overlay/llvm/include/llvm/Config/config.h @@ -102,9 +102,6 @@ /* Define to 1 if you have the `getpagesize' function. */ #define HAVE_GETPAGESIZE 1 -/* Define to 1 if you have the `getrlimit' function. */ -#define HAVE_GETRLIMIT 1 - /* Define to 1 if you have the `getrusage' function. */ #define HAVE_GETRUSAGE 1 @@ -168,9 +165,6 @@ /* Define to 1 if you have the `setenv' function. */ /* HAVE_SETENV defined in Bazel */ -/* Define to 1 if you have the `setrlimit' function. */ -#define HAVE_SETRLIMIT 1 - /* Define to 1 if you have the `sigaltstack' function. */ #define HAVE_SIGALTSTACK 1 @@ -183,9 +177,6 @@ /* Define to 1 if you have the header file. */ #define HAVE_SYS_MMAN_H 1 -/* Define to 1 if you have the header file. */ -#define HAVE_SYS_RESOURCE_H 1 - /* Define to 1 if stat struct has st_mtimespec member .*/ /* #undef HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC */ diff --git a/utils/bazel/llvm_configs/config.h.cmake b/utils/bazel/llvm_configs/config.h.cmake index 62bf533f0d92d..1d2d00a3b758b 100644 --- a/utils/bazel/llvm_configs/config.h.cmake +++ b/utils/bazel/llvm_configs/config.h.cmake @@ -90,9 +90,6 @@ /* Define to 1 if you have the `getpagesize' function. */ #cmakedefine HAVE_GETPAGESIZE ${HAVE_GETPAGESIZE} -/* Define to 1 if you have the `getrlimit' function. */ -#cmakedefine HAVE_GETRLIMIT ${HAVE_GETRLIMIT} - /* Define to 1 if you have the `getrusage' function. */ #cmakedefine HAVE_GETRUSAGE ${HAVE_GETRUSAGE} @@ -165,9 +162,6 @@ /* Define to 1 if you have the `setenv' function. */ #cmakedefine HAVE_SETENV ${HAVE_SETENV} -/* Define to 1 if you have the `setrlimit' function. */ -#cmakedefine HAVE_SETRLIMIT ${HAVE_SETRLIMIT} - /* Define to 1 if you have the `sigaltstack' function. */ #cmakedefine HAVE_SIGALTSTACK ${HAVE_SIGALTSTACK} @@ -180,9 +174,6 @@ /* Define to 1 if you have the header file. */ #cmakedefine HAVE_SYS_MMAN_H ${HAVE_SYS_MMAN_H} -/* Define to 1 if you have the header file. */ -#cmakedefine HAVE_SYS_RESOURCE_H ${HAVE_SYS_RESOURCE_H} - /* Define to 1 if stat struct has st_mtimespec member .*/ #cmakedefine HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC ${HAVE_STRUCT_STAT_ST_MTIMESPEC_TV_NSEC}