AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-29 00:01:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

i386: Fix build by GCC 5.0

Browse Source 
Fixed 3 "make check" failures on glibc 32bit built by gcc 5.0 due to EBX
was enabled for allocation:

https://gcc.gnu.org/ml/gcc-patches/2014-10/msg00892.html

Tests elf/tst-tls3, elf/tst-execstack-needed, elf/tst-execstack-prog
were failed because EBX was used as PIC register.

	* sysdeps/i386/tls-macros.h: Include <features.h>.
	(TLS_LE): Use non-PIC version for GCC >= 5.0.
	(TLS_IE): Likewise.
	(TLS_LD): Likewise.
	(TLS_GD): Likewise.
	* sysdeps/unix/sysv/linux/i386/sysdep.h (check_consistency): Don't
	define for GCC >= 5.0.
This commit is contained in:
Andrew Senkevich 2014-12-30 11:34:53 -08:00 committed by H.J. Lu
parent 1ff950ad20
commit 07256e183e
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2014-12-30 Andrew Senkevich <andrew.senkevich@intel.com>
* sysdeps/i386/tls-macros.h: Include <features.h>.
(TLS_LE): Use non-PIC version for GCC >= 5.0.
(TLS_IE): Likewise.
(TLS_LD): Likewise.
(TLS_GD): Likewise.
* sysdeps/unix/sysv/linux/i386/sysdep.h (check_consistency): Don't
define for GCC >= 5.0.
2014-12-30 Chris Metcalf <cmetcalf@ezchip.com> 2014-12-30 Chris Metcalf <cmetcalf@ezchip.com>
* math/test-fenv.c (test_single_exception, set_single_exc, * math/test-fenv.c (test_single_exception, set_single_exc,

8
sysdeps/i386/tls-macros.h
View File

@ -1,3 +1,5 @@
#include <features.h> /* For __GNUC_PREREQ. */
#define TLS_LE(x) \ #define TLS_LE(x) \
({ int *__l; \ ({ int *__l; \
asm ("movl %%gs:0,%0\n\t" \ asm ("movl %%gs:0,%0\n\t" \
@ -5,7 +7,7 @@
: "=r" (__l)); \ : "=r" (__l)); \
__l; }) __l; })
#ifdef PIC #if defined PIC && !__GNUC_PREREQ (5,0)
# define TLS_IE(x) \ # define TLS_IE(x) \
({ int *__l; \ ({ int *__l; \
asm ("movl %%gs:0,%0\n\t" \ asm ("movl %%gs:0,%0\n\t" \
@ -27,7 +29,7 @@
__l; }) __l; })
#endif #endif
#ifdef PIC #if defined PIC && !__GNUC_PREREQ (5,0)
# define TLS_LD(x) \ # define TLS_LD(x) \
({ int *__l, __c, __d; \ ({ int *__l, __c, __d; \
asm ("leal " #x "@tlsldm(%%ebx),%%eax\n\t" \ asm ("leal " #x "@tlsldm(%%ebx),%%eax\n\t" \
@ -51,7 +53,7 @@
__l; }) __l; })
#endif #endif
#ifdef PIC #if defined PIC && !__GNUC_PREREQ (5,0)
# define TLS_GD(x) \ # define TLS_GD(x) \
({ int *__l, __c, __d; \ ({ int *__l, __c, __d; \
asm ("leal " #x "@tlsgd(%%ebx),%%eax\n\t" \ asm ("leal " #x "@tlsgd(%%ebx),%%eax\n\t" \

2
sysdeps/unix/sysv/linux/i386/sysdep.h
View File

@ -502,7 +502,7 @@ asm (".L__X'%ebx = 1\n\t"
#endif #endif
/* Consistency check for position-independent code. */ /* Consistency check for position-independent code. */
#ifdef __PIC__ #if defined __PIC__ && !__GNUC_PREREQ (5,0)
# define check_consistency() \ # define check_consistency() \
({ int __res; \ ({ int __res; \
__asm__ __volatile__ \ __asm__ __volatile__ \