This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PING] [PATCH] i686: Fix test suite fails on build by gcc 5.0
- From: "H.J. Lu" <hjl dot tools at gmail dot com>
- To: "Senkevich, Andrew" <andrew dot senkevich at intel dot com>
- Cc: libc-alpha <libc-alpha at sourceware dot org>, Andrew Senkevich <andrew dot n dot senkevich at gmail dot com>
- Date: Tue, 30 Dec 2014 11:38:20 -0800
- Subject: Re: [PING] [PATCH] i686: Fix test suite fails on build by gcc 5.0
- Authentication-results: sourceware.org; auth=none
- References: <CAMXFM3sUZH-SF=q_JnjTF6VpJa2f=WVX5-Q8LGLKx=Nqqc5r0A at mail dot gmail dot com> <D373487E0338A646909492FF43BA8BE329748AC1 at CDSMSX102 dot ccr dot corp dot intel dot com> <CAMe9rOqPop2+zYkZJ0YGf849=3VaU1bz9h_M5nw2H0wY4VD-3g at mail dot gmail dot com>
On Tue, Dec 30, 2014 at 10:31 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
> On Mon, Dec 29, 2014 at 5:45 AM, Senkevich, Andrew
> <andrew.senkevich@intel.com> wrote:
>> 2014-11-27 20:23 GMT+03:00 H.J. Lu <hjl.tools@gmail.com>:
>>> We should also undef SETUP_PIC_REG_STR and LOAD_PIC_REG_STR in
>>> sysdeps/i386/sysdep.h for GCC 5, which are defined for C sources and
>>> will be wrong for GCC 5.
>>
>> Attached patch formatted for git am.
>>
>> ChangeLog:
>>
>> 2014-12-29 Andrew Senkevich <andrew.senkevich@intel.com>
>>
>> * sysdeps/i386/tls-macros.h (TLS_IE, TLS_LD, TLS_GD): Keep define in
>> PIC mode only if gcc version < 5.0
>> * sysdeps/i386/sysdep.h (SETUP_PIC_REG_STR, LOAD_PIC_REG_STR): Keep
>> define only if gcc version < 5.0
>
> Do we really need to change SETUP_PIC_REG_STR and
> LOAD_PIC_REG_STR? SETUP_PIC_REG_STR is only used
> in LOAD_PIC_REG_STR and LOAD_PIC_REG_STR is only used
> in check_consistency. I think check_consistency change is
> sufficient.
>
>> * sysdeps/unix/sysv/linux/i386/sysdep.h (check_consistency): Likewise.
>>
>> Is it Ok?
>>
This is the patch I checked in.
Thanks.
--
H.J.
---
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.
From f3a36d9328f5c32945cbda64375df237a359dcd9 Mon Sep 17 00:00:00 2001
From: Andrew Senkevich <andrew.senkevich@intel.com>
Date: Tue, 30 Dec 2014 11:34:53 -0800
Subject: [PATCH] i386: Fix build by GCC 5.0
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.
---
ChangeLog | 10 ++++++++++
sysdeps/i386/tls-macros.h | 8 +++++---
sysdeps/unix/sysv/linux/i386/sysdep.h | 2 +-
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 5780c3a..ac8bbf3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 Joseph Myers <joseph@codesourcery.com>
[BZ #17723]
diff --git a/sysdeps/i386/tls-macros.h b/sysdeps/i386/tls-macros.h
index 0b85738..053cba0 100644
--- a/sysdeps/i386/tls-macros.h
+++ b/sysdeps/i386/tls-macros.h
@@ -1,3 +1,5 @@
+#include <features.h> /* For __GNUC_PREREQ. */
+
#define TLS_LE(x) \
({ int *__l; \
asm ("movl %%gs:0,%0\n\t" \
@@ -5,7 +7,7 @@
: "=r" (__l)); \
__l; })
-#ifdef PIC
+#if defined PIC && !__GNUC_PREREQ (5,0)
# define TLS_IE(x) \
({ int *__l; \
asm ("movl %%gs:0,%0\n\t" \
@@ -27,7 +29,7 @@
__l; })
#endif
-#ifdef PIC
+#if defined PIC && !__GNUC_PREREQ (5,0)
# define TLS_LD(x) \
({ int *__l, __c, __d; \
asm ("leal " #x "@tlsldm(%%ebx),%%eax\n\t" \
@@ -51,7 +53,7 @@
__l; })
#endif
-#ifdef PIC
+#if defined PIC && !__GNUC_PREREQ (5,0)
# define TLS_GD(x) \
({ int *__l, __c, __d; \
asm ("leal " #x "@tlsgd(%%ebx),%%eax\n\t" \
diff --git a/sysdeps/unix/sysv/linux/i386/sysdep.h b/sysdeps/unix/sysv/linux/i386/sysdep.h
index d751c58..b574418 100644
--- a/sysdeps/unix/sysv/linux/i386/sysdep.h
+++ b/sysdeps/unix/sysv/linux/i386/sysdep.h
@@ -502,7 +502,7 @@ asm (".L__X'%ebx = 1\n\t"
#endif
/* Consistency check for position-independent code. */
-#ifdef __PIC__
+#if defined __PIC__ && !__GNUC_PREREQ (5,0)
# define check_consistency() \
({ int __res; \
__asm__ __volatile__ \
--
1.9.3