From 73338355920056d87648c65ccba9a875c289b37e Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Tue, 22 May 2012 22:35:04 +0200 Subject: Fix x86_64/sched_getcpu.S error code Rearrange code so that pseudo_end is just ret and the stack pointer is correct also for static library in error case. --- sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'sysdeps/unix/sysv/linux') diff --git a/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S b/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S index 4c3cebe88e..896deb0653 100644 --- a/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S +++ b/sysdeps/unix/sysv/linux/x86_64/sched_getcpu.S @@ -1,4 +1,4 @@ -/* Copyright (C) 2007, 2011 Free Software Foundation, Inc. +/* Copyright (C) 2007-2012 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 @@ -59,13 +59,17 @@ ENTRY (sched_getcpu) # endif #endif + /* Local variable is result if the call is successful. */ + movl (%rsp), %edx + /* Restore stack pointer before we might jump to + SYSCALL_ERROR_LABEL which returns to the caller. */ + add $0x8, %rsp + cfi_adjust_cfa_offset(-8) + cmpq $-4095, %rax jae SYSCALL_ERROR_LABEL - movl (%rsp), %eax - + movl %edx, %eax L(pseudo_end): - add $0x8, %rsp - cfi_adjust_cfa_offset(-8) ret PSEUDO_END(sched_getcpu) -- cgit 1.4.1