Patchwork sysdeps/riscv/start.S: rename .Lload_gp to load_gp (bug 24376)

login
register
mail settings
Submitter Andreas Schwab
Date Nov. 25, 2019, 4:05 p.m.
Message ID <mvmpnhgaqmr.fsf@suse.de>
Download mbox | patch
Permalink /patch/36189/
State New
Headers show

Comments

Andreas Schwab - Nov. 25, 2019, 4:05 p.m.
Renaming the symbol keeps the label in the symbol table as a normal local
label, so that `objdump -d' can pick it up as an anchor.
---
 sysdeps/riscv/start.S | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
Palmer Dabbelt - Nov. 25, 2019, 9:09 p.m.
On Mon, 25 Nov 2019 08:05:00 PST (-0800), schwab@suse.de wrote:
> Renaming the symbol keeps the label in the symbol table as a normal local
> label, so that `objdump -d' can pick it up as an anchor.
> ---
>  sysdeps/riscv/start.S | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/sysdeps/riscv/start.S b/sysdeps/riscv/start.S
> index bcbce58ffe..dee984131c 100644
> --- a/sysdeps/riscv/start.S
> +++ b/sysdeps/riscv/start.S
> @@ -47,7 +47,7 @@ ENTRY (ENTRY_POINT)
>  	   .cfi_label to force starting the FDE.  */
>  	.cfi_label .Ldummy
>  	cfi_undefined (ra)
> -	call  .Lload_gp
> +	call  load_gp
>  	mv    a5, a0  /* rtld_fini.  */
>  	/* main may be in a shared library.  */
>  	la   a0, main
> @@ -68,7 +68,7 @@ END (ENTRY_POINT)
>     needs to be initialized before calling __libc_start_main in that case.
>     So we redundantly initialize it at the beginning of _start.  */
>
> -.Lload_gp:
> +load_gp:
>  .option push
>  .option norelax
>  	lla   gp, __global_pointer$
> @@ -76,7 +76,7 @@ END (ENTRY_POINT)
>  	ret
>
>  	.section .preinit_array,"aw"
> -	.dc.a .Lload_gp
> +	.dc.a load_gp
>
>  /* Define a symbol for the first piece of initialized data.  */
>  	.data

Reviewed-by: Palmer Dabbelt <palmerdabbelt@google.com>

Thanks!
Alistair Francis - Nov. 27, 2019, 6:27 a.m.
On Monday, November 25, 2019, Andreas Schwab wrote:
> Renaming the symbol keeps the label in the symbol table as a normal local

> label, so that `objdump -d' can pick it up as an anchor.


Reviewed-by: Alistair Francis <alistair.francis@wdc.com> 


Alistair

> ---

>  sysdeps/riscv/start.S | 6 +++---

>  1 file changed, 3 insertions(+), 3 deletions(-)

> 

> diff --git a/sysdeps/riscv/start.S b/sysdeps/riscv/start.S

> index bcbce58ffe..dee984131c 100644

> --- a/sysdeps/riscv/start.S

> +++ b/sysdeps/riscv/start.S

> @@ -47,7 +47,7 @@ ENTRY (ENTRY_POINT)

>  	   .cfi_label to force starting the FDE.  */

>  	.cfi_label .Ldummy

>  	cfi_undefined (ra)

> -	call  .Lload_gp

> +	call  load_gp

>  	mv    a5, a0  /* rtld_fini.  */

>  	/* main may be in a shared library.  */

>  	la   a0, main

> @@ -68,7 +68,7 @@ END (ENTRY_POINT)

>     needs to be initialized before calling __libc_start_main in that case.

>     So we redundantly initialize it at the beginning of _start.  */

>  

> -.Lload_gp:

> +load_gp:

>  .option push

>  .option norelax

>  	lla   gp, __global_pointer$

> @@ -76,7 +76,7 @@ END (ENTRY_POINT)

>  	ret

>  

>  	.section .preinit_array,"aw"

> -	.dc.a .Lload_gp

> +	.dc.a load_gp

>  

>  /* Define a symbol for the first piece of initialized data.  */

>  	.data

> -- 

> 2.24.0

> 

> 

> -- 

> Andreas Schwab, SUSE Labs, schwab@suse.de

> GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE  1748 E4D4 88E3 0EEA B9D7

> "And now for something completely different."

>

Patch

diff --git a/sysdeps/riscv/start.S b/sysdeps/riscv/start.S
index bcbce58ffe..dee984131c 100644
--- a/sysdeps/riscv/start.S
+++ b/sysdeps/riscv/start.S
@@ -47,7 +47,7 @@  ENTRY (ENTRY_POINT)
 	   .cfi_label to force starting the FDE.  */
 	.cfi_label .Ldummy
 	cfi_undefined (ra)
-	call  .Lload_gp
+	call  load_gp
 	mv    a5, a0  /* rtld_fini.  */
 	/* main may be in a shared library.  */
 	la   a0, main
@@ -68,7 +68,7 @@  END (ENTRY_POINT)
    needs to be initialized before calling __libc_start_main in that case.
    So we redundantly initialize it at the beginning of _start.  */
 
-.Lload_gp:
+load_gp:
 .option push
 .option norelax
 	lla   gp, __global_pointer$
@@ -76,7 +76,7 @@  END (ENTRY_POINT)
 	ret
 
 	.section .preinit_array,"aw"
-	.dc.a .Lload_gp
+	.dc.a load_gp
 
 /* Define a symbol for the first piece of initialized data.  */
 	.data