portable/GCC/ARM_CRx_MPU/mpu_wrappers_v2_asm.S

@@ -30,7 +30,7 @@
 
     .arm
     .syntax unified
-    .section freertos_system_calls, "ax"
+    .section freertos_system_calls
 
 #define FREERTOS_ASSEMBLY
     #include "FreeRTOSConfig.h"

portable/GCC/ARM_CRx_MPU/portASM.S

@@ -28,7 +28,7 @@
 
     .arm
     .syntax unified
-    .section privileged_functions, "ax"
+    .section privileged_functions
 
 #define FREERTOS_ASSEMBLY
     #include "portmacro_asm.h"

portable/MSVC-MingW/port.c

@@ -33,14 +33,6 @@
 #include "FreeRTOS.h"
 #include "task.h"
 
-#ifdef WIN32_LEAN_AND_MEAN
-    #include <winsock2.h>
-#else
-    #include <winsock.h>
-#endif
-
-#include <timeapi.h>
-
 #ifdef __GNUC__
     #include "mmsystem.h"
 #else

portable/MSVC-MingW/portmacro.h

@@ -29,6 +29,17 @@
 #ifndef PORTMACRO_H
 #define PORTMACRO_H
 
+#ifdef WIN32_LEAN_AND_MEAN
+    #include <winsock2.h>
+#else
+    #include <winsock.h>
+#endif
+
+#include <windows.h>
+#include <timeapi.h>
+#include <mmsystem.h>
+#include <winbase.h>
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -145,25 +156,22 @@ void vPortExitCritical( void );
                          : "cc" )
 
     #else /* __GNUC__ */
-        #include <intrin.h>
 
         /* BitScanReverse returns the bit position of the most significant '1'
          * in the word. */
         #if defined( __x86_64__ ) || defined( _M_X64 )
-            #pragma intrinsic(_BitScanReverse64)
 
             #define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities )    \
             do                                                                      \
             {                                                                       \
-                unsigned long ulTopPriority;                                        \
+                DWORD ulTopPriority;                                                \
                 _BitScanReverse64( &ulTopPriority, ( uxReadyPriorities ) );         \
                 uxTopPriority = ulTopPriority;                                      \
             } while( 0 )
 
         #else /* #if defined( __x86_64__ ) || defined( _M_X64 ) */
-            #pragma intrinsic(_BitScanReverse)
 
-            #define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities )    _BitScanReverse( ( unsigned long * ) &( uxTopPriority ), ( uxReadyPriorities ) )
+            #define portGET_HIGHEST_PRIORITY( uxTopPriority, uxReadyPriorities )    _BitScanReverse( ( DWORD * ) &( uxTopPriority ), ( uxReadyPriorities ) )
 
         #endif /* #if defined( __x86_64__ ) || defined( _M_X64 ) */