diff --git a/bl1/bl1.ld.S b/bl1/bl1.ld.S
index 009a9b59cada547b6a8fbf1e702df55823e59551..4ebe8a02a9fddd4b6c273d432f50d2ae4d20d655 100644
--- a/bl1/bl1.ld.S
+++ b/bl1/bl1.ld.S
@@ -103,12 +103,7 @@ SECTIONS
         __DATA_RAM_END__ = .;
     } >RAM AT>ROM
 
-    stacks (NOLOAD) : {
-        __STACKS_START__ = .;
-        *(tzfw_normal_stacks)
-        __STACKS_END__ = .;
-    } >RAM
-
+    STACK_SECTION >RAM
     BSS_SECTION >RAM
     XLAT_TABLE_SECTION >RAM
 
diff --git a/bl2/bl2.ld.S b/bl2/bl2.ld.S
index 15df5dd0385d79bc4c31e19467efad27fc15fd71..17475f061625da9e9ad5dc9a54751a07589b7a34 100644
--- a/bl2/bl2.ld.S
+++ b/bl2/bl2.ld.S
@@ -88,12 +88,7 @@ SECTIONS
         __DATA_END__ = .;
     } >RAM
 
-    stacks (NOLOAD) : {
-        __STACKS_START__ = .;
-        *(tzfw_normal_stacks)
-        __STACKS_END__ = .;
-    } >RAM
-
+    STACK_SECTION >RAM
     BSS_SECTION >RAM
     XLAT_TABLE_SECTION >RAM
 
diff --git a/bl2/bl2_el3.ld.S b/bl2/bl2_el3.ld.S
index d04f226e90a8d5b6629cd087d9723d15f9aeb00a..ea7a23500c0d74a9a8e764eb82693a2ae6131593 100644
--- a/bl2/bl2_el3.ld.S
+++ b/bl2/bl2_el3.ld.S
@@ -123,12 +123,7 @@ SECTIONS
     } >RAM
     __RELA_END__ = .;
 
-    stacks (NOLOAD) : {
-        __STACKS_START__ = .;
-        *(tzfw_normal_stacks)
-        __STACKS_END__ = .;
-    } >RAM
-
+    STACK_SECTION >RAM
     BSS_SECTION >RAM
     XLAT_TABLE_SECTION >RAM
 
diff --git a/bl2u/bl2u.ld.S b/bl2u/bl2u.ld.S
index 8c0bbbdd075e21620daa819ebcbe8db046ac46cb..3ab43825c1147fd4217e5899ec7dac6770c37b17 100644
--- a/bl2u/bl2u.ld.S
+++ b/bl2u/bl2u.ld.S
@@ -90,12 +90,7 @@ SECTIONS
         __DATA_END__ = .;
     } >RAM
 
-    stacks (NOLOAD) : {
-        __STACKS_START__ = .;
-        *(tzfw_normal_stacks)
-        __STACKS_END__ = .;
-    } >RAM
-
+    STACK_SECTION >RAM
     BSS_SECTION >RAM
     XLAT_TABLE_SECTION >RAM
 
diff --git a/bl31/bl31.ld.S b/bl31/bl31.ld.S
index 1cdf7c94325bccb2b64bd0f15a9b3c87e1a2b5b8..94d03e3da557e06495acf7d5f083f71f3f646a1e 100644
--- a/bl31/bl31.ld.S
+++ b/bl31/bl31.ld.S
@@ -158,12 +158,7 @@ SECTIONS
     __NOBITS_START__ = .;
 #endif
 
-    stacks (NOLOAD) : {
-        __STACKS_START__ = .;
-        *(tzfw_normal_stacks)
-        __STACKS_END__ = .;
-    } >NOBITS
-
+    STACK_SECTION >NOBITS
     BSS_SECTION >NOBITS
     XLAT_TABLE_SECTION >NOBITS
 
diff --git a/bl32/sp_min/sp_min.ld.S b/bl32/sp_min/sp_min.ld.S
index da005db644503bbabc9ff9722fdef08c182dd709..8e91cec91bbccffc411957aa3152fdc384762d0f 100644
--- a/bl32/sp_min/sp_min.ld.S
+++ b/bl32/sp_min/sp_min.ld.S
@@ -101,12 +101,7 @@ SECTIONS
     ASSERT(. <= BL32_PROGBITS_LIMIT, "BL32 progbits has exceeded its limit.")
 #endif
 
-    stacks (NOLOAD) : {
-        __STACKS_START__ = .;
-        *(tzfw_normal_stacks)
-        __STACKS_END__ = .;
-    } >RAM
-
+    STACK_SECTION >RAM
     BSS_SECTION >RAM
     XLAT_TABLE_SECTION >RAM
 
diff --git a/bl32/tsp/tsp.ld.S b/bl32/tsp/tsp.ld.S
index bf77c923460774e2e54ec3a19a6675565757e8f6..7428c0345b0fb7629debeb826906062f716e78dd 100644
--- a/bl32/tsp/tsp.ld.S
+++ b/bl32/tsp/tsp.ld.S
@@ -91,12 +91,7 @@ SECTIONS
     ASSERT(. <= TSP_PROGBITS_LIMIT, "TSP progbits has exceeded its limit.")
 #endif
 
-    stacks (NOLOAD) : {
-        __STACKS_START__ = .;
-        *(tzfw_normal_stacks)
-        __STACKS_END__ = .;
-    } >RAM
-
+    STACK_SECTION >RAM
     BSS_SECTION >RAM
     XLAT_TABLE_SECTION >RAM
 
diff --git a/plat/mediatek/mt6795/bl31.ld.S b/plat/mediatek/mt6795/bl31.ld.S
index b061b91ce010e26238d201f536b515d53d363a13..91ca87cb637949c62f758ed91c6fd6dcf0fc3598 100644
--- a/plat/mediatek/mt6795/bl31.ld.S
+++ b/plat/mediatek/mt6795/bl31.ld.S
@@ -74,12 +74,7 @@ SECTIONS
     ASSERT(. <= BL31_PROGBITS_LIMIT, "BL3-1 progbits has exceeded its limit.")
 #endif
 
-    stacks (NOLOAD) : {
-        __STACKS_START__ = .;
-        *(tzfw_normal_stacks)
-        __STACKS_END__ = .;
-    } >RAM
-
+    STACK_SECTION >RAM
     BSS_SECTION >RAM
     __RW_END__ = __BSS_END__;