diff mbox

sparc: Check PIC instead of SHARED in start.S

Message ID 20170929213002.GB2482@gmail.com
State New, archived
Headers show

Commit Message

H.J. Lu Sept. 29, 2017, 9:30 p.m. UTC
Since start.o may be compiled as PIC, we should check PIC instead of
SHARED.

OK for master?

	* sysdeps/sparc/sparc32/start.S (_start): Check PIC instead of
	SHARED.
	* sysdeps/sparc/sparc64/start.S (_start): Likewise.
---
 sysdeps/sparc/sparc32/start.S | 4 ++--
 sysdeps/sparc/sparc64/start.S | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

H.J. Lu Feb. 3, 2018, 2:04 p.m. UTC | #1
FYI. This patch fixed:

https://sourceware.org/bugzilla/show_bug.cgi?id=22638

OK for master?

On Fri, Sep 29, 2017 at 2:30 PM, H.J. Lu <hjl.tools@gmail.com> wrote:
> Since start.o may be compiled as PIC, we should check PIC instead of
> SHARED.
>
> OK for master?
>
>         * sysdeps/sparc/sparc32/start.S (_start): Check PIC instead of
>         SHARED.
>         * sysdeps/sparc/sparc64/start.S (_start): Likewise.
> ---
>  sysdeps/sparc/sparc32/start.S | 4 ++--
>  sysdeps/sparc/sparc64/start.S | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/sysdeps/sparc/sparc32/start.S b/sysdeps/sparc/sparc32/start.S
> index a06568d0e9..b882d1e61f 100644
> --- a/sysdeps/sparc/sparc32/start.S
> +++ b/sysdeps/sparc/sparc32/start.S
> @@ -42,7 +42,7 @@
>         .global _start
>         .type _start,#function
>  _start:
> -#ifdef SHARED
> +#ifdef PIC
>         SETUP_PIC_REG(l7)
>  #endif
>
> @@ -57,7 +57,7 @@ _start:
>         add     %sp, 23*4, %o2
>
>    /* Load the addresses of the user entry points.  */
> -#ifndef SHARED
> +#ifndef PIC
>         sethi   %hi(main), %o0
>         sethi   %hi(__libc_csu_init), %o3
>         sethi   %hi(__libc_csu_fini), %o4
> diff --git a/sysdeps/sparc/sparc64/start.S b/sysdeps/sparc/sparc64/start.S
> index fcd4721463..21d16de804 100644
> --- a/sysdeps/sparc/sparc64/start.S
> +++ b/sysdeps/sparc/sparc64/start.S
> @@ -42,7 +42,7 @@
>         .global _start
>         .type _start,#function
>  _start:
> -#ifdef SHARED
> +#ifdef PIC
>         SETUP_PIC_REG(l7)
>  #endif
>
> @@ -58,7 +58,7 @@ _start:
>         add     %sp, STACK_BIAS+23*8, %o2
>
>    /* Load the addresses of the user entry points.  */
> -#ifndef SHARED
> +#ifndef PIC
>         sethi   %hi(main), %o0
>         sethi   %hi(__libc_csu_init), %o3
>         sethi   %hi(__libc_csu_fini), %o4
> --
> 2.13.6
>
David Miller Feb. 5, 2018, 1:11 p.m. UTC | #2
From: "H.J. Lu" <hjl.tools@gmail.com>
Date: Sat, 3 Feb 2018 06:04:17 -0800

> FYI. This patch fixed:
> 
> https://sourceware.org/bugzilla/show_bug.cgi?id=22638
> 
> OK for master?

Yes.
diff mbox

Patch

diff --git a/sysdeps/sparc/sparc32/start.S b/sysdeps/sparc/sparc32/start.S
index a06568d0e9..b882d1e61f 100644
--- a/sysdeps/sparc/sparc32/start.S
+++ b/sysdeps/sparc/sparc32/start.S
@@ -42,7 +42,7 @@ 
 	.global _start
 	.type _start,#function
 _start:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG(l7)
 #endif
 
@@ -57,7 +57,7 @@  _start:
 	add	%sp, 23*4, %o2
 
   /* Load the addresses of the user entry points.  */
-#ifndef SHARED
+#ifndef PIC
 	sethi	%hi(main), %o0
 	sethi	%hi(__libc_csu_init), %o3
 	sethi	%hi(__libc_csu_fini), %o4
diff --git a/sysdeps/sparc/sparc64/start.S b/sysdeps/sparc/sparc64/start.S
index fcd4721463..21d16de804 100644
--- a/sysdeps/sparc/sparc64/start.S
+++ b/sysdeps/sparc/sparc64/start.S
@@ -42,7 +42,7 @@ 
 	.global _start
 	.type _start,#function
 _start:
-#ifdef SHARED
+#ifdef PIC
 	SETUP_PIC_REG(l7)
 #endif
 
@@ -58,7 +58,7 @@  _start:
 	add	%sp, STACK_BIAS+23*8, %o2
 
   /* Load the addresses of the user entry points.  */
-#ifndef SHARED
+#ifndef PIC
 	sethi	%hi(main), %o0
 	sethi	%hi(__libc_csu_init), %o3
 	sethi	%hi(__libc_csu_fini), %o4