Don't use push_macro and pull_macro with Tasking compiler (#643)

* Autodetect Tasking compiler #642 * Don't use `push_macro` and `pop_macro` for Tasking compiler #642 Co-authored-by: Todd Snider <tsnider@jlg.com>
ETLCPP · Dec 29, 2022 · 5c1b5af · 5c1b5af
1 parent 6632bf9
commit 5c1b5af
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 2 deletions.
diff --git a/include/etl/private/minmax_pop.h b/include/etl/private/minmax_pop.h
@@ -32,7 +32,7 @@ SOFTWARE.
  * The header include guard has been intentionally omitted.
  * This file is intended to evaluated multiple times by design.
  */
-#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR)
+#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR) && !defined(ETL_COMPILER_TASKING)
   #if !defined(ETL_COMPILER_ARM5)
     #pragma pop_macro("min")
     #pragma pop_macro("max")

diff --git a/include/etl/private/minmax_push.h b/include/etl/private/minmax_push.h
@@ -33,7 +33,7 @@ SOFTWARE.
  * This file is intended to evaluated multiple times by design.
  */
 
-#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR)
+#if !defined(ETL_COMPILER_GREEN_HILLS) && !defined(ETL_COMPILER_IAR) && !defined(ETL_COMPILER_TASKING)
   #if !defined(ETL_COMPILER_ARM5)
     #pragma push_macro("min")
     #pragma push_macro("max")

diff --git a/include/etl/profiles/determine_compiler.h b/include/etl/profiles/determine_compiler.h
@@ -119,6 +119,13 @@ SOFTWARE.
     #endif
   #endif
 
+  #if !defined(ETL_COMPILER_TYPE_DETECTED) && !defined(ETL_COMPILER_TASKING)
+    #if defined(__TASKING__)
+      #define ETL_COMPILER_TASKING
+      #define ETL_COMPILER_TYPE_DETECTED
+    #endif
+  #endif
+
   #if !defined(ETL_COMPILER_TYPE_DETECTED)
     #define ETL_COMPILER_GENERIC
   #endif
@@ -187,6 +194,12 @@ SOFTWARE.
   #define ETL_USING_TEXAS_INSTRUMENTS_COMPILER 0
 #endif
 
+#if defined(ETL_COMPILER_TASKING)
+  #define ETL_USING_TASKING_COMPILER 1
+#else
+  #define ETL_USING_TASKING_COMPILER 0
+#endif
+
 #if defined(ETL_COMPILER_GENERIC)
   #define ETL_USING_GENERIC_COMPILER 1
 #else

diff --git a/include/etl/profiles/determine_compiler_version.h b/include/etl/profiles/determine_compiler_version.h
@@ -64,6 +64,9 @@ SOFTWARE.
   #elif defined(ETL_COMPILER_TEXAS_INSTRUMENTS)
     #define ETL_COMPILER_VERSION      __TI_COMPILER_VERSION__
     #define ETL_COMPILER_FULL_VERSION __TI_COMPILER_VERSION__
+  #elif defined(ETL_COMPILER_TASKING)
+    #define ETL_COMPILER_VERSION      __REVISION__
+    #define ETL_COMPILER_FULL_VERSION __VERSION__
   #else
     #define ETL_COMPILER_VERSION      0
     #define ETL_COMPILER_FULL_VERSION 0