diff --git a/src/platform.h b/src/platform.h
index 3d02f765..2f27b5a9 100644
--- a/src/platform.h
+++ b/src/platform.h
@@ -68,9 +68,10 @@ SOFTWARE.
 
 // Check to see if the compiler supports nullptr and large character types.
 #if (defined(ETL_COMPILER_MICROSOFT) && (_MSC_VER < 1600)) || \
-     defined(ETL_COMPILER_KEIL) || \
+     (defined(ETL_COMPILER_ARM) && (__ARMCC_VERSION < 600000L)) || \
+     (defined(ETL_COMPILER_KEIL) && (__ARMCC_VERSION < 600000L)) || \
      defined(ETL_COMPILER_TI) || \
-     defined(ETL_COMPILER_IAR) || \
+     (defined(ETL_COMPILER_IAR) && (VER < 800)) || \
      (defined(ETL_COMPILER_GCC) && (__cplusplus < 201103L))
   #define ETL_NO_NULLPTR_SUPPORT
   #define ETL_NO_LARGE_CHAR_SUPPORT