diff --git a/Examples/ARM/arm_bayes_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_bayes_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_bayes_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_bayes_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_class_marks_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_class_marks_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_class_marks_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_class_marks_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_convolution_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_convolution_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_convolution_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_convolution_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_dotproduct_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_dotproduct_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_dotproduct_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_dotproduct_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_fft_bin_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_fft_bin_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_fft_bin_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_fft_bin_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_fir_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_fir_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_fir_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_fir_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_graphic_equalizer_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_graphic_equalizer_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_graphic_equalizer_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_graphic_equalizer_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_linear_interp_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_linear_interp_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_linear_interp_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_linear_interp_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example.uvoptx b/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example.uvoptx
index fb6085fa..d39718b5 100644
--- a/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example.uvoptx
+++ b/Examples/ARM/arm_linear_interp_example/arm_linear_interp_example.uvoptx
@@ -1035,7 +1035,40 @@
           <Name>-T0</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>202</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>2896</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>.\arm_linear_interp_example_f32.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\arm_linear_interp_example\arm_linear_interp_example_f32.c\202</Expression>
+        </Bp>
+        <Bp>
+          <Number>1</Number>
+          <Type>0</Type>
+          <LineNumber>194</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>2900</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>.\arm_linear_interp_example_f32.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\arm_linear_interp_example\arm_linear_interp_example_f32.c\194</Expression>
+        </Bp>
+      </Breakpoint>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
diff --git a/Examples/ARM/arm_matrix_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_matrix_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_matrix_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_matrix_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_signal_converge_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_signal_converge_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_signal_converge_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_signal_converge_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_sin_cos_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_sin_cos_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_sin_cos_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_sin_cos_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_svm_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_svm_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_svm_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_svm_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+
diff --git a/Examples/ARM/arm_variance_example/RTE/Device/ARMCM55/startup_ARMCM55.c b/Examples/ARM/arm_variance_example/RTE/Device/ARMCM55/startup_ARMCM55.c
index 770b6b08..0ab7e3e9 100644
--- a/Examples/ARM/arm_variance_example/RTE/Device/ARMCM55/startup_ARMCM55.c
+++ b/Examples/ARM/arm_variance_example/RTE/Device/ARMCM55/startup_ARMCM55.c
@@ -2,7 +2,7 @@
  * @file     startup_ARMCM55.c
  * @brief    CMSIS Core Device Startup File for ARMCM55 Device
  * @version  V1.0.0
- * @date     20. February 2020
+ * @date     31. March 2020
  ******************************************************************************/
 /*
  * Copyright (c) 2020 Arm Limited. All rights reserved.
@@ -34,13 +34,13 @@
 extern uint32_t __INITIAL_SP;
 extern uint32_t __STACK_LIMIT;
 
-extern void __PROGRAM_START(void) __NO_RETURN;
+extern __NO_RETURN void __PROGRAM_START(void);
 
 /*----------------------------------------------------------------------------
   Internal References
  *----------------------------------------------------------------------------*/
-void Default_Handler(void) __NO_RETURN;
-void Reset_Handler  (void) __NO_RETURN;
+__NO_RETURN void Reset_Handler  (void);
+            void Default_Handler(void);
 
 /*----------------------------------------------------------------------------
   Exception / Interrupt Handler
@@ -118,7 +118,7 @@ extern const VECTOR_TABLE_Type __VECTOR_TABLE[496];
 /*----------------------------------------------------------------------------
   Reset Handler called on controller reset
  *----------------------------------------------------------------------------*/
-void Reset_Handler(void)
+__NO_RETURN void Reset_Handler(void)
 {
   __set_MSPLIM((uint32_t)(&__STACK_LIMIT));
 
@@ -127,10 +127,15 @@ void Reset_Handler(void)
 }
 
 
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic push
+  #pragma clang diagnostic ignored "-Wmissing-noreturn"
+#endif
+
 /*----------------------------------------------------------------------------
   Hard Fault Handler
  *----------------------------------------------------------------------------*/
-__NO_RETURN void HardFault_Handler(void)
+void HardFault_Handler(void)
 {
   while(1);
 }
@@ -142,3 +147,8 @@ void Default_Handler(void)
 {
   while(1);
 }
+
+#if defined(__ARMCC_VERSION) && (__ARMCC_VERSION >= 6010050)
+  #pragma clang diagnostic pop
+#endif
+