commit 309a18a03adab1eaca5d86654dd4e1075ee49e7a
author Kody Stribrny <89810515+kstribrnAmzn@users.noreply.github.com> Mon Mar 06 20:04:15 2023 -0800
committer GitHub <noreply@github.com> Tue Mar 07 09:34:15 2023 +0530
tree 81dabc2875320b97805f431a6dace4c8de52b6e6
parent 7b26ea6263d795bd1090eac60d63a29080934f2f

Fix freertos_kernel cmake property, Posix Port (#640)

* Fix freertos_kernel cmake property, Posix Port

* Moves the `set_property()` call below the target definition in top level CMakeLists file
* Corrects billion value from `ULL` suffix (not C90 compliant) to `UL` suffix with cast to uint64_t

* Add blank line to CMakeLists.txt

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b51b7aa..6d83db8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -229,10 +229,6 @@
 endif()
 
 ########################################################################
-# Requirements
-set_property(TARGET freertos_kernel PROPERTY C_STANDARD 90)
-
-########################################################################
 # Overall Compile Options
 # Note the compile option strategy is to error on everything and then
 # Per library opt-out of things that are warnings/errors.
@@ -294,3 +290,7 @@
         $<$<TARGET_EXISTS:freertos_config>:freertos_config>
         freertos_kernel_port
 )
+
+########################################################################
+# Requirements
+set_property(TARGET freertos_kernel PROPERTY C_STANDARD 90)

portable/ThirdParty/GCC/Posix/port.c

diff --git a/portable/ThirdParty/GCC/Posix/port.c b/portable/ThirdParty/GCC/Posix/port.c
index 12076b9..d634c8b 100644
--- a/portable/ThirdParty/GCC/Posix/port.c
+++ b/portable/ThirdParty/GCC/Posix/port.c
@@ -343,7 +343,7 @@
 
     clock_gettime( CLOCK_MONOTONIC, &t );
 
-    return ( uint64_t )t.tv_sec * 1000000000ULL + ( uint64_t )t.tv_nsec;
+    return ( uint64_t )t.tv_sec * ( uint64_t )1000000000UL + ( uint64_t )t.tv_nsec;
 }
 
 static uint64_t prvStartTimeNs;