Remove branch prediction suffix for conditional jumps.

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
index 223b111..88885b7 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/libc-lowlevellock.S
@@ -22,7 +22,7 @@
 #ifndef UP
 # define LOCK \
        cmpl    $0, %gs:MULTIPLE_THREADS_OFFSET;                              \
-       je,pt   0f;                                                           \
+       je      0f;                                                           \
        lock;                                                                 \
 0:
 #endif

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
index dc65b70..ae6ce94 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/lowlevellock.S
@@ -60,7 +60,7 @@ __lll_mutex_lock_wait:
        xchgl   %eax, (%ebx)    /* NB:   lock is implied */
 
        testl   %eax, %eax
-       jnz,pn  1b
+       jnz     1b
 
        popl    %esi
        popl    %ebx

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
index 114284c..fe7a8b9 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_barrier_wait.S
@@ -82,7 +82,7 @@ pthread_barrier_wait:
 #else
        cmpl    %edx, CURR_EVENT(%ebx)
 #endif
-       je,pn   8b
+       je      8b
 
        /* Increment LEFT.  If this brings the count back to the
           initial count unlock the object.  */
@@ -92,7 +92,7 @@ pthread_barrier_wait:
        xaddl   %edx, LEFT(%ebx)
        subl    $1, %ecx
        cmpl    %ecx, %edx
-       jne,pt  10f
+       jne     10f
 
        /* Release the mutex.  We cannot release the lock before
           waking the waiting threads since otherwise a new thread might
@@ -131,7 +131,7 @@ pthread_barrier_wait:
        xaddl   %edx, LEFT(%ebx)
        subl    $1, %ecx
        cmpl    %ecx, %edx
-       jne,pt  5f
+       jne     5f
 
        /* Release the mutex.  We cannot release the lock before
           waking the waiting threads since otherwise a new thread might

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
index 318b53a..aa1f9f4 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_timedwait.S
@@ -49,12 +49,12 @@ sem_timedwait:
 
        movl    (%ecx), %eax
 2:     testl   %eax, %eax
-       je,pn   1f
+       je      1f
 
        leal    -1(%eax), %edx
        LOCK
        cmpxchgl %edx, (%ecx)
-       jne,pn  2b
+       jne     2b
 
        xorl    %eax, %eax
        ret
@@ -117,7 +117,7 @@ sem_timedwait:
        call    __pthread_disable_asynccancel
 
        testl   %esi, %esi
-       je,pt   9f
+       je      9f
        cmpl    $-EWOULDBLOCK, %esi
        jne     3f
 
@@ -128,7 +128,7 @@ sem_timedwait:
        leal    -1(%eax), %ecx
        LOCK
        cmpxchgl %ecx, (%ebx)
-       jne,pn  8b
+       jne     8b
 
        addl    $12, %esp
        cfi_adjust_cfa_offset(-12)

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
index d36a108..fbc3b3c 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_trywait.S
@@ -42,7 +42,7 @@ __new_sem_trywait:
        leal    -1(%eax), %edx
        LOCK
        cmpxchgl %edx, (%ecx)
-       jne,pn  2b
+       jne     2b
        xorl    %eax, %eax
        ret
 

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
index 3e908ae..b129627 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
+++ b/nptl/sysdeps/unix/sysv/linux/i386/i486/sem_wait.S
@@ -62,7 +62,7 @@ __new_sem_wait:
        leal    -1(%eax), %edx
        LOCK
        cmpxchgl %edx, (%ebx)
-       jne,pn  2b
+       jne     2b
        xorl    %eax, %eax
 
        movl    4(%esp), %esi

diff --git a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
index afdba00..639f6a0 100644 (file)
--- a/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
+++ b/nptl/sysdeps/unix/sysv/linux/i386/lowlevellock.h
@@ -384,7 +384,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
 # define lll_trylock(futex) \
   ({ unsigned char ret;                                                              \
      __asm __volatile ("cmpl $0, %%gs:%P5\n\t"                               \
-                      "je,pt 0f\n\t"                                         \
+                      "je 0f\n\t"                                            \
                       "lock\n"                                               \
                       "0:\tcmpxchgl %2, %1; setne %0"                        \
                       : "=a" (ret), "=m" (futex)                             \
@@ -398,7 +398,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
 # define lll_lock(futex) \
   (void) ({ int ignore1, ignore2;                                            \
            __asm __volatile ("cmpl $0, %%gs:%P6\n\t"                         \
-                             "je,pt 0f\n\t"                                  \
+                             "je 0f\n\t"                                     \
                              "lock\n"                                        \
                              "0:\tcmpxchgl %1, %2\n\t"                       \
                              "jnz _L_mutex_lock_%=\n\t"                      \
@@ -420,7 +420,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
 # define lll_unlock(futex) \
   (void) ({ int ignore;                                                              \
             __asm __volatile ("cmpl $0, %%gs:%P3\n\t"                        \
-                             "je,pt 0f\n\t"                                  \
+                             "je 0f\n\t"                                     \
                              "lock\n"                                        \
                              "0:\tsubl $1,%0\n\t"                    \
                              "jne _L_mutex_unlock_%=\n\t"                    \
@@ -459,7 +459,7 @@ extern int lll_unlock_wake_cb (int *__futex) attribute_hidden;
                        "1:\tmovl %1, %%eax\n\t"                              \
                        LLL_ENTER_KERNEL                                      \
                        "cmpl $0, (%%ebx)\n\t"                                \
-                       "jne,pn 1b\n\t"                                       \
+                       "jne 1b\n\t"                                          \
                        LLL_EBX_LOAD                                          \
                        : "=&a" (__ignore)                                    \
                        : "i" (SYS_futex), LLL_EBX_REG (&tid), "S" (0),       \