UefiCpuPkg/PiSmmCpuDxeSmm: Remove MTRRs from PSD structure

[mirror_edk2.git] / BaseTools / Scripts / GccBase.lds

diff --git a/BaseTools/Scripts/GccBase.lds b/BaseTools/Scripts/GccBase.lds
index 4ee6d998532c1346a52235fb011184ce4a0994db..900848747144dba08a1af4e601c0dbd3917dbef6 100644 (file)
--- a/BaseTools/Scripts/GccBase.lds
+++ b/BaseTools/Scripts/GccBase.lds
@@ -4,6 +4,7 @@
 \r
   Copyright (c) 2010 - 2015, Intel Corporation. All rights reserved.<BR>\r
   Copyright (c) 2015, Linaro Ltd. All rights reserved.<BR>\r
+  (C) Copyright 2016 Hewlett Packard Enterprise Development LP<BR>\r
 \r
   This program and the accompanying materials are licensed and made available under\r
   the terms and conditions of the BSD License that accompanies this distribution.\r
@@ -46,17 +47,27 @@ SECTIONS {
    */\r
   .data ALIGN(ALIGNOF(.text)) : ALIGN(CONSTANT(COMMONPAGESIZE)) {\r
     *(.data .data.* .gnu.linkonce.d.*)\r
-    *(.bss .bss.* *COM*)\r
+    *(.bss .bss.*)\r
   }\r
 \r
   .eh_frame ALIGN(CONSTANT(COMMONPAGESIZE)) : {\r
     KEEP (*(.eh_frame))\r
   }\r
 \r
-  .rela ALIGN(CONSTANT(COMMONPAGESIZE)) : {\r
+  .rela (INFO) : {\r
     *(.rela .rela.*)\r
   }\r
 \r
+  .hii : ALIGN(CONSTANT(COMMONPAGESIZE)) {\r
+    KEEP (*(.hii))\r
+  }\r
+\r
+  /*\r
+   * Retain the GNU build id but in a non-allocatable section so GenFw\r
+   * does not copy it into the PE/COFF image.\r
+   */\r
+  .build-id (INFO) : { *(.note.gnu.build-id) }\r
+\r
   /DISCARD/ : {\r
     *(.note.GNU-stack)\r
     *(.gnu_debuglink)\r
@@ -66,5 +77,6 @@ SECTIONS {
     *(.dynamic)\r
     *(.hash)\r
     *(.comment)\r
+    *(COMMON)\r
   }\r
 }\r