diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-05-23 06:48:05 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-05-23 06:48:05 -0700 |
| commit | 1c87aba0f2949199382c193ae584fa034b49a0db (patch) | |
| tree | cd0d9a2053b410751c549065d0a1359adac032b9 | |
| parent | c26705334c4f46420fff2d2cad4f3f37b51d7db6 (diff) | |
| download | glibc-1c87aba0f2949199382c193ae584fa034b49a0db.tar.gz glibc-1c87aba0f2949199382c193ae584fa034b49a0db.tar.xz glibc-1c87aba0f2949199382c193ae584fa034b49a0db.zip | |
Fix x32 sched_getcpu.S error code
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S | 12 |
2 files changed, 14 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 87dc911397..14f37cf9bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-05-23 H.J. Lu <hongjiu.lu@intel.com> + + * sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S: Rearrange + code so that pseudo_end is just ret and the stack pointer is + correct also for static library in error case. + 2012-05-23 Joseph Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/powerpc/chown.c: Add comment suggesting diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S b/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S index f3ba9f1c9f..789552ebbb 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S +++ b/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S @@ -33,14 +33,18 @@ ENTRY (sched_getcpu) call __getcpu + /* Local variable is result if the call is successful. */ + mov (%rsp), %edx + /* Restore stack pointer before we might jump to + SYSCALL_ERROR_LABEL which returns to the caller. */ + add $0x8, %esp + cfi_adjust_cfa_offset(-8) + cmp $-4095, %eax jae SYSCALL_ERROR_LABEL - mov (%rsp), %eax - + mov %edx, %eax L(pseudo_end): - add $0x8, %esp - cfi_adjust_cfa_offset(-8) ret PSEUDO_END(sched_getcpu) #endif |