[flang] Dodge build problem in some Power environments

Original-commit: flang-compiler/f18@f24abf1 Reviewed-on: flang-compiler/f18#919
llvm · Jan 9, 2020 · 9e6d1a7 · 9e6d1a7
1 parent 1c21916
commit 9e6d1a7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/flang/runtime/main.cc b/flang/runtime/main.cc
@@ -22,11 +22,22 @@ extern "C" {
 void __FortranProgram();  // PROGRAM statement
 
 int main(int argc, const char *argv[], const char *envp[]) {
+
   Fortran::runtime::argc = argc;
   Fortran::runtime::argv = argv;
   Fortran::runtime::envp = envp;
+
+#ifdef feclearexcept  // a macro in some environments; omit std::
+  feclearexcept(FE_ALL_EXCEPT);
+#else
   std::feclearexcept(FE_ALL_EXCEPT);
+#endif
+#ifdef fesetround
+  fesetround(FE_TONEAREST);
+#else
   std::fesetround(FE_TONEAREST);
+#endif
+
   std::atexit(Fortran::runtime::NotifyOtherImagesOfNormalEnd);
   // TODO: Runtime configuration settings from environment
   __FortranProgram();

diff --git a/flang/runtime/stop.cc b/flang/runtime/stop.cc
@@ -15,7 +15,12 @@
 extern "C" {
 
 static void DescribeIEEESignaledExceptions() {
-  if (auto excepts{std::fetestexcept(FE_ALL_EXCEPT)}) {
+#ifdef fetestexcept  // a macro in some environments; omit std::
+  auto excepts{fetestexcept(FE_ALL_EXCEPT)};
+#else
+  auto excepts{std::fetestexcept(FE_ALL_EXCEPT)};
+#endif
+  if (excepts) {
     std::fputs("IEEE arithmetic exceptions signaled:", stderr);
     if (excepts & FE_DIVBYZERO) {
       std::fputs(" DIVBYZERO", stderr);