* sysdeps/i386/dl-trampoline.S (_dl_runtime_resolve): Avoid

	implicit atomic operation when storing function pointer.
	(_dl_runtime_profile): Likewise.

diff --git a/ChangeLog b/ChangeLog
index f02bd4b9985aede9995a66298cac4adb7f071ce0..58df8983d01523777cffae896f864366e52c7cae 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-23  Ulrich Drepper  <drepper@redhat.com>
+
+       * sysdeps/i386/dl-trampoline.S (_dl_runtime_resolve): Avoid
+       implicit atomic operation when storing function pointer.
+       (_dl_runtime_profile): Likewise.
+
 2007-08-17  Jakub Jelinek  <jakub@redhat.com>
 
        * nis/nis_table.c (nis_list): Don't fail if __follow_path returned

diff --git a/sysdeps/i386/dl-trampoline.S b/sysdeps/i386/dl-trampoline.S
index f991797ee924b0fb8fde94215c0620360ee3d9d8..5856a2f8a0834e27fdc7756c6dbb7f198d489691 100644 (file)
--- a/sysdeps/i386/dl-trampoline.S
+++ b/sysdeps/i386/dl-trampoline.S
@@ -37,10 +37,10 @@ _dl_runtime_resolve:
        call _dl_fixup          # Call resolver.
        popl %edx               # Get register content back.
        cfi_adjust_cfa_offset (-4)
-       popl %ecx
-       cfi_adjust_cfa_offset (-4)
-       xchgl %eax, (%esp)      # Get %eax contents end store function address.
-       ret $8                  # Jump to function address.
+       movl (%esp), %ecx
+       movl %eax, (%esp)       # Store the function address.
+       movl 4(%esp), %eax
+       ret $12                 # Jump to function address.
        cfi_endproc
        .size _dl_runtime_resolve, .-_dl_runtime_resolve
 
@@ -83,10 +83,10 @@ _dl_runtime_profile:
        cfi_adjust_cfa_offset (-4)
        popl %edx               # Get register content back.
        cfi_adjust_cfa_offset (-4)
-       popl %ecx
-       cfi_adjust_cfa_offset (-4)
-       xchgl %eax, (%esp)      # Get %eax contents end store function address.
-       ret $16                 # Jump to function address.
+       movl (%esp), %ecx
+       movl %eax, (%esp)       # Store the function address.
+       movl 4(%esp), %eax
+       ret $20                 # Jump to function address.
 
        /*
            +32     return address