aboutsummaryrefslogtreecommitdiff
path: root/sysdeps/i386
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-06-01 01:32:04 +0000
committerUlrich Drepper <drepper@redhat.com>2003-06-01 01:32:04 +0000
commit06e2e0a747504a9cce34fa851e7afac2dc8efe42 (patch)
tree39e709620557418f0dca0a0626da98a6edac14d8 /sysdeps/i386
parentb6da933bfb2afb240b4a360974533ab3fdf2b0f3 (diff)
downloadglibc-06e2e0a747504a9cce34fa851e7afac2dc8efe42.tar
glibc-06e2e0a747504a9cce34fa851e7afac2dc8efe42.tar.gz
glibc-06e2e0a747504a9cce34fa851e7afac2dc8efe42.tar.bz2
glibc-06e2e0a747504a9cce34fa851e7afac2dc8efe42.zip
Update.
2003-05-31 Jakub Jelinek <jakub@redhat.com> * sysdeps/powerpc/powerpc64/dl-machine.h (elf_machine_plt_conflict): New function. (elf_machine_rela) <case R_PPC64_JMP_SLOT>: Avoid RESOLVE_CONFLICT_FIND_MAP. If RESOLVE_CONFLICT_FIND_MAP is defined, call elf_machine_plt_conflict instead of elf_machine_fixup_plt. * sysdeps/i386/dl-machine.h (ELF_MACHINE_RUNTIME_TRAMPOLINE): Add CFI directives. * csu/Makefile: Fix Makefile warnings regarding Scrt1.o.
Diffstat (limited to 'sysdeps/i386')
-rw-r--r--sysdeps/i386/dl-machine.h28
1 files changed, 28 insertions, 0 deletions
diff --git a/sysdeps/i386/dl-machine.h b/sysdeps/i386/dl-machine.h
index 07c880a160..00b99957f3 100644
--- a/sysdeps/i386/dl-machine.h
+++ b/sysdeps/i386/dl-machine.h
@@ -168,35 +168,51 @@ static ElfW(Addr) profile_fixup (struct link_map *l, ElfW(Word) reloc_offset,
.text\n\
.globl _dl_runtime_resolve\n\
.type _dl_runtime_resolve, @function\n\
+ " CFI_STARTPROC "\n\
.align 16\n\
_dl_runtime_resolve:\n\
+ " CFI_ADJUST_CFA_OFFSET (8) "\n\
pushl %eax # Preserve registers otherwise clobbered.\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
pushl %ecx\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
pushl %edx\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
movl 16(%esp), %edx # Copy args pushed by PLT in register. Note\n\
movl 12(%esp), %eax # that `fixup' takes its parameters in regs.\n\
call fixup # Call resolver.\n\
popl %edx # Get register content back.\n\
+ " CFI_ADJUST_CFA_OFFSET (-4) "\n\
popl %ecx\n\
+ " CFI_ADJUST_CFA_OFFSET (-4) "\n\
xchgl %eax, (%esp) # Get %eax contents end store function address.\n\
ret $8 # Jump to function address.\n\
+ " CFI_ENDPROC "\n\
.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
\n\
.globl _dl_runtime_profile\n\
.type _dl_runtime_profile, @function\n\
+ " CFI_STARTPROC "\n\
.align 16\n\
_dl_runtime_profile:\n\
+ " CFI_ADJUST_CFA_OFFSET (8) "\n\
pushl %eax # Preserve registers otherwise clobbered.\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
pushl %ecx\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
pushl %edx\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
movl 20(%esp), %ecx # Load return address\n\
movl 16(%esp), %edx # Copy args pushed by PLT in register. Note\n\
movl 12(%esp), %eax # that `fixup' takes its parameters in regs.\n\
call profile_fixup # Call resolver.\n\
popl %edx # Get register content back.\n\
+ " CFI_ADJUST_CFA_OFFSET (-4) "\n\
popl %ecx\n\
+ " CFI_ADJUST_CFA_OFFSET (-4) "\n\
xchgl %eax, (%esp) # Get %eax contents end store function address.\n\
ret $8 # Jump to function address.\n\
+ " CFI_ENDPROC "\n\
.size _dl_runtime_profile, .-_dl_runtime_profile\n\
.previous\n\
");
@@ -207,23 +223,35 @@ _dl_runtime_profile:\n\
.globl _dl_runtime_profile\n\
.type _dl_runtime_resolve, @function\n\
.type _dl_runtime_profile, @function\n\
+ " CFI_STARTPROC "\n\
.align 16\n\
_dl_runtime_resolve:\n\
_dl_runtime_profile:\n\
+ " CFI_ADJUST_CFA_OFFSET (8) "\n\
pushl %eax # Preserve registers otherwise clobbered.\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
pushl %ecx\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
pushl %edx\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
movl 16(%esp), %edx # Push the arguments for `fixup'\n\
movl 12(%esp), %eax\n\
pushl %edx\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
pushl %eax\n\
+ " CFI_ADJUST_CFA_OFFSET (4) "\n\
call fixup # Call resolver.\n\
popl %edx # Pop the parameters\n\
+ " CFI_ADJUST_CFA_OFFSET (-4) "\n\
popl %ecx\n\
+ " CFI_ADJUST_CFA_OFFSET (-4) "\n\
popl %edx # Get register content back.\n\
+ " CFI_ADJUST_CFA_OFFSET (-4) "\n\
popl %ecx\n\
+ " CFI_ADJUST_CFA_OFFSET (-4) "\n\
xchgl %eax, (%esp) # Get %eax contents end store function address.\n\
ret $8 # Jump to function address.\n\
+ " CFI_ENDPROC "\n\
.size _dl_runtime_resolve, .-_dl_runtime_resolve\n\
.size _dl_runtime_profile, .-_dl_runtime_profile\n\
.previous\n\