| … | |
… | |
| 10161 | - long int tv_nsec; /* Nanoseconds. */ |
10161 | - long int tv_nsec; /* Nanoseconds. */ |
| 10162 | + __snseconds_t tv_nsec; /* Nanoseconds. */ |
10162 | + __snseconds_t tv_nsec; /* Nanoseconds. */ |
| 10163 | }; |
10163 | }; |
| 10164 | |
10164 | |
| 10165 | #endif /* timespec not defined and <time.h> or need timespec. */ |
10165 | #endif /* timespec not defined and <time.h> or need timespec. */ |
|
|
10166 | diff --git a/sysdeps/x86_64/strtok.S b/sysdeps/x86_64/strtok.S |
|
|
10167 | index 150f4d6..fe4a947 100644 |
|
|
10168 | --- a/sysdeps/x86_64/strtok.S |
|
|
10169 | +++ b/sysdeps/x86_64/strtok.S |
|
|
10170 | @@ -1,6 +1,6 @@ |
|
|
10171 | /* strtok (str, delim) -- Return next DELIM separated token from STR. |
|
|
10172 | For AMD x86-64. |
|
|
10173 | - Copyright (C) 1998,2000-2003,2005,2006 Free Software Foundation, Inc. |
|
|
10174 | + Copyright (C) 1998-2012 Free Software Foundation, Inc. |
|
|
10175 | This file is part of the GNU C Library. |
|
|
10176 | Based on i686 version contributed by Ulrich Drepper |
|
|
10177 | <drepper@cygnus.com>, 1998. |
|
|
10178 | @@ -45,9 +45,9 @@ |
|
|
10179 | .bss |
|
|
10180 | .local save_ptr |
|
|
10181 | ASM_TYPE_DIRECTIVE (save_ptr, @object) |
|
|
10182 | - .size save_ptr, 8 |
|
|
10183 | + .size save_ptr, LP_SIZE |
|
|
10184 | save_ptr: |
|
|
10185 | - .space 8 |
|
|
10186 | + .space LP_SIZE |
|
|
10187 | |
|
|
10188 | # ifdef PIC |
|
|
10189 | # define SAVE_PTR save_ptr(%rip) |
|
|
10190 | @@ -79,13 +79,12 @@ ENTRY (BP_SYM (FUNCTION)) |
|
|
10191 | |
|
|
10192 | #ifdef USE_AS_STRTOK_R |
|
|
10193 | /* The value is stored in the third argument. */ |
|
|
10194 | - movq %rdx, %rax |
|
|
10195 | - movq %rdx, %r9 /* Save value - see def. of SAVE_PTR. */ |
|
|
10196 | - movq (%rax), %rax |
|
|
10197 | + mov %RDX_LP, %R9_LP /* Save value - see def. of SAVE_PTR. */ |
|
|
10198 | + mov (%rdx), %RAX_LP |
|
|
10199 | #else |
|
|
10200 | /* The value is in the local variable defined above. But |
|
|
10201 | we have to take care for PIC code. */ |
|
|
10202 | - movq SAVE_PTR, %rax |
|
|
10203 | + mov SAVE_PTR, %RAX_LP |
|
|
10204 | #endif |
|
|
10205 | movq %r8, %rdx /* Get start of string. */ |
|
|
10206 | |
|
|
10207 | @@ -194,7 +193,7 @@ L(8): cmpq %rax, %rdx |
|
|
10208 | cmovne %rcx, %rdx |
|
|
10209 | |
|
|
10210 | /* Store the pointer to the next character. */ |
|
|
10211 | - movq %rdx, SAVE_PTR |
|
|
10212 | + mov %RDX_LP, SAVE_PTR |
|
|
10213 | |
|
|
10214 | L(epilogue): |
|
|
10215 | /* Remove the stopset table. */ |
|
|
10216 | @@ -205,7 +204,7 @@ L(epilogue): |
|
|
10217 | L(returnNULL): |
|
|
10218 | xorl %eax, %eax |
|
|
10219 | /* Store the pointer to the next character. */ |
|
|
10220 | - movq %rdx, SAVE_PTR |
|
|
10221 | + mov %RDX_LP, SAVE_PTR |
|
|
10222 | jmp L(epilogue) |
|
|
10223 | |
|
|
10224 | END (BP_SYM (FUNCTION)) |
Parent Directory
| 
Revision Log
| 
Patch