From patchwork Thu May 28 09:12:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Weimer X-Patchwork-Id: 39373 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 23F9D3896C16; Thu, 28 May 2020 09:12:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 23F9D3896C16 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1590657142; bh=aIwv8lZpW9TatWRKZElBNkL64J+yX5ttk7OVWUgcOWM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=Y36uedb0roB56xy/lbPZkUU/0yvPud+iy9XZ62pejbLXJQAmlG8UOgiJVMhyu+eY0 pLWKB92QNjuKi+i2IXhk3gOyJuj+T1UcyfLsfLDdH5BMMsXGhZVMVJ7J3Z7CJkOaKL Y4n7Kp1Biml3P4c4ucKpHl9FZtRX3D9/3b+81KYI= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from us-smtp-delivery-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by sourceware.org (Postfix) with ESMTP id C3D08386F806 for ; Thu, 28 May 2020 09:12:19 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org C3D08386F806 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-479-0m8eV4-_MZinBrJ8quTOnA-1; Thu, 28 May 2020 05:12:17 -0400 X-MC-Unique: 0m8eV4-_MZinBrJ8quTOnA-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CAD3F107ACF2; Thu, 28 May 2020 09:12:16 +0000 (UTC) Received: from oldenburg2.str.redhat.com (ovpn-112-91.ams2.redhat.com [10.36.112.91]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E9D1610013C3; Thu, 28 May 2020 09:12:15 +0000 (UTC) To: libc-alpha@sourceware.org Subject: [PATCH] i386: Remove NO_TLS_DIRECT_SEG_REFS handling Date: Thu, 28 May 2020 11:12:14 +0200 Message-ID: <87zh9se841.fsf@oldenburg2.str.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.5 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Florian Weimer via Libc-alpha From: Florian Weimer Reply-To: Florian Weimer Cc: Andrew Cooper Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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