[flang-commits] [flang] f95710c - [flang] Fixed compiler build on glibc 2.17 systems after 3149c93. (#84873)

via flang-commits flang-commits at lists.llvm.org
Mon Mar 11 23:09:48 PDT 2024


Author: Slava Zakharin
Date: 2024-03-11T23:09:44-07:00
New Revision: f95710c76519c611868c16f92586b6d0baedad54

URL: https://github.com/llvm/llvm-project/commit/f95710c76519c611868c16f92586b6d0baedad54
DIFF: https://github.com/llvm/llvm-project/commit/f95710c76519c611868c16f92586b6d0baedad54.diff

LOG: [flang] Fixed compiler build on glibc 2.17 systems after 3149c93. (#84873)

Added: 
    

Modified: 
    flang/include/flang/Evaluate/integer.h
    flang/include/flang/Evaluate/real.h
    flang/lib/Evaluate/fold-implementation.h

Removed: 
    


################################################################################
diff  --git a/flang/include/flang/Evaluate/integer.h b/flang/include/flang/Evaluate/integer.h
index 31768c21daae62..7395645701265d 100644
--- a/flang/include/flang/Evaluate/integer.h
+++ b/flang/include/flang/Evaluate/integer.h
@@ -27,6 +27,10 @@
 #include <string>
 #include <type_traits>
 
+// Some environments, viz. glibc 2.17, allow the macro HUGE
+// to leak out of <math.h>.
+#undef HUGE
+
 namespace Fortran::evaluate::value {
 
 // Implements an integer as an assembly of smaller host integer parts

diff  --git a/flang/include/flang/Evaluate/real.h b/flang/include/flang/Evaluate/real.h
index 5266bd0ef64bfd..d0da9634651f36 100644
--- a/flang/include/flang/Evaluate/real.h
+++ b/flang/include/flang/Evaluate/real.h
@@ -18,6 +18,10 @@
 #include <limits>
 #include <string>
 
+// Some environments, viz. glibc 2.17, allow the macro HUGE
+// to leak out of <math.h>.
+#undef HUGE
+
 namespace llvm {
 class raw_ostream;
 }

diff  --git a/flang/lib/Evaluate/fold-implementation.h b/flang/lib/Evaluate/fold-implementation.h
index 6b3c9416724cb6..9dd8c3843465d5 100644
--- a/flang/lib/Evaluate/fold-implementation.h
+++ b/flang/lib/Evaluate/fold-implementation.h
@@ -39,6 +39,10 @@
 #include <type_traits>
 #include <variant>
 
+// Some environments, viz. glibc 2.17, allow the macro HUGE
+// to leak out of <math.h>.
+#undef HUGE
+
 namespace Fortran::evaluate {
 
 // Utilities


        


More information about the flang-commits mailing list