Prefer https to http for gnu.org and fsf.org URLs

[thirdparty/glibc.git] / sysdeps / i386 / i686 / multiarch / memset-sse2.S

diff --git a/sysdeps/i386/i686/multiarch/memset-sse2.S b/sysdeps/i386/i686/multiarch/memset-sse2.S
index 5f142e74066e9ae103a981e0ce70d475d3a0f4dd..4dddcaa93aacd945094fc075cf57829a49f2a792 100644 (file)
--- a/sysdeps/i386/i686/multiarch/memset-sse2.S
+++ b/sysdeps/i386/i686/multiarch/memset-sse2.S
@@ -1,5 +1,5 @@
 /* memset with SSE2
-   Copyright (C) 2010, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2010-2019 Free Software Foundation, Inc.
    Contributed by Intel Corporation.
    This file is part of the GNU C Library.
 
@@ -14,11 +14,10 @@
    Lesser General Public License for more details.
 
    You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library; if not, write to the Free
-   Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
-   02111-1307 USA.  */
+   License along with the GNU C Library; if not, see
+   <https://www.gnu.org/licenses/>.  */
 
-#ifndef NOT_IN_libc
+#if IS_IN (libc)
 
 #include <sysdep.h>
 #include "asm-syntax.h"
@@ -45,7 +44,7 @@
 # define SETRTNVAL     movl DEST(%esp), %eax
 #endif
 
-#ifdef SHARED
+#ifdef PIC
 # define ENTRANCE      PUSH (%ebx);
 # define RETURN_END    POP (%ebx); ret
 # define RETURN                RETURN_END; CFI_PUSH (%ebx)
@@ -63,8 +62,8 @@
        absolute address.  */                                   \
     add                (%ebx,%ecx,4), %ebx;                            \
     add                %ecx, %edx;                                     \
-    /* We loaded the jump table and adjuested EDX. Go.  */     \
-    jmp                *%ebx
+    /* We loaded the jump table and adjusted EDX. Go.  */      \
+    _CET_NOTRACK jmp   *%ebx
 #else
 # define ENTRANCE
 # define RETURN_END    ret
@@ -76,11 +75,11 @@
    absolute offsets.  */
 # define BRANCH_TO_JMPTBL_ENTRY(TABLE)                         \
     add                %ecx, %edx;                                     \
-    jmp                *TABLE(,%ecx,4)
+    _CET_NOTRACK jmp *TABLE(,%ecx,4)
 #endif
 
        .section .text.sse2,"ax",@progbits
-#if defined SHARED && !defined NOT_IN_libc && !defined USE_AS_BZERO
+#if defined SHARED && IS_IN (libc) && !defined USE_AS_BZERO
 ENTRY (__memset_chk_sse2)
        movl    12(%esp), %eax
        cmpl    %eax, 16(%esp)
@@ -262,7 +261,7 @@ L(128bytesormore):
        PUSH (%ebx)
        mov     $SHARED_CACHE_SIZE, %ebx
 #else
-# ifdef SHARED
+# ifdef PIC
        SETUP_PIC_REG(bx)
        add     $_GLOBAL_OFFSET_TABLE_, %ebx
        mov     __x86_shared_cache_size@GOTOFF(%ebx), %ebx
@@ -280,7 +279,7 @@ L(128bytesormore):
 # define RESTORE_EBX_STATE CFI_PUSH (%ebx)
        cmp     $DATA_CACHE_SIZE, %ecx
 #else
-# ifdef SHARED
+# ifdef PIC
 #  define RESTORE_EBX_STATE
        SETUP_PIC_REG(bx)
        add     $_GLOBAL_OFFSET_TABLE_, %ebx
@@ -381,7 +380,7 @@ L(128bytesormore_nt):
        jae     L(128bytesormore_nt)
        sfence
 L(shared_cache_loop_end):
-#if defined DATA_CACHE_SIZE || !defined SHARED
+#if defined DATA_CACHE_SIZE || !defined PIC
        POP (%ebx)
 #endif
        BRANCH_TO_JMPTBL_ENTRY (L(table_16_128bytes))