Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/processexecutor.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,7 @@ bool ProcessExecutor::handleRead(int rpipe, unsigned int &result, const std::str

bool ProcessExecutor::checkLoadAverage(size_t nchildren)
{
#if defined(__QNX__) || defined(__HAIKU__) // getloadavg() is unsupported on Qnx, Haiku.
#if defined(__QNX__) || defined(__HAIKU__) || defined(_AIX)// getloadavg() is unsupported on Qnx, Haiku, AIX.
Comment thread
firewave marked this conversation as resolved.
Outdated
(void)nchildren;
return true;
#else
Expand Down
12 changes: 10 additions & 2 deletions test/signal/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,11 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
target_compile_options_safe(test-signalhandler -Wno-missing-declarations)
target_compile_options_safe(test-signalhandler -Wno-missing-prototypes)
# required for backtrace() to produce function names
target_link_options(test-signalhandler PRIVATE -rdynamic)
if(CMAKE_SYSTEM_NAME MATCHES AIX)
target_link_options(test-signalhandler PRIVATE)
else()
target_link_options(test-signalhandler PRIVATE -rdynamic)
endif()
Comment thread
firewave marked this conversation as resolved.
Outdated
endif()

add_executable(test-stacktrace
Expand All @@ -20,5 +24,9 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang"
target_compile_options_safe(test-stacktrace -Wno-missing-declarations)
target_compile_options_safe(test-stacktrace -Wno-missing-prototypes)
# required for backtrace() to produce function names
target_link_options(test-stacktrace PRIVATE -rdynamic)
if(CMAKE_SYSTEM_NAME MATCHES AIX)
target_link_options(test-signalhandler PRIVATE)
else()
target_link_options(test-stacktrace PRIVATE -rdynamic)
endif()
Comment thread
firewave marked this conversation as resolved.
Outdated
endif()
4 changes: 2 additions & 2 deletions test/signal/test-signalhandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
++*static_cast<int*>(nullptr); // NOLINT(clang-analyzer-core.NullDereference)
}

#if !defined(__APPLE__)
#if !defined(__APPLE__) && !defined(_AIX)
/*static*/ int my_fpe() // NOLINT(misc-use-internal-linkage)
{
if (feenableexcept(FE_ALL_EXCEPT) == -1)
Expand All @@ -80,7 +80,7 @@ int main(int argc, const char * const argv[])
my_abort();
else if (strcmp(argv[1], "segv") == 0)
my_segv();
#if !defined(__APPLE__)
#if !defined(__APPLE__) && !defined(_AIX)
else if (strcmp(argv[1], "fpe") == 0)
return my_fpe();
#endif
Expand Down