Merge d1605b581b into 7225fbcbb9

.github/workflows/auto-release.yml

@@ -18,8 +18,6 @@ on:
 
 jobs:
   release-packager:
-    permissions:
-      id-token: write
     name: Release Packager
     runs-on: ubuntu-latest
     steps:
@@ -119,14 +117,6 @@ jobs:
           ./tools/.github/scripts/release.py "$REPO_OWNER" --kernel-repo-path=local_kernel --kernel-commit="$COMMIT_SHA_2" --new-kernel-version="$VERSION_NUMBER" --new-kernel-main-br-version="$MAIN_BR_VERSION_NUMBER"
           exit $?
 
-      - name: Backup Release Asset
-        uses: FreeRTOS/CI-CD-Github-Actions/artifact-backup@main
-        with:
-          # This is dependent on the release script putting this zip file
-          # in this exact location.
-          artifact_path: ./FreeRTOS-KernelV${{ github.event.inputs.version_number }}.zip
-          release_tag: ${{ github.event.inputs.version_number }}
-
       - name: Cleanup
         env:
           VERSION_NUMBER: ${{ github.event.inputs.version_number }}

include/FreeRTOS.h

@@ -101,16 +101,6 @@
     #define configASSERT_DEFINED    1
 #endif
 
-/* Set configENABLE_PAC and/or configENABLE_BTI to 1 to enable PAC and/or BTI
- * support and 0 to disable them. These are currently used in ARMv8.1-M ports. */
-#ifndef configENABLE_PAC
-    #define configENABLE_PAC    0
-#endif
-
-#ifndef configENABLE_BTI
-    #define configENABLE_BTI    0
-#endif
-
 /* Basic FreeRTOS definitions. */
 #include "projdefs.h"
 
@@ -3050,6 +3040,16 @@
     #define configCONTROL_INFINITE_LOOP()
 #endif
 
+/* Set configENABLE_PAC and/or configENABLE_BTI to 1 to enable PAC and/or BTI
+ * support and 0 to disable them. These are currently used in ARMv8.1-M ports. */
+#ifndef configENABLE_PAC
+    #define configENABLE_PAC    0
+#endif
+
+#ifndef configENABLE_BTI
+    #define configENABLE_BTI    0
+#endif
+
 /* Sometimes the FreeRTOSConfig.h settings only allow a task to be created using
  * dynamically allocated RAM, in which case when any task is deleted it is known
  * that both the task's stack and TCB need to be freed.  Sometimes the

include/list.h

@@ -44,7 +44,7 @@
  *
  * In addition to it's value, each list item contains a pointer to the next
  * item in the list (pxNext), a pointer to the list it is in (pxContainer)
- * and a pointer back to the object that contains it.  These later two
+ * and a pointer to back to the object that contains it.  These later two
  * pointers are included for efficiency of list manipulation.  There is
  * effectively a two way link between the object containing the list item and
  * the list item itself.

portable/ThirdParty/GCC/Posix/port.c

@@ -140,8 +140,6 @@ static void prvThreadKeyDestructor( void * pvData )
 static void prvInitThreadKey( void )
 {
     pthread_key_create( &xThreadKey, prvThreadKeyDestructor );
-    /* Destroy xThreadKey when the process exits. */
-    atexit( prvDestroyThreadKey );
 }
 /*-----------------------------------------------------------*/
 
@@ -195,7 +193,7 @@ void prvFatalError( const char * pcCall,
 }
 /*-----------------------------------------------------------*/
 
-static void prvPortSetCurrentThreadName( const char * pxThreadName )
+static void prvPortSetCurrentThreadName( char * pxThreadName )
 {
     #ifdef __APPLE__
         pthread_setname_np( pxThreadName );
@@ -317,6 +315,8 @@ BaseType_t xPortStartScheduler( void )
     /* Restore original signal mask. */
     ( void ) pthread_sigmask( SIG_SETMASK, &xSchedulerOriginalSignalMask, NULL );
 
+    prvDestroyThreadKey();
+
     return 0;
 }
 /*-----------------------------------------------------------*/