From: Florian Weimer via Libc-alpha <libc-alpha@sourceware.org>
To: libc-alpha@sourceware.org
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: [PATCH] i386: Remove NO_TLS_DIRECT_SEG_REFS handling
Date: Thu, 28 May 2020 11:12:14 +0200 [thread overview]
Message-ID: <87zh9se841.fsf@oldenburg2.str.redhat.com> (raw)
This was needed for 32-bit PV Xen, which has been superseded by this
point according to Xen developers.
---
sysdeps/i386/Makefile | 4 ----
sysdeps/i386/i686/multiarch/strcmp-sse4.S | 20 --------------------
sysdeps/i386/i686/multiarch/strcmp-ssse3.S | 20 --------------------
3 files changed, 44 deletions(-)
diff --git a/sysdeps/i386/Makefile b/sysdeps/i386/Makefile
index c0a4fe15d4..b9b1367f60 100644
--- 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 5454cba2e3..802609839a 100644
--- 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 8e830dec6f..1b9d53c1fe 100644
--- 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
next reply other threads:[~2020-05-28 9:12 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-28 9:12 Florian Weimer via Libc-alpha [this message]
2020-05-28 9:46 ` [PATCH] i386: Remove NO_TLS_DIRECT_SEG_REFS handling Andreas Schwab
2020-05-28 11:41 ` Andrew Cooper via Libc-alpha
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87zh9se841.fsf@oldenburg2.str.redhat.com \
--to=libc-alpha@sourceware.org \
--cc=andrew.cooper3@citrix.com \
--cc=fweimer@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).