diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1998-04-03 12:07:01 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1998-04-03 12:07:01 +0000 |
| commit | ecdd1a316035312a0565a64011520819ff36ae11 (patch) | |
| tree | 592feec09cb2886c1f5420472e36d06aaaf531b3 /sysdeps/i386 | |
| parent | cab24c3767986d0c4c336634756b4de5aee3a797 (diff) | |
| download | glibc-ecdd1a316035312a0565a64011520819ff36ae11.tar.gz glibc-ecdd1a316035312a0565a64011520819ff36ae11.tar.xz glibc-ecdd1a316035312a0565a64011520819ff36ae11.zip | |
Update.
1998-04-03 16:29 Philip Blundell <pb@nexus.co.uk> Based on patch from Pat Beirne: * sysdeps/unix/sysv/linux/arm/sysdep.S (__syscall_error): Same for PIC and non-PIC now. Correctly negate error number. (errno): Use `%' not `@' in .type directives. 1998-04-03 Ulrich Drepper <drepper@cygnus.com> * sysdeps/i386/strtok.S: Change to use single exit point. * sysdeps/i386/i686/strtok.S: Likewise.
Diffstat (limited to 'sysdeps/i386')
| -rw-r--r-- | sysdeps/i386/i686/strtok.S | 16 | ||||
| -rw-r--r-- | sysdeps/i386/strtok.S | 18 |
2 files changed, 5 insertions, 29 deletions
diff --git a/sysdeps/i386/i686/strtok.S b/sysdeps/i386/i686/strtok.S index 62d54c4e1a..c7a058eb41 100644 --- a/sysdeps/i386/i686/strtok.S +++ b/sysdeps/i386/i686/strtok.S @@ -207,6 +207,7 @@ L(8): /* Remove the stopset table. */ leal 1(%edx), %ecx cmovne %ecx, %edx +L(return): /* Store the pointer to the next character. */ #ifdef USE_AS_STRTOK_R movl 12(%esp), %ecx @@ -223,18 +224,5 @@ L(8): /* Remove the stopset table. */ L(returnNULL): xorl %eax, %eax - - /* Store current pointer for next round. */ -#ifdef USE_AS_STRTOK_R - movl 12(%esp), %ecx - movl %edx, (%ecx) -#else -# ifndef PIC - movl %edx, save_ptr -# else - movl %edx, save_ptr@GOTOFF(%ebx) - popl %ebx -# endif -#endif - ret + jmp L(return) END (FUNCTION) diff --git a/sysdeps/i386/strtok.S b/sysdeps/i386/strtok.S index 3d09dd7406..c6469e8ecf 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, 1997 Free Software Foundation, Inc. + Copyright (C) 1996, 1997, 1998 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. @@ -254,6 +254,7 @@ L(8): /* Remove the stopset table. */ incl %edx L(11): +L(return): /* Store the pointer to the next character. */ #ifdef USE_AS_STRTOK_R movl 12(%esp), %ecx @@ -270,18 +271,5 @@ L(11): L(returnNULL): xorl %eax, %eax - - /* Store current pointer for next round. */ -#ifdef USE_AS_STRTOK_R - movl 12(%esp), %ecx - movl %edx, (%ecx) -#else -# ifndef PIC - movl %edx, save_ptr -# else - movl %edx, save_ptr@GOTOFF(%ebx) - popl %ebx -# endif -#endif - ret + jmp L(return) END (FUNCTION) |