about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2003-05-17 17:55:27 +0000
committerAndreas Jaeger <aj@suse.de>2003-05-17 17:55:27 +0000
commit2384fe204b6de4a45402b48af89b2f01bdb08e73 (patch)
tree72f6fbdccef882ec322d10aff1ff1482b949c0f5
parent4bd2d98c7efa2772876a2f95bac5fe31f490e9ec (diff)
downloadglibc-2384fe204b6de4a45402b48af89b2f01bdb08e73.tar.gz
glibc-2384fe204b6de4a45402b48af89b2f01bdb08e73.tar.xz
glibc-2384fe204b6de4a45402b48af89b2f01bdb08e73.zip
Update.
	* sysdeps/unix/sysv/linux/x86_64/syscall.S: Revert last patch.
-rw-r--r--ChangeLog2
-rw-r--r--rt/tst-clock_nanosleep.c1
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/syscall.S30
3 files changed, 4 insertions, 29 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e4386dead..e2a9f39044 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-05-17  Andreas Jaeger  <aj@suse.de>
 
+	* sysdeps/unix/sysv/linux/x86_64/syscall.S: Revert last patch.
+
 	* rt/tst-clock_nanosleep.c: Include <time.h> for clock_nanosleep.
 
 2003-05-16  Ulrich Drepper  <drepper@redhat.com>
diff --git a/rt/tst-clock_nanosleep.c b/rt/tst-clock_nanosleep.c
index 005f00ef96..98a8b5f57c 100644
--- a/rt/tst-clock_nanosleep.c
+++ b/rt/tst-clock_nanosleep.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <sys/time.h>
+#include <time.h>
 
 
 /* Test that clock_nanosleep() does sleep.  */
diff --git a/sysdeps/unix/sysv/linux/x86_64/syscall.S b/sysdeps/unix/sysv/linux/x86_64/syscall.S
index 486583630d..262a917d13 100644
--- a/sysdeps/unix/sysv/linux/x86_64/syscall.S
+++ b/sysdeps/unix/sysv/linux/x86_64/syscall.S
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 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
@@ -28,7 +28,6 @@
 
 	.text
 ENTRY (syscall)
-.LFB1:
 	movq %rdi, %rax		/* Syscall number -> rax.  */
 	movq %rsi, %rdi		/* shift arg1 - arg5.  */
 	movq %rdx, %rsi
@@ -39,33 +38,6 @@ ENTRY (syscall)
 	cmpq $-4095, %rax	/* Check %rax for error.  */
 	jae SYSCALL_ERROR_LABEL	/* Jump to error handler if error.  */
 L(pseudo_end):
-.LFE1:
 	ret			/* Return to caller.  */
 
 PSEUDO_END (syscall)
-
-        .section        .eh_frame,"aw",@progbits
-.Lframe1:
-        .long   .LECIE1-.LSCIE1 # Length of Common Information Entry
-.LSCIE1:
-        .long   0x0     # CIE Identifier Tag
-        .byte   0x1     # CIE Version
-        .ascii "\0"     # CIE Augmentation
-        .uleb128 0x1    # CIE Code Alignment Factor
-        .sleb128 -8     # CIE Data Alignment Factor
-        .byte   0x10    # CIE RA Column
-        .byte   0xc     # DW_CFA_def_cfa
-        .uleb128 0x7
-        .uleb128 0x8
-        .byte   0x90    # DW_CFA_offset, column 0x10
-        .uleb128 0x1
-        .align 8
-.LECIE1:
-.LSFDE1:
-        .long   .LEFDE1-.LASFDE1        # FDE Length
-.LASFDE1:
-        .long   .LASFDE1-.Lframe1       # FDE CIE offset
-        .quad   .LFB1   # FDE initial location
-        .quad   .LFE1-.LFB1     # FDE address range
-        .align 8
-.LEFDE1: