From dda37d93f7deda02a462a7d5a63c7bdc2460a0ac Mon Sep 17 00:00:00 2001
From: james-morrissey-arm <james-morrissey-arm@users.noreply.github.com>
Date: Fri, 24 Jul 2020 14:30:41 +0100
Subject: [PATCH] Fix 32-bit Android build for ARMv7 (#842)

Tested with currently supported Android NDK r21d.

Signed-off-by: James Morrissey <james.morrissey@arm.com>
---
 test_conformance/conversions/CMakeLists.txt | 2 +-
 test_conformance/conversions/fplib.cpp      | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/test_conformance/conversions/CMakeLists.txt b/test_conformance/conversions/CMakeLists.txt
index 2dd0d838..8886ba0f 100644
--- a/test_conformance/conversions/CMakeLists.txt
+++ b/test_conformance/conversions/CMakeLists.txt
@@ -4,7 +4,7 @@ set (${MODULE_NAME}_SOURCES
       Sleep.cpp test_conversions.cpp basic_test_conversions.cpp
 )
 
-if(CMAKE_COMPILER_IS_GNUCXX AND "${CLConform_TARGET_ARCH}" STREQUAL "ARM")
+if("${CLConform_TARGET_ARCH}" STREQUAL "ARM")
     list(APPEND ${MODULE_NAME}_SOURCES fplib.cpp)
 endif()
 
diff --git a/test_conformance/conversions/fplib.cpp b/test_conformance/conversions/fplib.cpp
index a18b919c..37707b83 100644
--- a/test_conformance/conversions/fplib.cpp
+++ b/test_conformance/conversions/fplib.cpp
@@ -17,7 +17,9 @@
 #include <math.h>
 #include "fplib.h"
 
+#if !defined(FLT_MANT_DIG)
 #define FLT_MANT_DIG    24
+#endif
 #define as_float(x)     (*((float *)(&x)))
 #define as_long(x)      (*((int64_t *)(&x)))
 
@@ -145,6 +147,9 @@ float qcom_s64_2_f32(int64_t data, bool sat, roundingMode rnd)
                     return as_float(result);
             }
         }
+        case qcomRoundingModeCount: {
+            break; // Avoid build error for unhandled enum value
+        }
     }
     return 0.0f;
 }
@@ -216,6 +221,9 @@ float qcom_u64_2_f32(uint64_t data, bool sat, roundingMode rnd)
             uint32_t result = exponent | mantissa;
             return as_float(result); // for positive inputs return RTZ result
         }
+        case qcomRoundingModeCount: {
+            break; // Avoid build error for unhandled enum value
+        }
     }
     return 0.0f;
 }