aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2007-01-26 20:05:16 +0000
committerUlrich Drepper <drepper@redhat.com>2007-01-26 20:05:16 +0000
commit14c8bf3b740a4aff08432200dad267072278a2b1 (patch)
tree9188e54cca6c5d4f8a4b077518e12052d958e321
parent1ad68780b74e666944fdade5d4fcc9156cf9c12e (diff)
downloadglibc-14c8bf3b740a4aff08432200dad267072278a2b1.tar
glibc-14c8bf3b740a4aff08432200dad267072278a2b1.tar.gz
glibc-14c8bf3b740a4aff08432200dad267072278a2b1.tar.bz2
glibc-14c8bf3b740a4aff08432200dad267072278a2b1.zip
* sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Use register
names not numbers in cfi_*. ADDR_LIMIT_3GB, PER_LINUX_32BIT, PER_LINUX32_3GB): Add.
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/i386/dl-trampoline.S18
2 files changed, 15 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index c4d2209d88..f97493c1a5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
+2007-01-26 Ulrich Drepper <drepper@redhat.com>
+
+ * sysdeps/i386/dl-trampoline.S (_dl_runtime_profile): Use register
+ names not numbers in cfi_*.
+
2007-01-26 Andreas Jaeger <aj@suse.de>
* sysdeps/unix/sysv/linux/sys/personality.h (ADDR_NO_RANDOMIZE,
- FDPIC_FUNCPTRS, ADDR_LIMIT_3GB, PER_LINUX_32BIT, PER_LINUX32_3GB):
- Add.
+ ADDR_LIMIT_3GB, PER_LINUX_32BIT, PER_LINUX32_3GB): Add.
Correct values of PER_HPUX and PER_OSF4.
2007-01-24 Ulrich Drepper <drepper@redhat.com>
diff --git a/sysdeps/i386/dl-trampoline.S b/sysdeps/i386/dl-trampoline.S
index fd87eb711d..f991797ee9 100644
--- a/sysdeps/i386/dl-trampoline.S
+++ b/sysdeps/i386/dl-trampoline.S
@@ -1,5 +1,5 @@
/* PLT trampolines. i386 version.
- Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+ Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -101,29 +101,29 @@ _dl_runtime_profile:
*/
cfi_adjust_cfa_offset (12)
1: movl %ebx, (%esp)
- cfi_rel_offset (3, 0)
+ cfi_rel_offset (ebx, 0)
movl %edx, %ebx # This is the frame buffer size
pushl %edi
cfi_adjust_cfa_offset (4)
- cfi_rel_offset (7, 0)
+ cfi_rel_offset (edi, 0)
pushl %esi
cfi_adjust_cfa_offset (4)
- cfi_rel_offset (6, 0)
+ cfi_rel_offset (esi, 0)
leal 44(%esp), %esi
movl %ebx, %ecx
movl %esp, %edi
subl %ebx, %edi
andl $0xfffffff0, %edi # Align stack
movl %esp, %ebx
- cfi_def_cfa_register (3)
+ cfi_def_cfa_register (ebx)
movl %edi, %esp
shrl $2, %ecx
rep
movsl
movl (%edi), %esi
- cfi_restore (6)
+ cfi_restore (esi)
movl 4(%edi), %edi
- cfi_restore (7)
+ cfi_restore (edi)
/*
%ebx+40 return address
%ebx+36 PLT1
@@ -144,9 +144,9 @@ _dl_runtime_profile:
movl 20(%ebx), %eax
call *(%ebx)
movl %ebx, %esp
- cfi_def_cfa_register (4)
+ cfi_def_cfa_register (esp)
movl 8(%esp), %ebx
- cfi_restore (3)
+ cfi_restore (ebx)
/*
+40 return address
+36 PLT1