3 files changed, 3 insertions, 12 deletions
diff --git a/BaseTools/Scripts/gcc-4K-align-ld-script b/BaseTools/Scripts/gcc-4K-align-ld-script
index 3ed1c12fb8..34957a5314 100644
--- a/BaseTools/Scripts/gcc-4K-align-ld-script
+++ b/BaseTools/Scripts/gcc-4K-align-ld-script
@@ -7,6 +7,7 @@ SECTIONS
   {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     *(.rodata .rodata.* .gnu.linkonce.r.*)
+    *(.got .got.*)
   }
   .data : ALIGN(0x1000)
   {
@@ -20,10 +21,6 @@ SECTIONS
   {
     KEEP (*(.eh_frame))
   }
-  .got : ALIGN(0x1000)
-  {
-    *(.got .got.*)
-  }
   .rela : ALIGN(0x1000)
   {
     *(.rela .rela.*)
diff --git a/BaseTools/Scripts/gcc4.4-ld-script b/BaseTools/Scripts/gcc4.4-ld-script
index 0d86908d0b..48320c6611 100644
--- a/BaseTools/Scripts/gcc4.4-ld-script
+++ b/BaseTools/Scripts/gcc4.4-ld-script
@@ -7,6 +7,7 @@ SECTIONS
   {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     *(.rodata .rodata.* .gnu.linkonce.r.*)
+    *(.got .got.*)
   }
   .data ALIGN(0x20) :
   {
@@ -20,10 +21,6 @@ SECTIONS
   {
     KEEP (*(.eh_frame))
   }
-  .got ALIGN(0x20) :
-  {
-    *(.got .got.*)
-  }
   .rela ALIGN(0x20) :
   {
     *(.rela .rela.*)
diff --git a/BaseTools/Scripts/gcc4.9-ld-script b/BaseTools/Scripts/gcc4.9-ld-script
index 207b9e1dc7..3dff0b2907 100644
--- a/BaseTools/Scripts/gcc4.9-ld-script
+++ b/BaseTools/Scripts/gcc4.9-ld-script
@@ -7,6 +7,7 @@ SECTIONS
   {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     *(.rodata .rodata.* .gnu.linkonce.r.*)
+    *(.got .got.*)
   }
   .data ALIGN(0x40) :
   {
@@ -20,10 +21,6 @@ SECTIONS
   {
     KEEP (*(.eh_frame))
   }
-  .got ALIGN(0x20) :
-  {
-    *(.got .got.*)
-  }
   .rela ALIGN(0x20) :
   {
     *(.rela .rela.*)