Skip to content

More Guard of GNU extensions #4385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 24, 2025
Merged

More Guard of GNU extensions #4385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2ef6a84
More Guard of GNU extensions
ax3l Mar 21, 2025
25c70e2
Backtrace: musl (deactivate)
ax3l Mar 21, 2025
2809dbe
Backtrace include on Apple
ax3l Mar 21, 2025
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
12 changes: 6 additions & 6 deletions Src/Base/AMReX.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ namespace {
SignalHandler prev_handler_sigabrt = SIG_ERR; // NOLINT(performance-no-int-to-ptr)
SignalHandler prev_handler_sigfpe = SIG_ERR; // NOLINT(performance-no-int-to-ptr)
SignalHandler prev_handler_sigill = SIG_ERR; // NOLINT(performance-no-int-to-ptr)
#if defined(__linux__)
#if defined(__linux__) && defined(__GLIBC__)
int prev_fpe_excepts = 0;
int curr_fpe_excepts = 0;
#elif defined(__APPLE__) && defined(__x86_64__)
Expand Down Expand Up @@ -851,7 +851,7 @@ amrex::Finalize (amrex::AMReX* pamrex)
if (prev_handler_sigabrt != SIG_ERR) { std::signal(SIGABRT, prev_handler_sigabrt); } // NOLINT(performance-no-int-to-ptr)
if (prev_handler_sigfpe != SIG_ERR) { std::signal(SIGFPE , prev_handler_sigfpe); } // NOLINT(performance-no-int-to-ptr)
if (prev_handler_sigill != SIG_ERR) { std::signal(SIGILL , prev_handler_sigill); } // NOLINT(performance-no-int-to-ptr)
#if defined(__linux__)
#if defined(__linux__) && defined(__GLIBC__)
#if !defined(__PGI) || (__PGIC__ >= 16)
if (curr_fpe_excepts != 0) {
fedisableexcept(curr_fpe_excepts);
Expand Down Expand Up @@ -969,7 +969,7 @@ AMReX::erase (AMReX* pamrex)
FPExcept getFPExcept ()
{
auto r = FPExcept::none;
#if defined(__linux__)
#if defined(__linux__) && defined(__GLIBC__)
auto excepts = fegetexcept();
if (excepts & FE_INVALID ) { r = r | FPExcept::invalid ; }
if (excepts & FE_DIVBYZERO) { r = r | FPExcept::zero ; }
Expand All @@ -981,7 +981,7 @@ FPExcept getFPExcept ()
FPExcept setFPExcept (FPExcept excepts)
{
auto prev = getFPExcept();
#if defined(__linux__)
#if defined(__linux__) && defined(__GLIBC__)
int flags = FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW;
fedisableexcept(flags);
flags = 0;
Expand All @@ -998,7 +998,7 @@ FPExcept setFPExcept (FPExcept excepts)
FPExcept disableFPExcept (FPExcept excepts)
{
auto prev = getFPExcept();
#if defined(__linux__)
#if defined(__linux__) && defined(__GLIBC__)
int flags = 0;
if (any(excepts & FPExcept::invalid )) { flags |= FE_INVALID ; }
if (any(excepts & FPExcept::zero )) { flags |= FE_DIVBYZERO; }
Expand All @@ -1013,7 +1013,7 @@ FPExcept disableFPExcept (FPExcept excepts)
FPExcept enableFPExcept (FPExcept excepts)
{
auto prev = getFPExcept();
#if defined(__linux__)
#if defined(__linux__) && defined(__GLIBC__)
int flags = 0;
if (any(excepts & FPExcept::invalid )) { flags |= FE_INVALID ; }
if (any(excepts & FPExcept::zero )) { flags |= FE_DIVBYZERO; }
Expand Down
6 changes: 4 additions & 2 deletions Src/Base/AMReX_BLBackTrace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,14 @@
#include <cxxabi.h>
#include <dlfcn.h>
#define AMREX_BACKTRACE_SUPPORTED 1
#elif defined(__linux__)
#elif defined(__linux__) && defined(__GLIBC__)
#define AMREX_BACKTRACE_SUPPORTED 1
#endif

#ifndef _WIN32
#include <execinfo.h>
# if defined(__GLIBC__) || defined(__APPLE__)
# include <execinfo.h>
# endif
#include <unistd.h>
#endif

Expand Down
Loading