aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/gettimeofday.S4
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/time.S5
-rw-r--r--sysdeps/x86_64/strtok.S4
4 files changed, 17 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 76c28bf5dd..0dbe72a6be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2003-05-22 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/unix/sysv/linux/x86_64/gettimeofday.S: Add CFI
+ directives.
+ * sysdeps/unix/sysv/linux/x86_64/time.S: Likewise.
+ * sysdeps/x86_64/strtok.S: Likewise.
+
2003-05-20 Guido Guenther <agx@sigxcpu.org>
* sysdeps/unix/sysv/linux/mips/bits/siginfo.h: Change SI_ASYNCNL
diff --git a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.S b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.S
index 3f1615579c..84a99b0406 100644
--- a/sysdeps/unix/sysv/linux/x86_64/gettimeofday.S
+++ b/sysdeps/unix/sysv/linux/x86_64/gettimeofday.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2002 Free Software Foundation, Inc.
+/* Copyright (C) 2002, 2003 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
@@ -27,6 +27,7 @@
ENTRY (__gettimeofday)
/* Align stack. */
sub $0x8, %rsp
+ cfi_adjust_cfa_offset(8)
movq $VSYSCALL_ADDR_vgettimeofday, %rax
callq *%rax
/* Check error return. */
@@ -35,6 +36,7 @@ ENTRY (__gettimeofday)
L(pseudo_end):
add $0x8, %rsp
+ cfi_adjust_cfa_offset(-8)
ret
PSEUDO_END(__gettimeofday)
diff --git a/sysdeps/unix/sysv/linux/x86_64/time.S b/sysdeps/unix/sysv/linux/x86_64/time.S
index 78efee1853..55d5a00f94 100644
--- a/sysdeps/unix/sysv/linux/x86_64/time.S
+++ b/sysdeps/unix/sysv/linux/x86_64/time.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001,02 Free Software Foundation, Inc.
+/* Copyright (C) 2001,02, 2003 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
@@ -30,6 +30,8 @@
ENTRY (time)
/* Align stack. */
sub $0x8, %rsp
+ cfi_adjust_cfa_offset(8)
+
movq $VSYSCALL_ADDR_vtime, %rax
callq *%rax
/* Check error return. */
@@ -38,6 +40,7 @@ ENTRY (time)
L(pseudo_end):
add $0x8, %rsp
+ cfi_adjust_cfa_offset(-8)
ret
PSEUDO_END(time)
libc_hidden_def (time)
diff --git a/sysdeps/x86_64/strtok.S b/sysdeps/x86_64/strtok.S
index 771bd2d0e3..5d0cbef2e5 100644
--- a/sysdeps/x86_64/strtok.S
+++ b/sysdeps/x86_64/strtok.S
@@ -1,6 +1,6 @@
/* strtok (str, delim) -- Return next DELIM separated token from STR.
For AMD x86-64.
- Copyright (C) 1998, 2000, 2001, 2002 Free Software Foundation, Inc.
+ Copyright (C) 1998,2000,2001,2002,2003 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Based on i686 version contributed by Ulrich Drepper
<drepper@cygnus.com>, 1998.
@@ -68,6 +68,7 @@ ENTRY (BP_SYM (FUNCTION))
table. */
movq %rdi, %r8 /* Save value. */
subq $256, %rsp /* Make space for 256 bytes. */
+ cfi_adjust_cfa_offset(256)
movq $32, %rcx /* 32*8 bytes = 256 bytes. */
movq %rsp, %rdi
xorq %rax, %rax /* We store 0s. */
@@ -199,6 +200,7 @@ L(8): cmpq %rax, %rdx
L(epilogue):
/* Remove the stopset table. */
addq $256, %rsp
+ cfi_adjust_cfa_offset(-256)
retq
L(returnNULL):