diff --git a/portable/GCC/MicroBlazeV9/portasm.S b/portable/GCC/MicroBlazeV9/portasm.S
index 7480e76ed..c329bc338 100644
--- a/portable/GCC/MicroBlazeV9/portasm.S
+++ b/portable/GCC/MicroBlazeV9/portasm.S
@@ -38,19 +38,49 @@
 back into the caller stack. */
 #if defined (__arch64__)
 #if( XPAR_MICROBLAZE_USE_FPU != 0 )
-	#define portCONTEXT_SIZE 272
-	#define portMINUS_CONTEXT_SIZE -272
+	#define portFSR_OFFSET 264
+	#if( XPAR_MICROBLAZE_USE_STACK_PROTECTION )
+		#define portSLR_OFFSET 272
+		#define portSHR_OFFSET 280
+		#define portCONTEXT_SIZE 288
+		#define portMINUS_CONTEXT_SIZE -288
+	#else
+		#define portCONTEXT_SIZE 272
+		#define portMINUS_CONTEXT_SIZE -272
+	#endif
 #else
-	#define portCONTEXT_SIZE 264
-	#define portMINUS_CONTEXT_SIZE -264
+	#if( XPAR_MICROBLAZE_USE_STACK_PROTECTION )
+		#define portSLR_OFFSET 264
+		#define portSHR_OFFSET 272
+		#define portCONTEXT_SIZE 280
+		#define portMINUS_CONTEXT_SIZE -280
+	#else
+		#define portCONTEXT_SIZE 264
+		#define portMINUS_CONTEXT_SIZE -264
+	#endif
 #endif
 #else
 #if( XPAR_MICROBLAZE_USE_FPU != 0 )
-	#define portCONTEXT_SIZE 136
-	#define portMINUS_CONTEXT_SIZE -136
+	#define portFSR_OFFSET 132
+	#if( XPAR_MICROBLAZE_USE_STACK_PROTECTION )
+		#define portSLR_OFFSET 136
+		#define portSHR_OFFSET 140
+		#define portCONTEXT_SIZE 144
+		#define portMINUS_CONTEXT_SIZE -144
+	#else
+		#define portCONTEXT_SIZE 136
+		#define portMINUS_CONTEXT_SIZE -136
+	#endif
 #else
-	#define portCONTEXT_SIZE 132
-	#define portMINUS_CONTEXT_SIZE -132
+	#if( XPAR_MICROBLAZE_USE_STACK_PROTECTION )
+		#define portSLR_OFFSET 132
+		#define portSHR_OFFSET 136
+		#define portCONTEXT_SIZE 140
+		#define portMINUS_CONTEXT_SIZE -140
+	#else
+		#define portCONTEXT_SIZE 132
+		#define portMINUS_CONTEXT_SIZE -132
+	#endif
 #endif
 #endif
 
@@ -88,7 +118,6 @@ back into the caller stack. */
 #define portR2_OFFSET	240
 #define portCRITICAL_NESTING_OFFSET 248
 #define portMSR_OFFSET 256
-#define portFSR_OFFSET 264
 #else
 #define portR31_OFFSET	4
 #define portR30_OFFSET	8
@@ -122,7 +151,6 @@ back into the caller stack. */
 #define portR2_OFFSET	120
 #define portCRITICAL_NESTING_OFFSET 124
 #define portMSR_OFFSET 128
-#define portFSR_OFFSET 132
 
 #endif