There is no need to pad out the end of a section of the start of
the following section is aligned to the same value. So drop the
redundant ALIGN() statements.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com>
Tested-by: Liming Gao <liming....@intel.com>
---
 BaseTools/Scripts/gcc-4K-align-ld-script | 3 ---
 BaseTools/Scripts/gcc4.4-ld-script       | 3 ---
 BaseTools/Scripts/gcc4.9-ld-script       | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/BaseTools/Scripts/gcc-4K-align-ld-script 
b/BaseTools/Scripts/gcc-4K-align-ld-script
index 1f0f1afb27f4..3ed1c12fb8aa 100644
--- a/BaseTools/Scripts/gcc-4K-align-ld-script
+++ b/BaseTools/Scripts/gcc-4K-align-ld-script
@@ -7,7 +7,6 @@ SECTIONS
   {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     *(.rodata .rodata.* .gnu.linkonce.r.*)
-    . = ALIGN(0x20);
   }
   .data : ALIGN(0x1000)
   {
@@ -16,7 +15,6 @@ SECTIONS
       .bss .bss.*
       *COM*
     )
-    . = ALIGN(0x20);
   }
   .eh_frame : ALIGN(0x1000)
   {
@@ -25,7 +23,6 @@ SECTIONS
   .got : ALIGN(0x1000)
   {
     *(.got .got.*)
-    . = ALIGN(0x20);
   }
   .rela : ALIGN(0x1000)
   {
diff --git a/BaseTools/Scripts/gcc4.4-ld-script 
b/BaseTools/Scripts/gcc4.4-ld-script
index 22b3220816c9..0d86908d0b30 100644
--- a/BaseTools/Scripts/gcc4.4-ld-script
+++ b/BaseTools/Scripts/gcc4.4-ld-script
@@ -7,7 +7,6 @@ SECTIONS
   {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     *(.rodata .rodata.* .gnu.linkonce.r.*)
-    . = ALIGN(0x20);
   }
   .data ALIGN(0x20) :
   {
@@ -16,7 +15,6 @@ SECTIONS
       .bss .bss.*
       *COM*
     )
-    . = ALIGN(0x20);
   }
   .eh_frame ALIGN(0x20) :
   {
@@ -25,7 +23,6 @@ SECTIONS
   .got ALIGN(0x20) :
   {
     *(.got .got.*)
-    . = ALIGN(0x20);
   }
   .rela ALIGN(0x20) :
   {
diff --git a/BaseTools/Scripts/gcc4.9-ld-script 
b/BaseTools/Scripts/gcc4.9-ld-script
index 2ac86e38fac7..207b9e1dc7f0 100644
--- a/BaseTools/Scripts/gcc4.9-ld-script
+++ b/BaseTools/Scripts/gcc4.9-ld-script
@@ -7,7 +7,6 @@ SECTIONS
   {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     *(.rodata .rodata.* .gnu.linkonce.r.*)
-    . = ALIGN(0x20);
   }
   .data ALIGN(0x40) :
   {
@@ -16,7 +15,6 @@ SECTIONS
       .bss .bss.*
       *COM*
     )
-    . = ALIGN(0x20);
   }
   .eh_frame ALIGN(0x20) :
   {
@@ -25,7 +23,6 @@ SECTIONS
   .got ALIGN(0x20) :
   {
     *(.got .got.*)
-    . = ALIGN(0x20);
   }
   .rela ALIGN(0x20) :
   {
-- 
1.9.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to