about summary refs log tree commit diff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2020-04-07 06:44:37 -0700
committerH.J. Lu <hjl.tools@gmail.com>2020-04-07 06:44:37 -0700
commit93a0959ef261c92b5d9c337f1e4cb64bbe453a9a (patch)
treeb8c00ba71001f784599d6596ad27c79544ad3489 /sysdeps/i386
parent10b2cdc3b3a9aab153e07bb7f8e1765dc3cd01fa (diff)
downloadglibc-93a0959ef261c92b5d9c337f1e4cb64bbe453a9a.tar.gz
glibc-93a0959ef261c92b5d9c337f1e4cb64bbe453a9a.tar.xz
glibc-93a0959ef261c92b5d9c337f1e4cb64bbe453a9a.zip
i386: Remove build support for GCC older than GCC 6
Since GCC 6.2 or later is required to build glibc, remove build support
for GCC older than GCC 6.

Testd with GCC 6.4 and GCC 9.3.

Reviewed-by: Adhemerval Zanella  <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/sysdep.h2
-rw-r--r--sysdeps/i386/tls-macros.h37
2 files changed, 3 insertions, 36 deletions
diff --git a/sysdeps/i386/sysdep.h b/sysdeps/i386/sysdep.h
index 6094af8fec..2f786a251b 100644
--- a/sysdeps/i386/sysdep.h
+++ b/sysdeps/i386/sysdep.h
@@ -18,8 +18,6 @@
 
 #include <sysdeps/x86/sysdep.h>
 
-#include <features.h> /* For __GNUC_PREREQ.  */
-
 /* It is desirable that the names of PIC thunks match those used by
    GCC so that multiple copies are eliminated by the linker.  Because
    GCC 4.6 and earlier use __i686 in the names, it is necessary to
diff --git a/sysdeps/i386/tls-macros.h b/sysdeps/i386/tls-macros.h
index 053cba05d1..9c1303dc45 100644
--- a/sysdeps/i386/tls-macros.h
+++ b/sysdeps/i386/tls-macros.h
@@ -1,5 +1,3 @@
-#include <features.h> /* For __GNUC_PREREQ.  */
-
 #define TLS_LE(x) \
   ({ int *__l;								      \
      asm ("movl %%gs:0,%0\n\t"						      \
@@ -7,15 +5,7 @@
 	  : "=r" (__l));						      \
      __l; })
 
-#if defined PIC && !__GNUC_PREREQ (5,0)
-# define TLS_IE(x) \
-  ({ int *__l;								      \
-     asm ("movl %%gs:0,%0\n\t"						      \
-	  "subl " #x "@gottpoff(%%ebx),%0"				      \
-	  : "=r" (__l));						      \
-     __l; })
-#else
-# define TLS_IE(x) \
+#define TLS_IE(x) \
   ({ int *__l, __b;							      \
      asm ("call 1f\n\t"							      \
 	  ".subsection 1\n"						      \
@@ -27,18 +17,8 @@
 	  "subl " #x "@gottpoff(%%ebx),%0"				      \
 	  : "=r" (__l), "=&b" (__b));					      \
      __l; })
-#endif
 
-#if defined PIC && !__GNUC_PREREQ (5,0)
-# define TLS_LD(x) \
-  ({ int *__l, __c, __d;						      \
-     asm ("leal " #x "@tlsldm(%%ebx),%%eax\n\t"				      \
-	  "call ___tls_get_addr@plt\n\t"				      \
-	  "leal " #x "@dtpoff(%%eax), %%eax"				      \
-	  : "=a" (__l), "=&c" (__c), "=&d" (__d));			      \
-     __l; })
-#else
-# define TLS_LD(x) \
+#define TLS_LD(x) \
   ({ int *__l, __b, __c, __d;						      \
      asm ("call 1f\n\t"							      \
 	  ".subsection 1\n"						      \
@@ -51,18 +31,8 @@
 	  "leal " #x "@dtpoff(%%eax), %%eax"				      \
 	  : "=a" (__l), "=&b" (__b), "=&c" (__c), "=&d" (__d));		      \
      __l; })
-#endif
 
-#if defined PIC && !__GNUC_PREREQ (5,0)
-# define TLS_GD(x) \
-  ({ int *__l, __c, __d;						      \
-     asm ("leal " #x "@tlsgd(%%ebx),%%eax\n\t"				      \
-	  "call ___tls_get_addr@plt\n\t"				      \
-	  "nop"								      \
-	  : "=a" (__l), "=&c" (__c), "=&d" (__d));			      \
-     __l; })
-#else
-# define TLS_GD(x) \
+#define TLS_GD(x) \
   ({ int *__l, __b, __c, __d;						      \
      asm ("call 1f\n\t"							      \
 	  ".subsection 1\n"						      \
@@ -75,4 +45,3 @@
 	  "nop"								      \
 	  : "=a" (__l), "=&b" (__b), "=&c" (__c), "=&d" (__d));		      \
      __l; })
-#endif