about summary refs log tree commit diff
path: root/sysdeps/i386/strtok.S
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
committerUlrich Drepper <drepper@redhat.com>2004-12-22 20:10:10 +0000
commita334319f6530564d22e775935d9c91663623a1b4 (patch)
treeb5877475619e4c938e98757d518bb1e9cbead751 /sysdeps/i386/strtok.S
parent0ecb606cb6cf65de1d9fc8a919bceb4be476c602 (diff)
downloadglibc-a334319f6530564d22e775935d9c91663623a1b4.tar.gz
glibc-a334319f6530564d22e775935d9c91663623a1b4.tar.xz
glibc-a334319f6530564d22e775935d9c91663623a1b4.zip
(CFLAGS-tst-align.c): Add -mpreferred-stack-boundary=4.
Diffstat (limited to 'sysdeps/i386/strtok.S')
-rw-r--r--sysdeps/i386/strtok.S77
1 files changed, 1 insertions, 76 deletions
diff --git a/sysdeps/i386/strtok.S b/sysdeps/i386/strtok.S
index c5f40a83b1..d2786e2ca4 100644
--- a/sysdeps/i386/strtok.S
+++ b/sysdeps/i386/strtok.S
@@ -1,6 +1,6 @@
 /* strtok (str, delim) -- Return next DELIM separated token from STR.
    For Intel 80x86, x>=3.
-   Copyright (C) 1996-1998,2000,2001,2005,2006 Free Software Foundation, Inc.
+   Copyright (C) 1996, 1997, 1998, 2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
 
@@ -78,13 +78,9 @@ ENTRY (BP_SYM (FUNCTION))
 
 #if !defined USE_AS_STRTOK_R && defined PIC
 	pushl %ebx			/* Save PIC register.  */
-	cfi_adjust_cfa_offset (4)
 	call L(here)
-	cfi_adjust_cfa_offset (4)
-	cfi_rel_offset (ebx, 0)
 L(here):
 	popl %ebx
-	cfi_adjust_cfa_offset (-4)
 	addl $_GLOBAL_OFFSET_TABLE_+[.-L(here)], %ebx
 #endif
 
@@ -129,133 +125,69 @@ L(1):
 	xorl %ecx, %ecx		/* %ecx = 0 !!! */
 
 	pushl %ecx		/* make a 256 bytes long block filled with 0 */
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl %ecx
-	cfi_adjust_cfa_offset (4)
 	pushl $0		/* These immediate values make the label 2 */
-	cfi_adjust_cfa_offset (4)
 	pushl $0		/* to be aligned on a 16 byte boundary to */
-	cfi_adjust_cfa_offset (4)
 	pushl $0		/* get a better performance of the loop.  */
-	cfi_adjust_cfa_offset (4)
 	pushl $0
-	cfi_adjust_cfa_offset (4)
 	pushl $0
-	cfi_adjust_cfa_offset (4)
 	pushl $0
-	cfi_adjust_cfa_offset (4)
 
 /* For understanding the following code remember that %ecx == 0 now.
    Although all the following instruction only modify %cl we always
@@ -352,7 +284,6 @@ L(9):	incl %edx
 
 L(8):	/* Remove the stopset table.  */
 	addl $256, %esp
-	cfi_adjust_cfa_offset (-256)
 
 	cmpl %eax, %edx
 	je L(returnNULL)	/* There was no token anymore.  */
@@ -377,18 +308,12 @@ L(11):
 L(epilogue):
 #if !defined USE_AS_STRTOK_R && defined PIC
 	popl %ebx
-	cfi_adjust_cfa_offset (-4)
-	cfi_restore (ebx)
 #endif
 	LEAVE
 	RET_PTR
 
 L(returnNULL):
 	xorl %eax, %eax
-#ifdef USE_AS_STRTOK_R
-	movl SAVE(%esp), %ecx
-#endif
-	movl %edx, SAVE_PTR
 	RETURN_NULL_BOUNDED_POINTER
 	jmp L(epilogue)