[flang-commits] [flang] 1b88df1 - [flang] Fix arm clang build

[peter klausler via flang-commits]

Author: peter klausler
Date: 2021-04-01T12:56:53-07:00
New Revision: 1b88df1c8e4aa03cf3102ab0b4f8688fe79864ed

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

LOG: [flang] Fix arm clang build

The new source file flang/runtime/complex-reduction.c contains
a portability work-around that implicitly assumed that a recent
version of clang would be used; this patch changes the code and
should be portable to older clangs and any other C compilers that
don't support the standard CMPLXF/CMPLX/CMPLXL macros.

Added: 
    

Modified: 
    flang/runtime/complex-reduction.c

Removed: 
    


################################################################################
diff  --git a/flang/runtime/complex-reduction.c b/flang/runtime/complex-reduction.c
index 443110b614c1..8b5e5f030f8c 100644
--- a/flang/runtime/complex-reduction.c
+++ b/flang/runtime/complex-reduction.c
@@ -11,15 +11,6 @@
 #include "flang/Common/long-double.h"
 #include <complex.h>
 
-/* These are the C standard's names for _Complex constructors; not all C
- * compilers support them.
- */
-#if !defined(CMPLXF) && defined(__clang__)
-#define CMPLXF __builtin_complex
-#define CMPLX __builtin_complex
-#define CMPLXL __builtin_complex
-#endif
-
 struct CppComplexFloat {
   float r, i;
 };
@@ -30,6 +21,56 @@ struct CppComplexLongDouble {
   long double r, i;
 };
 
+/* Not all environments define CMPLXF, CMPLX, CMPLXL. */
+
+#ifndef CMPLXF
+#if __clang_major__ >= 12
+#define CMPLXF __builtin_complex
+#else
+static float_Complex_t CMPLXF(float r, float i) {
+  union {
+    struct CppComplexFloat x;
+    float_Complex_t result;
+  } u;
+  u.x.r = r;
+  u.x.i = i;
+  return u.result;
+}
+#endif
+#endif
+
+#ifndef CMPLX
+#if __clang_major__ >= 12
+#define CMPLX __builtin_complex
+#else
+static double_Complex_t CMPLX(double r, double i) {
+  union {
+    struct CppComplexDouble x;
+    double_Complex_t result;
+  } u;
+  u.x.r = r;
+  u.x.i = i;
+  return u.result;
+}
+#endif
+#endif
+
+#ifndef CMPLXL
+#if __clang_major__ >= 12
+#define CMPLXL __builtin_complex
+#else
+static long_double_Complex_t CMPLXL(long double r, long double i) {
+  union {
+    struct CppComplexLongDouble x;
+    long_double_Complex_t result;
+  } u;
+  u.x.r = r;
+  u.x.i = i;
+  return u.result;
+}
+#endif
+#endif
+
 /* RTNAME(SumComplex4) calls RTNAME(CppSumComplex4) with the same arguments
  * and converts the members of its C++ complex result to C _Complex.
  */