diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/Makefile | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/getcpu.c | 31 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu-static.c | 3 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S | 46 |
5 files changed, 91 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index a79a92bec8..097b778946 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,13 @@ 2012-05-15 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/unix/sysv/linux/x86_64/x32/Makefile: New file. + * sysdeps/unix/sysv/linux/x86_64/x32/getcpu.c: Likewise. + * sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu-static.c: + Likewise. + * sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S: Likewise. + +2012-05-15 H.J. Lu <hongjiu.lu@intel.com> + * sysdeps/x86_64/stackinfo.h (stackinfo_get_sp): Use RSP_LP. (stackinfo_sub_sp): Likewise. diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/Makefile b/sysdeps/unix/sysv/linux/x86_64/x32/Makefile new file mode 100644 index 0000000000..5f77df7c7a --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/x32/Makefile @@ -0,0 +1,3 @@ +ifeq ($(subdir),posix) +sysdep_routines += getcpu sched_getcpu-static +endif diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/getcpu.c b/sysdeps/unix/sysv/linux/x86_64/x32/getcpu.c new file mode 100644 index 0000000000..b01840e6cf --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/x32/getcpu.c @@ -0,0 +1,31 @@ +/* Copyright (C) 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifdef SHARED +# include <dl-vdso.h> + +void *getcpu_ifunc (void) __asm__ ("__getcpu"); + +void * +getcpu_ifunc (void) +{ + PREPARE_VERSION (linux26, "LINUX_2.6", 61765110); + + return _dl_vdso_vsym ("__vdso_getcpu", &linux26); +} +__asm (".type __getcpu, %gnu_indirect_function"); +#endif diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu-static.c b/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu-static.c new file mode 100644 index 0000000000..38bbf9abdb --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu-static.c @@ -0,0 +1,3 @@ +#ifndef SHARED +#include "../../sched_getcpu.c" +#endif diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S b/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S new file mode 100644 index 0000000000..f3ba9f1c9f --- /dev/null +++ b/sysdeps/unix/sysv/linux/x86_64/x32/sched_getcpu.S @@ -0,0 +1,46 @@ +/* Copyright (C) 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 + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#ifdef SHARED +#include <sysdep.h> +#include <tls.h> +#define _ERRNO_H 1 +#include <bits/errno.h> + +ENTRY (sched_getcpu) + /* Align stack and create local variable for result. */ + sub $0x8, %esp + cfi_adjust_cfa_offset(8) + + mov %esp, %edi + xor %esi, %esi + mov $VGETCPU_CACHE_OFFSET, %edx + add %fs:0, %edx + + call __getcpu + + cmp $-4095, %eax + jae SYSCALL_ERROR_LABEL + + mov (%rsp), %eax + +L(pseudo_end): + add $0x8, %esp + cfi_adjust_cfa_offset(-8) + ret +PSEUDO_END(sched_getcpu) +#endif |