diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2020-02-01 05:44:55 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2020-02-01 05:44:55 -0800 |
| commit | 0455f251f494d30db4b52f11b5b0b7f285f775ef (patch) | |
| tree | d5dff22537a00b82c0e73286ec1cc959c8584367 | |
| parent | 825b58f3fb04781e559858510fe83a8c4bf28425 (diff) | |
| download | glibc-0455f251f494d30db4b52f11b5b0b7f285f775ef.tar.gz | |
i386: Use ENTRY/END in assembly codes
Use ENTRY and END in assembly codes so that ENDBR32 will be added at
function entries when CET is enabled.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
| -rw-r--r-- | sysdeps/i386/nptl/pthread_spin_lock.S | 8 | ||||
| -rw-r--r-- | sysdeps/i386/nptl/pthread_spin_unlock.S | 9 | ||||
| -rw-r--r-- | sysdeps/i386/pthread_spin_trylock.S | 8 |
3 files changed, 10 insertions, 15 deletions
diff --git a/sysdeps/i386/nptl/pthread_spin_lock.S b/sysdeps/i386/nptl/pthread_spin_lock.S index 5736c82078..10a2a73f02 100644 --- a/sysdeps/i386/nptl/pthread_spin_lock.S +++ b/sysdeps/i386/nptl/pthread_spin_lock.S @@ -15,12 +15,10 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <sysdep.h> #include <lowlevellock.h> - .globl pthread_spin_lock - .type pthread_spin_lock,@function - .align 16 -pthread_spin_lock: +ENTRY (pthread_spin_lock) mov 4(%esp), %eax 1: LOCK decl 0(%eax) @@ -34,4 +32,4 @@ pthread_spin_lock: cmpl $0, 0(%eax) jg 1b jmp 2b - .size pthread_spin_lock,.-pthread_spin_lock +END (pthread_spin_lock) diff --git a/sysdeps/i386/nptl/pthread_spin_unlock.S b/sysdeps/i386/nptl/pthread_spin_unlock.S index e7757d0a03..fe46f5ccb1 100644 --- a/sysdeps/i386/nptl/pthread_spin_unlock.S +++ b/sysdeps/i386/nptl/pthread_spin_unlock.S @@ -16,15 +16,14 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ - .globl pthread_spin_unlock - .type pthread_spin_unlock,@function - .align 16 -pthread_spin_unlock: +#include <sysdep.h> + +ENTRY (pthread_spin_unlock) movl 4(%esp), %eax movl $1, (%eax) xorl %eax, %eax ret - .size pthread_spin_unlock,.-pthread_spin_unlock +END (pthread_spin_unlock) /* The implementation of pthread_spin_init is identical. */ .globl pthread_spin_init diff --git a/sysdeps/i386/pthread_spin_trylock.S b/sysdeps/i386/pthread_spin_trylock.S index dd08d38f8d..949879c603 100644 --- a/sysdeps/i386/pthread_spin_trylock.S +++ b/sysdeps/i386/pthread_spin_trylock.S @@ -16,6 +16,7 @@ License along with the GNU C Library; if not, see <https://www.gnu.org/licenses/>. */ +#include <sysdep.h> #include <pthread-errnos.h> @@ -25,10 +26,7 @@ # define LOCK lock #endif - .globl pthread_spin_trylock - .type pthread_spin_trylock,@function - .align 16 -pthread_spin_trylock: +ENTRY (pthread_spin_trylock) movl 4(%esp), %edx movl $1, %eax xorl %ecx, %ecx @@ -43,4 +41,4 @@ pthread_spin_trylock: 0: #endif ret - .size pthread_spin_trylock,.-pthread_spin_trylock +END (pthread_spin_trylock) |