i386: Remove NO_TLS_DIRECT_SEG_REFS handling

This was needed for 32-bit PV Xen, which has been superseded by this
point according to Xen developers.

diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index c0a4fe15d47bff1cd9601d3109d4db2eb7a7170f..b9b1367f601acd18a106363069a8c256b11a7c17 100644 (file)
--- a/sysdeps/i386/Makefile
+++ b/sysdeps/i386/Makefile
@@ -33,10 +33,6 @@ else
 stack-align-test-flags += -malign-double
 endif
 
-ifneq (,$(filter -mno-tls-direct-seg-refs,$(CFLAGS)))
-defines += -DNO_TLS_DIRECT_SEG_REFS
-endif
-
 ifeq ($(subdir),elf)
 sysdep-dl-routines += tlsdesc dl-tlsdesc
 

diff --git a/sysdeps/i386/i686/multiarch/strcmp-sse4.S b/sysdeps/i386/i686/multiarch/strcmp-sse4.S
index 5454cba2e3a69b5090512f87c68ac50e8cf5b2e4..802609839a341d243ef74c1340caa6a93036c964 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strcmp-sse4.S
+++ b/sysdeps/i386/i686/multiarch/strcmp-sse4.S
@@ -101,19 +101,9 @@ ENTRY (__strcasecmp_sse4_2)
        PUSH    (%ebx)
        LOAD_PIC_REG(bx)
        movl    __libc_tsd_LOCALE@GOTNTPOFF(%ebx), %eax
-#  ifdef NO_TLS_DIRECT_SEG_REFS
-       addl    %gs:0, %eax
-       movl    (%eax), %eax
-#  else
        movl    %gs:(%eax), %eax
-#  endif
 # else
-#  ifdef NO_TLS_DIRECT_SEG_REFS
-       movl    %gs:0, %eax
-       movl    __libc_tsd_LOCALE@NTPOFF(%eax), %eax
-#  else
        movl    %gs:__libc_tsd_LOCALE@NTPOFF, %eax
-#  endif
 # endif
 # if LOCALE_T___LOCALES != 0 || LC_CTYPE != 0
        movl    LOCALE_T___LOCALES+LC_CTYPE*4(%eax), %eax
@@ -138,19 +128,9 @@ ENTRY (__strncasecmp_sse4_2)
        PUSH    (%ebx)
        LOAD_PIC_REG(bx)
        movl    __libc_tsd_LOCALE@GOTNTPOFF(%ebx), %eax
-#  ifdef NO_TLS_DIRECT_SEG_REFS
-       addl    %gs:0, %eax
-       movl    (%eax), %eax
-#  else
        movl    %gs:(%eax), %eax
-#  endif
 # else
-#  ifdef NO_TLS_DIRECT_SEG_REFS
-       movl    %gs:0, %eax
-       movl    __libc_tsd_LOCALE@NTPOFF(%eax), %eax
-#  else
        movl    %gs:__libc_tsd_LOCALE@NTPOFF, %eax
-#  endif
 # endif
 # if LOCALE_T___LOCALES != 0 || LC_CTYPE != 0
        movl    LOCALE_T___LOCALES+LC_CTYPE*4(%eax), %eax

diff --git a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
index 8e830dec6f0decaceff495b61ee001d346c7a289..1b9d53c1fe84937e8552e062028f051aa07ebf51 100644 (file)
--- a/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
+++ b/sysdeps/i386/i686/multiarch/strcmp-ssse3.S
@@ -118,19 +118,9 @@ ENTRY (__strcasecmp_ssse3)
        PUSH    (%ebx)
        LOAD_PIC_REG(bx)
        movl    __libc_tsd_LOCALE@GOTNTPOFF(%ebx), %eax
-#  ifdef NO_TLS_DIRECT_SEG_REFS
-       addl    %gs:0, %eax
-       movl    (%eax), %eax
-#  else
        movl    %gs:(%eax), %eax
-#  endif
 # else
-#  ifdef NO_TLS_DIRECT_SEG_REFS
-       movl    %gs:0, %eax
-       movl    __libc_tsd_LOCALE@NTPOFF(%eax), %eax
-#  else
        movl    %gs:__libc_tsd_LOCALE@NTPOFF, %eax
-#  endif
 # endif
 # if LOCALE_T___LOCALES != 0 || LC_CTYPE != 0
        movl    LOCALE_T___LOCALES+LC_CTYPE*4(%eax), %eax
@@ -155,19 +145,9 @@ ENTRY (__strncasecmp_ssse3)
        PUSH    (%ebx)
        LOAD_PIC_REG(bx)
        movl    __libc_tsd_LOCALE@GOTNTPOFF(%ebx), %eax
-#  ifdef NO_TLS_DIRECT_SEG_REFS
-       addl    %gs:0, %eax
-       movl    (%eax), %eax
-#  else
        movl    %gs:(%eax), %eax
-#  endif
 # else
-#  ifdef NO_TLS_DIRECT_SEG_REFS
-       movl    %gs:0, %eax
-       movl    __libc_tsd_LOCALE@NTPOFF(%eax), %eax
-#  else
        movl    %gs:__libc_tsd_LOCALE@NTPOFF, %eax
-#  endif
 # endif
 # if LOCALE_T___LOCALES != 0 || LC_CTYPE != 0
        movl    LOCALE_T___LOCALES+LC_CTYPE*4(%eax), %eax