diff options
| author |   H dot J dot Lu <hjl dot tools at gmail dot com> | 2017-09-29 14:30:02 -0700 |
|---|---|---|
| committer |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2018-05-25 20:45:55 +0200 |
| commit | dec42d1257717054c08b8293d799e640e94df1d7 (patch) | |
| tree | ab6d27b6b5003c7b0cb70beb0e171f1ed505601d | |
| parent | Add NEWS entry for CVE-2018-11236 (diff) | |
| download | glibc-gentoo/2.26.tar.gz glibc-gentoo/2.26.tar.bz2 glibc-gentoo/2.26.zip | |
sparc: Check PIC instead of SHARED in start.Sgentoo/2.26
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.
[gentoo note: the patch is not yet applied upstream]
https://bugs.gentoo.org/640966
https://sourceware.org/ml/libc-alpha/2017-09/msg01140.html
(cherry picked from commit fec498315526476aaf05260677d58f5ac5adaf00)
| -rw-r--r-- | sysdeps/sparc/sparc32/start.S | 4 | ||||
| -rw-r--r-- | 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 |