Do not strip required symbols when LTO is on

[freertos] / FreeRTOS / Source / portable / ARMv8M / non_secure / port.c

diff --git a/FreeRTOS/Source/portable/ARMv8M/non_secure/port.c b/FreeRTOS/Source/portable/ARMv8M/non_secure/port.c
index 57c5e23bb90fb24d115b17847a71c732162123ac..92ef5ffb3cde4f56277856e4051038e5e58754c4 100644 (file)
--- a/FreeRTOS/Source/portable/ARMv8M/non_secure/port.c
+++ b/FreeRTOS/Source/portable/ARMv8M/non_secure/port.c
@@ -305,7 +305,7 @@ void SysTick_Handler( void ) PRIVILEGED_FUNCTION;
 /**\r
  * @brief C part of SVC handler.\r
  */\r
-void vPortSVCHandler_C( uint32_t *pulCallerStackAddress ) PRIVILEGED_FUNCTION;\r
+portDONT_DISCARD void vPortSVCHandler_C( uint32_t *pulCallerStackAddress ) PRIVILEGED_FUNCTION;\r
 /*-----------------------------------------------------------*/\r
 \r
 /**\r
@@ -319,7 +319,7 @@ static volatile uint32_t ulCriticalNesting = 0xaaaaaaaaUL;
         * @brief Saved as part of the task context to indicate which context the\r
         * task is using on the secure side.\r
         */\r
-       volatile SecureContextHandle_t xSecureContext = portNO_SECURE_CONTEXT;\r
+       portDONT_DISCARD volatile SecureContextHandle_t xSecureContext = portNO_SECURE_CONTEXT;\r
 #endif /* configENABLE_TRUSTZONE */\r
 /*-----------------------------------------------------------*/\r
 \r
@@ -369,6 +369,8 @@ volatile uint32_t ulDummy = 0UL;
                extern uint32_t * __privileged_functions_start__;\r
                extern uint32_t * __privileged_functions_end__;\r
                extern uint32_t * __syscalls_flash_start__;\r
+               extern uint32_t * __syscalls_flash_end__;\r
+               extern uint32_t * __unprivileged_flash_start__;\r
                extern uint32_t * __unprivileged_flash_end__;\r
                extern uint32_t * __privileged_sram_start__;\r
                extern uint32_t * __privileged_sram_end__;\r
@@ -377,6 +379,8 @@ volatile uint32_t ulDummy = 0UL;
                extern uint32_t __privileged_functions_start__[];\r
                extern uint32_t __privileged_functions_end__[];\r
                extern uint32_t __syscalls_flash_start__[];\r
+               extern uint32_t __syscalls_flash_end__[];\r
+               extern uint32_t __unprivileged_flash_start__[];\r
                extern uint32_t __unprivileged_flash_end__[];\r
                extern uint32_t __privileged_sram_start__[];\r
                extern uint32_t __privileged_sram_end__[];\r
@@ -400,17 +404,26 @@ volatile uint32_t ulDummy = 0UL;
                                                                ( portMPU_RLAR_ATTR_INDEX0 ) |\r
                                                                ( portMPU_RLAR_REGION_ENABLE );\r
 \r
-                       /* Setup unprivileged flash and system calls flash as Read Only by\r
-                        * both privileged and unprivileged tasks. All tasks can read it but\r
-                        * no-one can modify. */\r
+                       /* Setup unprivileged flash as Read Only by both privileged and\r
+                        * unprivileged tasks. All tasks can read it but no-one can modify. */\r
                        portMPU_RNR_REG = portUNPRIVILEGED_FLASH_REGION;\r
-                       portMPU_RBAR_REG =      ( ( ( uint32_t ) __syscalls_flash_start__ ) & portMPU_RBAR_ADDRESS_MASK ) |\r
+                       portMPU_RBAR_REG =      ( ( ( uint32_t ) __unprivileged_flash_start__ ) & portMPU_RBAR_ADDRESS_MASK ) |\r
                                                                ( portMPU_REGION_NON_SHAREABLE ) |\r
                                                                ( portMPU_REGION_READ_ONLY );\r
                        portMPU_RLAR_REG =      ( ( ( uint32_t ) __unprivileged_flash_end__ ) & portMPU_RLAR_ADDRESS_MASK ) |\r
                                                                ( portMPU_RLAR_ATTR_INDEX0 ) |\r
                                                                ( portMPU_RLAR_REGION_ENABLE );\r
 \r
+                       /* Setup unprivileged syscalls flash as Read Only by both privileged\r
+                        * and unprivileged tasks. All tasks can read it but no-one can modify. */\r
+                       portMPU_RNR_REG = portUNPRIVILEGED_SYSCALLS_REGION;\r
+                       portMPU_RBAR_REG =      ( ( ( uint32_t ) __syscalls_flash_start__ ) & portMPU_RBAR_ADDRESS_MASK ) |\r
+                                                               ( portMPU_REGION_NON_SHAREABLE ) |\r
+                                                               ( portMPU_REGION_READ_ONLY );\r
+                       portMPU_RLAR_REG =      ( ( ( uint32_t ) __syscalls_flash_end__ ) & portMPU_RLAR_ADDRESS_MASK ) |\r
+                                                               ( portMPU_RLAR_ATTR_INDEX0 ) |\r
+                                                               ( portMPU_RLAR_REGION_ENABLE );\r
+\r
                        /* Setup RAM containing kernel data for privileged access only. */\r
                        portMPU_RNR_REG = portPRIVILEGED_RAM_REGION;\r
                        portMPU_RBAR_REG =      ( ( ( uint32_t ) __privileged_sram_start__ ) & portMPU_RBAR_ADDRESS_MASK ) |\r
@@ -421,17 +434,6 @@ volatile uint32_t ulDummy = 0UL;
                                                                ( portMPU_RLAR_ATTR_INDEX0 ) |\r
                                                                ( portMPU_RLAR_REGION_ENABLE );\r
 \r
-                       /* By default allow everything to access the general peripherals.\r
-                        * The system peripherals and registers are protected. */\r
-                       portMPU_RNR_REG = portUNPRIVILEGED_DEVICE_REGION;\r
-                       portMPU_RBAR_REG =      ( ( ( uint32_t ) portDEVICE_REGION_START_ADDRESS ) & portMPU_RBAR_ADDRESS_MASK ) |\r
-                                                               ( portMPU_REGION_NON_SHAREABLE ) |\r
-                                                               ( portMPU_REGION_READ_WRITE ) |\r
-                                                               ( portMPU_REGION_EXECUTE_NEVER );\r
-                       portMPU_RLAR_REG =      ( ( ( uint32_t ) portDEVICE_REGION_END_ADDRESS ) & portMPU_RLAR_ADDRESS_MASK ) |\r
-                                                               ( portMPU_RLAR_ATTR_INDEX1 ) |\r
-                                                               ( portMPU_RLAR_REGION_ENABLE );\r
-\r
                        /* Enable mem fault. */\r
                        portSCB_SYS_HANDLER_CTRL_STATE_REG |= portSCB_MEM_FAULT_ENABLE;\r
 \r
@@ -521,7 +523,7 @@ uint32_t ulPreviousMask;
 }\r
 /*-----------------------------------------------------------*/\r
 \r
-void vPortSVCHandler_C( uint32_t *pulCallerStackAddress ) /* PRIVILEGED_FUNCTION */\r
+void vPortSVCHandler_C( uint32_t *pulCallerStackAddress ) /* PRIVILEGED_FUNCTION portDONT_DISCARD */\r
 {\r
 #if( configENABLE_MPU == 1 )\r
        #if defined( __ARMCC_VERSION )\r