[edk2] BaseTools: fix a syntax error in 4 KB aligned GNU ld linker script

Message ID 1435662014-26196-1-git-send-email-ard.biesheuvel@linaro.org
State New
Headers show

Commit Message

Ard Biesheuvel June 30, 2015, 11 a.m.
There needs to be a space between the output section name and the
colon, i.e.,

  .text : ALIGN(0x1000)
       ^

Fix this for all output sections

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
---
 BaseTools/Scripts/gcc-4K-align-ld-script | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

Comments

Ard Biesheuvel July 1, 2015, 8:11 a.m. | #1
On 30 June 2015 at 13:02, Gao, Liming <liming.gao@intel.com> wrote:
> Reviewed-by: Liming Gao <liming.gao@intel.com>
>

Hello Dennis,

Thanks for merging this.

Next time, could you please keep the subject line as well?

> Subject: [PATCH] BaseTools: fix a syntax error in 4 KB aligned GNU ld linker script

You have used this instead:

> There needs to be a space between the output section name and the colon, i.e.,

as the subject line which looks a little silly imo

Thanks,
Ard.


> -----Original Message-----
> From: Ard Biesheuvel [mailto:ard.biesheuvel@linaro.org]
> Sent: Tuesday, June 30, 2015 7:00 PM
> To: Liu, Yingke D; Gao, Liming; edk2-devel@lists.sourceforge.net
> Cc: Ard Biesheuvel
> Subject: [PATCH] BaseTools: fix a syntax error in 4 KB aligned GNU ld linker script
>
> There needs to be a space between the output section name and the colon, i.e.,
>
>   .text : ALIGN(0x1000)
>        ^
>
> Fix this for all output sections
>
> Contributed-under: TianoCore Contribution Agreement 1.0
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> ---
>  BaseTools/Scripts/gcc-4K-align-ld-script | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/BaseTools/Scripts/gcc-4K-align-ld-script b/BaseTools/Scripts/gcc-4K-align-ld-script
> index 1f23079023a6..16cf623a3362 100644
> --- a/BaseTools/Scripts/gcc-4K-align-ld-script
> +++ b/BaseTools/Scripts/gcc-4K-align-ld-script
> @@ -3,12 +3,12 @@ SECTIONS
>  {
>    /* . = 0 + SIZEOF_HEADERS; */
>    . = 0x280;
> -  .text: ALIGN(0x1000)
> +  .text : ALIGN(0x1000)
>    {
>      *(.text .stub .text.* .gnu.linkonce.t.*)
>      . = ALIGN(0x20);
>    }
> -  .data: ALIGN(0x1000)
> +  .data : ALIGN(0x1000)
>    {
>      *(
>        .rodata .rodata.* .gnu.linkonce.r.* @@ -18,16 +18,16 @@ SECTIONS
>      )
>      . = ALIGN(0x20);
>    }
> -  .eh_frame: ALIGN(0x1000)
> +  .eh_frame : ALIGN(0x1000)
>    {
>      KEEP (*(.eh_frame))
>    }
> -  .got: ALIGN(0x1000)
> +  .got : ALIGN(0x1000)
>    {
>      *(.got .got.*)
>      . = ALIGN(0x20);
>    }
> -  .rela: ALIGN(0x1000)
> +  .rela : ALIGN(0x1000)
>    {
>      *(.rela .rela.*)
>    }
> --
> 1.9.1
>

------------------------------------------------------------------------------
Don't Limit Your Business. Reach for the Cloud.
GigeNET's Cloud Solutions provide you with the tools and support that
you need to offload your IT needs and focus on growing your business.
Configured For All Businesses. Start Your Cloud Today.
https://www.gigenetcloud.com/

Patch hide | download patch | download mbox

diff --git a/BaseTools/Scripts/gcc-4K-align-ld-script b/BaseTools/Scripts/gcc-4K-align-ld-script
index 1f23079023a6..16cf623a3362 100644
--- a/BaseTools/Scripts/gcc-4K-align-ld-script
+++ b/BaseTools/Scripts/gcc-4K-align-ld-script
@@ -3,12 +3,12 @@  SECTIONS
 {
   /* . = 0 + SIZEOF_HEADERS; */
   . = 0x280;
-  .text: ALIGN(0x1000) 
+  .text : ALIGN(0x1000)
   {
     *(.text .stub .text.* .gnu.linkonce.t.*)
     . = ALIGN(0x20);
   }
-  .data: ALIGN(0x1000)
+  .data : ALIGN(0x1000)
   {
     *(
       .rodata .rodata.* .gnu.linkonce.r.*
@@ -18,16 +18,16 @@  SECTIONS
     )
     . = ALIGN(0x20);
   }
-  .eh_frame: ALIGN(0x1000)
+  .eh_frame : ALIGN(0x1000)
   {
     KEEP (*(.eh_frame))
   }
-  .got: ALIGN(0x1000)
+  .got : ALIGN(0x1000)
   {
     *(.got .got.*)
     . = ALIGN(0x20);
   }
-  .rela: ALIGN(0x1000)
+  .rela : ALIGN(0x1000)
   {
     *(.rela .rela.*)
   }