mirror of
https://sourceware.org/git/glibc.git
synced 2025-08-01 10:06:57 +03:00
Add sparc64 TLS and NPTL support.
* elf/tls-macros.h: Add Sparc64 defines. * sysdeps/sparc/sparc64/dl-machine.h (sparc64_fixup_plt): Mark as always_inline. (elf_machine_fixup_plt): Likewise. (elf_machine_rela): Handle TLS relocations. (elf_machine_type_cleaa): Likewise. * sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h (SYSCALL_ERROR_HANDLER_ENTRY): Use sethi/or for GOT reloc. It does not always fit in R_SPARC_GOT13 when building -fPIC. Also, add TLS handling. * sysdeps/unix/sysv/linux/configure.in (arch_minimum_kernel): Increase it to 2.4.21 for sparc64. * sysdeps/unix/sysv/linux/sparc/sparc32/clone.S: NULL terminate backtrace by zero'ing out %fp. Store away flags, func_ptr, and func_arg in global registers not local registers. * sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Handle PTID, TLS, and CTID arguments properly. Add RESET_PID handling. * sysdeps/unix/sysv/linux/sparc/sparc64/pause.c: Rework so that we do not invoke __sigprocmask(). We can always assume rt signals are present on sparc64, so just do an inline syscall. 2005-04-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/sparc/sparc64/dl-machine.h: Add dl_machine_h multiple inclusion guard for the first half of the header. (elf_machine_type_class, ELF_MACHINE_JMP_SLOT, ELF_MACHINE_NO_REL, ELF_MACHINE_PLTREL_OVERLAP, elf_machine_runtime_setup, elf_machine_relplt, DL_STACK_END, RTLD_START): Move into the #ifndef dl_machine_h guarded part of the header.
This commit is contained in:
Ulrich Drepper
33
ChangeLog
33
ChangeLog
@ -1,3 +1,36 @@
|
|||||||
|
2005-04-13 David S. Miller <davem@davemloft.net>
|
||||||
|
|
||||||
|
Add sparc64 TLS and NPTL support.
|
||||||
|
* elf/tls-macros.h: Add Sparc64 defines.
|
||||||
|
* sysdeps/sparc/sparc64/dl-machine.h (sparc64_fixup_plt): Mark as
|
||||||
|
always_inline.
|
||||||
|
(elf_machine_fixup_plt): Likewise.
|
||||||
|
(elf_machine_rela): Handle TLS relocations.
|
||||||
|
(elf_machine_type_cleaa): Likewise.
|
||||||
|
* sysdeps/unix/sysv/linux/sparc/sparc64/sysdep.h
|
||||||
|
(SYSCALL_ERROR_HANDLER_ENTRY): Use sethi/or for GOT reloc.
|
||||||
|
It does not always fit in R_SPARC_GOT13 when building -fPIC.
|
||||||
|
Also, add TLS handling.
|
||||||
|
* sysdeps/unix/sysv/linux/configure.in (arch_minimum_kernel):
|
||||||
|
Increase it to 2.4.21 for sparc64.
|
||||||
|
* sysdeps/unix/sysv/linux/sparc/sparc32/clone.S: NULL terminate
|
||||||
|
backtrace by zero'ing out %fp. Store away flags, func_ptr,
|
||||||
|
and func_arg in global registers not local registers.
|
||||||
|
* sysdeps/unix/sysv/linux/sparc/sparc64/clone.S: Handle PTID, TLS,
|
||||||
|
and CTID arguments properly. Add RESET_PID handling.
|
||||||
|
* sysdeps/unix/sysv/linux/sparc/sparc64/pause.c: Rework so that we
|
||||||
|
do not invoke __sigprocmask(). We can always assume rt signals
|
||||||
|
are present on sparc64, so just do an inline syscall.
|
||||||
|
|
||||||
|
2005-04-13 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
|
* sysdeps/sparc/sparc64/dl-machine.h: Add dl_machine_h multiple
|
||||||
|
inclusion guard for the first half of the header.
|
||||||
|
(elf_machine_type_class, ELF_MACHINE_JMP_SLOT, ELF_MACHINE_NO_REL,
|
||||||
|
ELF_MACHINE_PLTREL_OVERLAP, elf_machine_runtime_setup,
|
||||||
|
elf_machine_relplt, DL_STACK_END, RTLD_START): Move into the
|
||||||
|
#ifndef dl_machine_h guarded part of the header.
|
||||||
|
|
||||||
2005-04-14 Ulrich Drepper <drepper@redhat.com>
|
2005-04-14 Ulrich Drepper <drepper@redhat.com>
|
||||||
|
|
||||||
* posix/execvp.c (execvp): Use file name including path when
|
* posix/execvp.c (execvp): Use file name including path when
|
||||||
|
|||||||
@ -441,6 +441,74 @@ register void *__gp __asm__("$29");
|
|||||||
"o5", "o7", "cc"); \
|
"o5", "o7", "cc"); \
|
||||||
__o0; })
|
__o0; })
|
||||||
|
|
||||||
|
#elif defined __sparc__ && defined __arch64__
|
||||||
|
|
||||||
|
# define TLS_LE(x) \
|
||||||
|
({ int *__l; \
|
||||||
|
asm ("sethi %%tle_hix22(" #x "), %0" : "=r" (__l)); \
|
||||||
|
asm ("xor %1, %%tle_lox10(" #x "), %0" : "=r" (__l) : "r" (__l)); \
|
||||||
|
asm ("add %%g7, %1, %0" : "=r" (__l) : "r" (__l)); \
|
||||||
|
__l; })
|
||||||
|
|
||||||
|
# ifdef __PIC__
|
||||||
|
# define TLS_LOAD_PIC \
|
||||||
|
({ long pc, got; \
|
||||||
|
asm ("sethi %%hi(_GLOBAL_OFFSET_TABLE_-4), %1\n\t" \
|
||||||
|
"rd %%pc, %0\n\t" \
|
||||||
|
"add %1, %%lo(_GLOBAL_OFFSET_TABLE_+4), %1\n\t" \
|
||||||
|
"add %1, %0, %1\n\t" \
|
||||||
|
: "=r" (pc), "=r" (got)); \
|
||||||
|
got; })
|
||||||
|
# else
|
||||||
|
# define TLS_LOAD_PIC \
|
||||||
|
({ long got; \
|
||||||
|
asm (".hidden _GLOBAL_OFFSET_TABLE_\n\t" \
|
||||||
|
"sethi %%hi(_GLOBAL_OFFSET_TABLE_), %0\n\t" \
|
||||||
|
"or %0, %%lo(_GLOBAL_OFFSET_TABLE_), %0" \
|
||||||
|
: "=r" (got)); \
|
||||||
|
got; })
|
||||||
|
# endif
|
||||||
|
|
||||||
|
# define TLS_IE(x) \
|
||||||
|
({ int *__l; \
|
||||||
|
asm ("sethi %%tie_hi22(" #x "), %0" : "=r" (__l)); \
|
||||||
|
asm ("add %1, %%tie_lo10(" #x "), %0" : "=r" (__l) : "r" (__l)); \
|
||||||
|
asm ("ldx [%1 + %2], %0, %%tie_ldx(" #x ")" \
|
||||||
|
: "=r" (__l) : "r" (TLS_LOAD_PIC), "r" (__l)); \
|
||||||
|
asm ("add %%g7, %1, %0, %%tie_add(" #x ")" : "=r" (__l) : "r" (__l)); \
|
||||||
|
__l; })
|
||||||
|
|
||||||
|
# define TLS_LD(x) \
|
||||||
|
({ int *__l; register void *__o0 asm ("%o0"); \
|
||||||
|
long __o; \
|
||||||
|
asm ("sethi %%tldm_hi22(" #x "), %0" : "=r" (__l)); \
|
||||||
|
asm ("add %1, %%tldm_lo10(" #x "), %0" : "=r" (__l) : "r" (__l)); \
|
||||||
|
asm ("add %1, %2, %0, %%tldm_add(" #x ")" \
|
||||||
|
: "=r" (__o0) : "r" (TLS_LOAD_PIC), "r" (__l)); \
|
||||||
|
asm ("call __tls_get_addr, %%tgd_call(" #x ")\n\t" \
|
||||||
|
" nop" \
|
||||||
|
: "=r" (__o0) : "0" (__o0) \
|
||||||
|
: "g1", "g2", "g3", "g4", "g5", "g6", "o1", "o2", "o3", "o4", \
|
||||||
|
"o5", "o7", "cc"); \
|
||||||
|
asm ("sethi %%tldo_hix22(" #x "), %0" : "=r" (__o)); \
|
||||||
|
asm ("xor %1, %%tldo_lox10(" #x "), %0" : "=r" (__o) : "r" (__o)); \
|
||||||
|
asm ("add %1, %2, %0, %%tldo_add(" #x ")" : "=r" (__l) \
|
||||||
|
: "r" (__o0), "r" (__o)); \
|
||||||
|
__l; })
|
||||||
|
|
||||||
|
# define TLS_GD(x) \
|
||||||
|
({ int *__l; register void *__o0 asm ("%o0"); \
|
||||||
|
asm ("sethi %%tgd_hi22(" #x "), %0" : "=r" (__l)); \
|
||||||
|
asm ("add %1, %%tgd_lo10(" #x "), %0" : "=r" (__l) : "r" (__l)); \
|
||||||
|
asm ("add %1, %2, %0, %%tgd_add(" #x ")" \
|
||||||
|
: "=r" (__o0) : "r" (TLS_LOAD_PIC), "r" (__l)); \
|
||||||
|
asm ("call __tls_get_addr, %%tgd_call(" #x ")\n\t" \
|
||||||
|
" nop" \
|
||||||
|
: "=r" (__o0) : "0" (__o0) \
|
||||||
|
: "g1", "g2", "g3", "g4", "g5", "g6", "o1", "o2", "o3", "o4", \
|
||||||
|
"o5", "o7", "cc"); \
|
||||||
|
__o0; })
|
||||||
|
|
||||||
#elif defined __s390x__
|
#elif defined __s390x__
|
||||||
|
|
||||||
# define TLS_LE(x) \
|
# define TLS_LE(x) \
|
||||||
|
|||||||
@ -1,3 +1,8 @@
|
|||||||
|
2005-04-13 David S. Miller <davem@davemloft.net>
|
||||||
|
|
||||||
|
* sysdeps/sparc/sparc64/jmpbuf-unwind.h: New file.
|
||||||
|
* sysdeps/sparc/sparc64/clone.S: New file.
|
||||||
|
|
||||||
2005-04-05 Jakub Jelinek <jakub@redhat.com>
|
2005-04-05 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
* sysdeps/pthread/pthread.h (__pthread_cleanup_routine): Use
|
* sysdeps/pthread/pthread.h (__pthread_cleanup_routine): Use
|
||||||
|
|||||||
31
nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h
Normal file
31
nptl/sysdeps/sparc/sparc64/jmpbuf-unwind.h
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
/* Copyright (C) 2005 Free Software Foundation, Inc.
|
||||||
|
This file is part of the GNU C Library.
|
||||||
|
Contributed by David S. Miller <davem@davemloft.net>, 2005.
|
||||||
|
|
||||||
|
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, write to the Free
|
||||||
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
|
02111-1307 USA. */
|
||||||
|
|
||||||
|
#include <setjmp.h>
|
||||||
|
#include <stdint.h>
|
||||||
|
#include <unwind.h>
|
||||||
|
|
||||||
|
#define _JMPBUF_CFA_UNWINDS_ADJ(_jmpbuf, _context, _adj) \
|
||||||
|
_JMPBUF_UNWINDS_ADJ (_jmpbuf, (void *) _Unwind_GetCFA (_context), _adj)
|
||||||
|
|
||||||
|
#define _JMPBUF_UNWINDS_ADJ(_jmpbuf, _address, _adj) \
|
||||||
|
((uintptr_t) (_address) - (_adj) < (uintptr_t) (_jmpbuf)[0].uc_mcontext.mc_fp - (_adj))
|
||||||
|
|
||||||
|
/* We use the normal lobngjmp for unwinding. */
|
||||||
|
#define __libc_unwind_longjmp(buf, val) __libc_longjmp (buf, val)
|
||||||
2
nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
Normal file
2
nptl/sysdeps/unix/sysv/linux/sparc/sparc64/clone.S
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
#define RESET_PID
|
||||||
|
#include <sysdeps/unix/sysv/linux/sparc/sparc64/clone.S>
|
||||||
@ -18,6 +18,9 @@
|
|||||||
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
02111-1307 USA. */
|
02111-1307 USA. */
|
||||||
|
|
||||||
|
#ifndef dl_machine_h
|
||||||
|
#define dl_machine_h
|
||||||
|
|
||||||
#define ELF_MACHINE_NAME "sparc64"
|
#define ELF_MACHINE_NAME "sparc64"
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
@ -88,7 +91,7 @@ elf_machine_load_address (void)
|
|||||||
|
|
||||||
/* We have 4 cases to handle. And we code different code sequences
|
/* We have 4 cases to handle. And we code different code sequences
|
||||||
for each one. I love V9 code models... */
|
for each one. I love V9 code models... */
|
||||||
static inline void
|
static inline void __attribute__ ((always_inline))
|
||||||
sparc64_fixup_plt (struct link_map *map, const Elf64_Rela *reloc,
|
sparc64_fixup_plt (struct link_map *map, const Elf64_Rela *reloc,
|
||||||
Elf64_Addr *reloc_addr, Elf64_Addr value,
|
Elf64_Addr *reloc_addr, Elf64_Addr value,
|
||||||
Elf64_Addr high, int t)
|
Elf64_Addr high, int t)
|
||||||
@ -212,7 +215,7 @@ sparc64_fixup_plt (struct link_map *map, const Elf64_Rela *reloc,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline Elf64_Addr
|
static inline Elf64_Addr __attribute__ ((always_inline))
|
||||||
elf_machine_fixup_plt (struct link_map *map, lookup_t t,
|
elf_machine_fixup_plt (struct link_map *map, lookup_t t,
|
||||||
const Elf64_Rela *reloc,
|
const Elf64_Rela *reloc,
|
||||||
Elf64_Addr *reloc_addr, Elf64_Addr value)
|
Elf64_Addr *reloc_addr, Elf64_Addr value)
|
||||||
@ -233,243 +236,21 @@ elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc,
|
|||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define ARCH_LA_PLTENTER sparc64_gnu_pltenter
|
|
||||||
#define ARCH_LA_PLTEXIT sparc64_gnu_pltexit
|
|
||||||
|
|
||||||
#ifdef RESOLVE_MAP
|
|
||||||
|
|
||||||
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
|
||||||
MAP is the object containing the reloc. */
|
|
||||||
|
|
||||||
auto inline void
|
|
||||||
__attribute__ ((always_inline))
|
|
||||||
elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
|
|
||||||
const Elf64_Sym *sym, const struct r_found_version *version,
|
|
||||||
void *const reloc_addr_arg)
|
|
||||||
{
|
|
||||||
Elf64_Addr *const reloc_addr = reloc_addr_arg;
|
|
||||||
const unsigned long int r_type = ELF64_R_TYPE_ID (reloc->r_info);
|
|
||||||
|
|
||||||
#if !defined RTLD_BOOTSTRAP || !defined HAVE_Z_COMBRELOC
|
|
||||||
if (__builtin_expect (r_type == R_SPARC_RELATIVE, 0))
|
|
||||||
*reloc_addr = map->l_addr + reloc->r_addend;
|
|
||||||
# ifndef RTLD_BOOTSTRAP
|
|
||||||
else if (r_type == R_SPARC_NONE) /* Who is Wilbur? */
|
|
||||||
return;
|
|
||||||
# endif
|
|
||||||
else
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
|
|
||||||
const Elf64_Sym *const refsym = sym;
|
|
||||||
#endif
|
|
||||||
Elf64_Addr value;
|
|
||||||
#ifndef RESOLVE_CONFLICT_FIND_MAP
|
|
||||||
if (sym->st_shndx != SHN_UNDEF &&
|
|
||||||
ELF64_ST_BIND (sym->st_info) == STB_LOCAL)
|
|
||||||
value = map->l_addr;
|
|
||||||
else
|
|
||||||
{
|
|
||||||
struct link_map *sym_map;
|
|
||||||
|
|
||||||
sym_map = RESOLVE_MAP (&sym, version, r_type);
|
|
||||||
value = (sym_map == NULL) ? 0 : (sym_map->l_addr + sym->st_value);
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
value = 0;
|
|
||||||
#endif
|
|
||||||
value += reloc->r_addend; /* Assume copy relocs have zero addend. */
|
|
||||||
|
|
||||||
switch (r_type)
|
|
||||||
{
|
|
||||||
#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
|
|
||||||
case R_SPARC_COPY:
|
|
||||||
if (sym == NULL)
|
|
||||||
/* This can happen in trace mode if an object could not be
|
|
||||||
found. */
|
|
||||||
break;
|
|
||||||
if (sym->st_size > refsym->st_size
|
|
||||||
|| (GLRO(dl_verbose) && sym->st_size < refsym->st_size))
|
|
||||||
{
|
|
||||||
const char *strtab;
|
|
||||||
|
|
||||||
strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
|
|
||||||
_dl_error_printf ("\
|
|
||||||
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
|
|
||||||
rtld_progname ?: "<program name unknown>",
|
|
||||||
strtab + refsym->st_name);
|
|
||||||
}
|
|
||||||
memcpy (reloc_addr_arg, (void *) value,
|
|
||||||
MIN (sym->st_size, refsym->st_size));
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case R_SPARC_64:
|
|
||||||
case R_SPARC_GLOB_DAT:
|
|
||||||
*reloc_addr = value;
|
|
||||||
break;
|
|
||||||
#ifndef RTLD_BOOTSTRAP
|
|
||||||
case R_SPARC_8:
|
|
||||||
*(char *) reloc_addr = value;
|
|
||||||
break;
|
|
||||||
case R_SPARC_16:
|
|
||||||
*(short *) reloc_addr = value;
|
|
||||||
break;
|
|
||||||
case R_SPARC_32:
|
|
||||||
*(unsigned int *) reloc_addr = value;
|
|
||||||
break;
|
|
||||||
case R_SPARC_DISP8:
|
|
||||||
*(char *) reloc_addr = (value - (Elf64_Addr) reloc_addr);
|
|
||||||
break;
|
|
||||||
case R_SPARC_DISP16:
|
|
||||||
*(short *) reloc_addr = (value - (Elf64_Addr) reloc_addr);
|
|
||||||
break;
|
|
||||||
case R_SPARC_DISP32:
|
|
||||||
*(unsigned int *) reloc_addr = (value - (Elf64_Addr) reloc_addr);
|
|
||||||
break;
|
|
||||||
case R_SPARC_WDISP30:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & 0xc0000000) |
|
|
||||||
((value - (Elf64_Addr) reloc_addr) >> 2));
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* MEDLOW code model relocs */
|
|
||||||
case R_SPARC_LO10:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & ~0x3ff) |
|
|
||||||
(value & 0x3ff));
|
|
||||||
break;
|
|
||||||
case R_SPARC_HI22:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & 0xffc00000) |
|
|
||||||
(value >> 10));
|
|
||||||
break;
|
|
||||||
case R_SPARC_OLO10:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & ~0x1fff) |
|
|
||||||
(((value & 0x3ff) + ELF64_R_TYPE_DATA (reloc->r_info)) & 0x1fff));
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* MEDMID code model relocs */
|
|
||||||
case R_SPARC_H44:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & 0xffc00000) |
|
|
||||||
(value >> 22));
|
|
||||||
break;
|
|
||||||
case R_SPARC_M44:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & ~0x3ff) |
|
|
||||||
((value >> 12) & 0x3ff));
|
|
||||||
break;
|
|
||||||
case R_SPARC_L44:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & ~0xfff) |
|
|
||||||
(value & 0xfff));
|
|
||||||
break;
|
|
||||||
|
|
||||||
/* MEDANY code model relocs */
|
|
||||||
case R_SPARC_HH22:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & 0xffc00000) |
|
|
||||||
(value >> 42));
|
|
||||||
break;
|
|
||||||
case R_SPARC_HM10:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & ~0x3ff) |
|
|
||||||
((value >> 32) & 0x3ff));
|
|
||||||
break;
|
|
||||||
case R_SPARC_LM22:
|
|
||||||
*(unsigned int *) reloc_addr =
|
|
||||||
((*(unsigned int *)reloc_addr & 0xffc00000) |
|
|
||||||
((value >> 10) & 0x003fffff));
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
case R_SPARC_JMP_SLOT:
|
|
||||||
#ifdef RESOLVE_CONFLICT_FIND_MAP
|
|
||||||
/* R_SPARC_JMP_SLOT conflicts against .plt[32768+]
|
|
||||||
relocs should be turned into R_SPARC_64 relocs
|
|
||||||
in .gnu.conflict section.
|
|
||||||
r_addend non-zero does not mean it is a .plt[32768+]
|
|
||||||
reloc, instead it is the actual address of the function
|
|
||||||
to call. */
|
|
||||||
sparc64_fixup_plt (NULL, reloc, reloc_addr, value, 0, 0);
|
|
||||||
#else
|
|
||||||
sparc64_fixup_plt (map, reloc, reloc_addr, value,
|
|
||||||
reloc->r_addend, 0);
|
|
||||||
#endif
|
|
||||||
break;
|
|
||||||
#ifndef RTLD_BOOTSTRAP
|
|
||||||
case R_SPARC_UA16:
|
|
||||||
((unsigned char *) reloc_addr_arg) [0] = value >> 8;
|
|
||||||
((unsigned char *) reloc_addr_arg) [1] = value;
|
|
||||||
break;
|
|
||||||
case R_SPARC_UA32:
|
|
||||||
((unsigned char *) reloc_addr_arg) [0] = value >> 24;
|
|
||||||
((unsigned char *) reloc_addr_arg) [1] = value >> 16;
|
|
||||||
((unsigned char *) reloc_addr_arg) [2] = value >> 8;
|
|
||||||
((unsigned char *) reloc_addr_arg) [3] = value;
|
|
||||||
break;
|
|
||||||
case R_SPARC_UA64:
|
|
||||||
if (! ((long) reloc_addr_arg & 3))
|
|
||||||
{
|
|
||||||
/* Common in .eh_frame */
|
|
||||||
((unsigned int *) reloc_addr_arg) [0] = value >> 32;
|
|
||||||
((unsigned int *) reloc_addr_arg) [1] = value;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
((unsigned char *) reloc_addr_arg) [0] = value >> 56;
|
|
||||||
((unsigned char *) reloc_addr_arg) [1] = value >> 48;
|
|
||||||
((unsigned char *) reloc_addr_arg) [2] = value >> 40;
|
|
||||||
((unsigned char *) reloc_addr_arg) [3] = value >> 32;
|
|
||||||
((unsigned char *) reloc_addr_arg) [4] = value >> 24;
|
|
||||||
((unsigned char *) reloc_addr_arg) [5] = value >> 16;
|
|
||||||
((unsigned char *) reloc_addr_arg) [6] = value >> 8;
|
|
||||||
((unsigned char *) reloc_addr_arg) [7] = value;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
#if !defined RTLD_BOOTSTRAP || defined _NDEBUG
|
|
||||||
default:
|
|
||||||
_dl_reloc_bad_type (map, r_type, 0);
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
auto inline void
|
|
||||||
__attribute__ ((always_inline))
|
|
||||||
elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
|
|
||||||
void *const reloc_addr_arg)
|
|
||||||
{
|
|
||||||
Elf64_Addr *const reloc_addr = reloc_addr_arg;
|
|
||||||
*reloc_addr = l_addr + reloc->r_addend;
|
|
||||||
}
|
|
||||||
|
|
||||||
auto inline void
|
|
||||||
__attribute__ ((always_inline))
|
|
||||||
elf_machine_lazy_rel (struct link_map *map,
|
|
||||||
Elf64_Addr l_addr, const Elf64_Rela *reloc)
|
|
||||||
{
|
|
||||||
switch (ELF64_R_TYPE (reloc->r_info))
|
|
||||||
{
|
|
||||||
case R_SPARC_NONE:
|
|
||||||
break;
|
|
||||||
case R_SPARC_JMP_SLOT:
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
_dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 1);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#endif /* RESOLVE */
|
|
||||||
|
|
||||||
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
|
/* ELF_RTYPE_CLASS_PLT iff TYPE describes relocation of a PLT entry, so
|
||||||
PLT entries should not be allowed to define the value.
|
PLT entries should not be allowed to define the value.
|
||||||
ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
|
ELF_RTYPE_CLASS_NOCOPY iff TYPE should not be allowed to resolve to one
|
||||||
of the main executable's symbols, as for a COPY reloc. */
|
of the main executable's symbols, as for a COPY reloc. */
|
||||||
|
#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD)
|
||||||
|
# define elf_machine_type_class(type) \
|
||||||
|
((((type) == R_SPARC_JMP_SLOT \
|
||||||
|
|| ((type) >= R_SPARC_TLS_GD_HI22 && (type) <= R_SPARC_TLS_TPOFF64)) \
|
||||||
|
* ELF_RTYPE_CLASS_PLT) \
|
||||||
|
| (((type) == R_SPARC_COPY) * ELF_RTYPE_CLASS_COPY))
|
||||||
|
#else
|
||||||
# define elf_machine_type_class(type) \
|
# define elf_machine_type_class(type) \
|
||||||
((((type) == R_SPARC_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
|
((((type) == R_SPARC_JMP_SLOT) * ELF_RTYPE_CLASS_PLT) \
|
||||||
| (((type) == R_SPARC_COPY) * ELF_RTYPE_CLASS_COPY))
|
| (((type) == R_SPARC_COPY) * ELF_RTYPE_CLASS_COPY))
|
||||||
|
#endif
|
||||||
|
|
||||||
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
/* A reloc type used for ld.so cmdline arg lookups to reject PLT entries. */
|
||||||
#define ELF_MACHINE_JMP_SLOT R_SPARC_JMP_SLOT
|
#define ELF_MACHINE_JMP_SLOT R_SPARC_JMP_SLOT
|
||||||
@ -701,3 +482,290 @@ elf_machine_runtime_setup (struct link_map *l, int lazy, int profile)
|
|||||||
" add %sp, 6*8, %sp\n" \
|
" add %sp, 6*8, %sp\n" \
|
||||||
" .size _dl_start_user, . - _dl_start_user\n" \
|
" .size _dl_start_user, . - _dl_start_user\n" \
|
||||||
" .previous\n");
|
" .previous\n");
|
||||||
|
|
||||||
|
#endif /* dl_machine_h */
|
||||||
|
|
||||||
|
#define ARCH_LA_PLTENTER sparc64_gnu_pltenter
|
||||||
|
#define ARCH_LA_PLTEXIT sparc64_gnu_pltexit
|
||||||
|
|
||||||
|
#ifdef RESOLVE_MAP
|
||||||
|
|
||||||
|
/* Perform the relocation specified by RELOC and SYM (which is fully resolved).
|
||||||
|
MAP is the object containing the reloc. */
|
||||||
|
|
||||||
|
auto inline void
|
||||||
|
__attribute__ ((always_inline))
|
||||||
|
elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc,
|
||||||
|
const Elf64_Sym *sym, const struct r_found_version *version,
|
||||||
|
void *const reloc_addr_arg)
|
||||||
|
{
|
||||||
|
Elf64_Addr *const reloc_addr = reloc_addr_arg;
|
||||||
|
#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
|
||||||
|
const Elf64_Sym *const refsym = sym;
|
||||||
|
#endif
|
||||||
|
Elf64_Addr value;
|
||||||
|
const unsigned long int r_type = ELF64_R_TYPE_ID (reloc->r_info);
|
||||||
|
#if !defined RESOLVE_CONFLICT_FIND_MAP
|
||||||
|
struct link_map *sym_map = NULL;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined RTLD_BOOTSTRAP && !defined HAVE_Z_COMBRELOC
|
||||||
|
/* This is defined in rtld.c, but nowhere in the static libc.a; make the
|
||||||
|
reference weak so static programs can still link. This declaration
|
||||||
|
cannot be done when compiling rtld.c (i.e. #ifdef RTLD_BOOTSTRAP)
|
||||||
|
because rtld.c contains the common defn for _dl_rtld_map, which is
|
||||||
|
incompatible with a weak decl in the same file. */
|
||||||
|
weak_extern (_dl_rtld_map);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (__builtin_expect (r_type == R_SPARC_NONE, 0))
|
||||||
|
return;
|
||||||
|
|
||||||
|
#if !defined RTLD_BOOTSTRAP || !defined HAVE_Z_COMBRELOC
|
||||||
|
if (__builtin_expect (r_type == R_SPARC_RELATIVE, 0))
|
||||||
|
{
|
||||||
|
# if !defined RTLD_BOOTSTRAP && !defined HAVE_Z_COMBRELOC
|
||||||
|
if (map != &_dl_rtld_map) /* Already done in rtld itself. */
|
||||||
|
# endif
|
||||||
|
*reloc_addr += map->l_addr + reloc->r_addend;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef RESOLVE_CONFLICT_FIND_MAP
|
||||||
|
if (__builtin_expect (ELF64_ST_BIND (sym->st_info) == STB_LOCAL, 0)
|
||||||
|
&& sym->st_shndx != SHN_UNDEF)
|
||||||
|
{
|
||||||
|
value = map->l_addr;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
sym_map = RESOLVE_MAP (&sym, version, r_type);
|
||||||
|
value = sym_map == NULL ? 0 : sym_map->l_addr + sym->st_value;
|
||||||
|
}
|
||||||
|
#else
|
||||||
|
value = 0;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
value += reloc->r_addend; /* Assume copy relocs have zero addend. */
|
||||||
|
|
||||||
|
switch (r_type)
|
||||||
|
{
|
||||||
|
#if !defined RTLD_BOOTSTRAP && !defined RESOLVE_CONFLICT_FIND_MAP
|
||||||
|
case R_SPARC_COPY:
|
||||||
|
if (sym == NULL)
|
||||||
|
/* This can happen in trace mode if an object could not be
|
||||||
|
found. */
|
||||||
|
break;
|
||||||
|
if (sym->st_size > refsym->st_size
|
||||||
|
|| (GLRO(dl_verbose) && sym->st_size < refsym->st_size))
|
||||||
|
{
|
||||||
|
const char *strtab;
|
||||||
|
|
||||||
|
strtab = (const void *) D_PTR (map, l_info[DT_STRTAB]);
|
||||||
|
_dl_error_printf ("\
|
||||||
|
%s: Symbol `%s' has different size in shared object, consider re-linking\n",
|
||||||
|
rtld_progname ?: "<program name unknown>",
|
||||||
|
strtab + refsym->st_name);
|
||||||
|
}
|
||||||
|
memcpy (reloc_addr_arg, (void *) value,
|
||||||
|
MIN (sym->st_size, refsym->st_size));
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
case R_SPARC_64:
|
||||||
|
case R_SPARC_GLOB_DAT:
|
||||||
|
*reloc_addr = value;
|
||||||
|
break;
|
||||||
|
case R_SPARC_JMP_SLOT:
|
||||||
|
#ifdef RESOLVE_CONFLICT_FIND_MAP
|
||||||
|
/* R_SPARC_JMP_SLOT conflicts against .plt[32768+]
|
||||||
|
relocs should be turned into R_SPARC_64 relocs
|
||||||
|
in .gnu.conflict section.
|
||||||
|
r_addend non-zero does not mean it is a .plt[32768+]
|
||||||
|
reloc, instead it is the actual address of the function
|
||||||
|
to call. */
|
||||||
|
sparc64_fixup_plt (NULL, reloc, reloc_addr, value, 0, 0);
|
||||||
|
#else
|
||||||
|
sparc64_fixup_plt (map, reloc, reloc_addr, value, reloc->r_addend, 0);
|
||||||
|
#endif
|
||||||
|
break;
|
||||||
|
#if defined USE_TLS && (!defined RTLD_BOOTSTRAP || USE___THREAD) \
|
||||||
|
&& !defined RESOLVE_CONFLICT_FIND_MAP
|
||||||
|
case R_SPARC_TLS_DTPMOD64:
|
||||||
|
/* Get the information from the link map returned by the
|
||||||
|
resolv function. */
|
||||||
|
if (sym_map != NULL)
|
||||||
|
*reloc_addr = sym_map->l_tls_modid;
|
||||||
|
break;
|
||||||
|
case R_SPARC_TLS_DTPOFF64:
|
||||||
|
/* During relocation all TLS symbols are defined and used.
|
||||||
|
Therefore the offset is already correct. */
|
||||||
|
*reloc_addr = (sym == NULL ? 0 : sym->st_value) + reloc->r_addend;
|
||||||
|
break;
|
||||||
|
case R_SPARC_TLS_TPOFF64:
|
||||||
|
/* The offset is negative, forward from the thread pointer. */
|
||||||
|
/* We know the offset of object the symbol is contained in.
|
||||||
|
It is a negative value which will be added to the
|
||||||
|
thread pointer. */
|
||||||
|
if (sym != NULL)
|
||||||
|
{
|
||||||
|
CHECK_STATIC_TLS (map, sym_map);
|
||||||
|
*reloc_addr = sym->st_value - sym_map->l_tls_offset
|
||||||
|
+ reloc->r_addend;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
# ifndef RTLD_BOOTSTRAP
|
||||||
|
case R_SPARC_TLS_LE_HIX22:
|
||||||
|
case R_SPARC_TLS_LE_LOX10:
|
||||||
|
if (sym != NULL)
|
||||||
|
{
|
||||||
|
CHECK_STATIC_TLS (map, sym_map);
|
||||||
|
value = sym->st_value - sym_map->l_tls_offset
|
||||||
|
+ reloc->r_addend;
|
||||||
|
if (r_type == R_SPARC_TLS_LE_HIX22)
|
||||||
|
*reloc_addr = (*reloc_addr & 0xffc00000) | ((~value) >> 10);
|
||||||
|
else
|
||||||
|
*reloc_addr = (*reloc_addr & 0xffffe000) | (value & 0x3ff)
|
||||||
|
| 0x1c00;
|
||||||
|
}
|
||||||
|
break;
|
||||||
|
# endif
|
||||||
|
#endif
|
||||||
|
#ifndef RTLD_BOOTSTRAP
|
||||||
|
case R_SPARC_8:
|
||||||
|
*(char *) reloc_addr = value;
|
||||||
|
break;
|
||||||
|
case R_SPARC_16:
|
||||||
|
*(short *) reloc_addr = value;
|
||||||
|
break;
|
||||||
|
case R_SPARC_32:
|
||||||
|
*(unsigned int *) reloc_addr = value;
|
||||||
|
break;
|
||||||
|
case R_SPARC_DISP8:
|
||||||
|
*(char *) reloc_addr = (value - (Elf64_Addr) reloc_addr);
|
||||||
|
break;
|
||||||
|
case R_SPARC_DISP16:
|
||||||
|
*(short *) reloc_addr = (value - (Elf64_Addr) reloc_addr);
|
||||||
|
break;
|
||||||
|
case R_SPARC_DISP32:
|
||||||
|
*(unsigned int *) reloc_addr = (value - (Elf64_Addr) reloc_addr);
|
||||||
|
break;
|
||||||
|
case R_SPARC_WDISP30:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & 0xc0000000) |
|
||||||
|
((value - (Elf64_Addr) reloc_addr) >> 2));
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* MEDLOW code model relocs */
|
||||||
|
case R_SPARC_LO10:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & ~0x3ff) |
|
||||||
|
(value & 0x3ff));
|
||||||
|
break;
|
||||||
|
case R_SPARC_HI22:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & 0xffc00000) |
|
||||||
|
(value >> 10));
|
||||||
|
break;
|
||||||
|
case R_SPARC_OLO10:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & ~0x1fff) |
|
||||||
|
(((value & 0x3ff) + ELF64_R_TYPE_DATA (reloc->r_info)) & 0x1fff));
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* MEDMID code model relocs */
|
||||||
|
case R_SPARC_H44:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & 0xffc00000) |
|
||||||
|
(value >> 22));
|
||||||
|
break;
|
||||||
|
case R_SPARC_M44:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & ~0x3ff) |
|
||||||
|
((value >> 12) & 0x3ff));
|
||||||
|
break;
|
||||||
|
case R_SPARC_L44:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & ~0xfff) |
|
||||||
|
(value & 0xfff));
|
||||||
|
break;
|
||||||
|
|
||||||
|
/* MEDANY code model relocs */
|
||||||
|
case R_SPARC_HH22:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & 0xffc00000) |
|
||||||
|
(value >> 42));
|
||||||
|
break;
|
||||||
|
case R_SPARC_HM10:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & ~0x3ff) |
|
||||||
|
((value >> 32) & 0x3ff));
|
||||||
|
break;
|
||||||
|
case R_SPARC_LM22:
|
||||||
|
*(unsigned int *) reloc_addr =
|
||||||
|
((*(unsigned int *)reloc_addr & 0xffc00000) |
|
||||||
|
((value >> 10) & 0x003fffff));
|
||||||
|
break;
|
||||||
|
case R_SPARC_UA16:
|
||||||
|
((unsigned char *) reloc_addr_arg) [0] = value >> 8;
|
||||||
|
((unsigned char *) reloc_addr_arg) [1] = value;
|
||||||
|
break;
|
||||||
|
case R_SPARC_UA32:
|
||||||
|
((unsigned char *) reloc_addr_arg) [0] = value >> 24;
|
||||||
|
((unsigned char *) reloc_addr_arg) [1] = value >> 16;
|
||||||
|
((unsigned char *) reloc_addr_arg) [2] = value >> 8;
|
||||||
|
((unsigned char *) reloc_addr_arg) [3] = value;
|
||||||
|
break;
|
||||||
|
case R_SPARC_UA64:
|
||||||
|
if (! ((long) reloc_addr_arg & 3))
|
||||||
|
{
|
||||||
|
/* Common in .eh_frame */
|
||||||
|
((unsigned int *) reloc_addr_arg) [0] = value >> 32;
|
||||||
|
((unsigned int *) reloc_addr_arg) [1] = value;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
((unsigned char *) reloc_addr_arg) [0] = value >> 56;
|
||||||
|
((unsigned char *) reloc_addr_arg) [1] = value >> 48;
|
||||||
|
((unsigned char *) reloc_addr_arg) [2] = value >> 40;
|
||||||
|
((unsigned char *) reloc_addr_arg) [3] = value >> 32;
|
||||||
|
((unsigned char *) reloc_addr_arg) [4] = value >> 24;
|
||||||
|
((unsigned char *) reloc_addr_arg) [5] = value >> 16;
|
||||||
|
((unsigned char *) reloc_addr_arg) [6] = value >> 8;
|
||||||
|
((unsigned char *) reloc_addr_arg) [7] = value;
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
#if !defined RTLD_BOOTSTRAP || defined _NDEBUG
|
||||||
|
default:
|
||||||
|
_dl_reloc_bad_type (map, r_type, 0);
|
||||||
|
break;
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
auto inline void
|
||||||
|
__attribute__ ((always_inline))
|
||||||
|
elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc,
|
||||||
|
void *const reloc_addr_arg)
|
||||||
|
{
|
||||||
|
Elf64_Addr *const reloc_addr = reloc_addr_arg;
|
||||||
|
*reloc_addr = l_addr + reloc->r_addend;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto inline void
|
||||||
|
__attribute__ ((always_inline))
|
||||||
|
elf_machine_lazy_rel (struct link_map *map,
|
||||||
|
Elf64_Addr l_addr, const Elf64_Rela *reloc)
|
||||||
|
{
|
||||||
|
switch (ELF64_R_TYPE (reloc->r_info))
|
||||||
|
{
|
||||||
|
case R_SPARC_NONE:
|
||||||
|
break;
|
||||||
|
case R_SPARC_JMP_SLOT:
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
_dl_reloc_bad_type (map, ELFW(R_TYPE) (reloc->r_info), 1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* RESOLVE_MAP */
|
||||||
|
|||||||
4
sysdeps/unix/sysv/linux/configure
vendored
4
sysdeps/unix/sysv/linux/configure
vendored
@ -138,6 +138,10 @@ case "$machine" in
|
|||||||
arch_minimum_kernel=2.3.99
|
arch_minimum_kernel=2.3.99
|
||||||
libc_cv_gcc_unwind_find_fde=yes
|
libc_cv_gcc_unwind_find_fde=yes
|
||||||
;;
|
;;
|
||||||
|
sparc/sparc64*)
|
||||||
|
libc_cv_gcc_unwind_find_fde=yes
|
||||||
|
arch_minimum_kernel=2.4.21
|
||||||
|
;;
|
||||||
sparc*)
|
sparc*)
|
||||||
libc_cv_gcc_unwind_find_fde=yes
|
libc_cv_gcc_unwind_find_fde=yes
|
||||||
arch_minimum_kernel=2.0.10
|
arch_minimum_kernel=2.0.10
|
||||||
|
|||||||
@ -98,6 +98,10 @@ case "$machine" in
|
|||||||
arch_minimum_kernel=2.3.99
|
arch_minimum_kernel=2.3.99
|
||||||
libc_cv_gcc_unwind_find_fde=yes
|
libc_cv_gcc_unwind_find_fde=yes
|
||||||
;;
|
;;
|
||||||
|
sparc/sparc64*)
|
||||||
|
libc_cv_gcc_unwind_find_fde=yes
|
||||||
|
arch_minimum_kernel=2.4.21
|
||||||
|
;;
|
||||||
sparc*)
|
sparc*)
|
||||||
libc_cv_gcc_unwind_find_fde=yes
|
libc_cv_gcc_unwind_find_fde=yes
|
||||||
arch_minimum_kernel=2.0.10
|
arch_minimum_kernel=2.0.10
|
||||||
|
|||||||
@ -40,11 +40,19 @@ __clone:
|
|||||||
save %sp,-96,%sp
|
save %sp,-96,%sp
|
||||||
|
|
||||||
/* sanity check arguments */
|
/* sanity check arguments */
|
||||||
tst %i0
|
orcc %i0,%g0,%g2
|
||||||
be .Lerror
|
be .Lerror
|
||||||
orcc %i1,%g0,%o1
|
orcc %i1,%g0,%o1
|
||||||
be .Lerror
|
be .Lerror
|
||||||
mov %i2,%o0
|
mov %i2,%o0
|
||||||
|
|
||||||
|
/* The child_stack is the top of the stack, allocate one
|
||||||
|
whole stack frame from that as this is what the kernel
|
||||||
|
expects. */
|
||||||
|
sub %o1, 96, %o1
|
||||||
|
mov %i3, %g3
|
||||||
|
mov %i2, %g4
|
||||||
|
|
||||||
/* ptid */
|
/* ptid */
|
||||||
mov %i4,%o2
|
mov %i4,%o2
|
||||||
/* tls */
|
/* tls */
|
||||||
@ -76,19 +84,21 @@ __clone:
|
|||||||
__thread_start:
|
__thread_start:
|
||||||
#ifdef RESET_PID
|
#ifdef RESET_PID
|
||||||
sethi %hi(CLONE_THREAD), %l0
|
sethi %hi(CLONE_THREAD), %l0
|
||||||
andcc %i2, %l0, %g0
|
andcc %g4, %l0, %g0
|
||||||
bne 1f
|
bne 1f
|
||||||
andcc %i2, CLONE_VM, %g0
|
andcc %g4, CLONE_VM, %g0
|
||||||
bne,a 2f
|
bne,a 2f
|
||||||
mov -1,%o0
|
mov -1,%o0
|
||||||
set __NR_getpid,%g1
|
set __NR_getpid,%g1
|
||||||
ta 0x10
|
ta 0x10
|
||||||
2: st %o0,[%g7 + PID]
|
2:
|
||||||
|
st %o0,[%g7 + PID]
|
||||||
st %o0,[%g7 + TID]
|
st %o0,[%g7 + TID]
|
||||||
1:
|
1:
|
||||||
#endif
|
#endif
|
||||||
call %i0
|
mov %g0, %fp /* terminate backtrace */
|
||||||
mov %i3,%o0
|
call %g2
|
||||||
|
mov %g3,%o0
|
||||||
call _exit,0
|
call _exit,0
|
||||||
nop
|
nop
|
||||||
|
|
||||||
|
|||||||
@ -22,8 +22,16 @@
|
|||||||
|
|
||||||
#include <asm/errno.h>
|
#include <asm/errno.h>
|
||||||
#include <asm/unistd.h>
|
#include <asm/unistd.h>
|
||||||
|
#include <tcb-offsets.h>
|
||||||
|
|
||||||
/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg); */
|
#define CLONE_VM 0x00000100
|
||||||
|
#define CLONE_THREAD 0x00010000
|
||||||
|
|
||||||
|
/* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg,
|
||||||
|
pid_t *ptid, void *tls, pid_t *ctid); */
|
||||||
|
|
||||||
|
.register %g2,#scratch
|
||||||
|
.register %g3,#scratch
|
||||||
|
|
||||||
.text
|
.text
|
||||||
.align 4
|
.align 4
|
||||||
@ -34,22 +42,31 @@ __clone:
|
|||||||
save %sp, -192, %sp
|
save %sp, -192, %sp
|
||||||
|
|
||||||
/* sanity check arguments */
|
/* sanity check arguments */
|
||||||
brz,pn %i0, 99f
|
brz,pn %i0, 99f /* fn non-NULL? */
|
||||||
mov %i0, %l0 /* save fn */
|
mov %i0, %g2
|
||||||
brz,pn %i1, 99f
|
brz,pn %i1, 99f /* child_stack non-NULL? */
|
||||||
mov %i3, %l3 /* save arg */
|
mov %i2, %o0 /* clone flags */
|
||||||
|
|
||||||
|
/* The child_stack is the top of the stack, allocate one
|
||||||
|
whole stack frame from that as this is what the kernel
|
||||||
|
expects. Also, subtract STACK_BIAS. */
|
||||||
|
sub %i1, 192 + 0x7ff, %o1
|
||||||
|
mov %i3, %g3
|
||||||
|
mov %i2, %g4
|
||||||
|
|
||||||
|
mov %i4,%o2 /* PTID */
|
||||||
|
mov %i5,%o3 /* TLS */
|
||||||
|
ldx [%fp+0x7ff+176],%o4 /* CTID */
|
||||||
|
|
||||||
/* Do the system call */
|
/* Do the system call */
|
||||||
sub %i1, 0x7ff, %o1
|
|
||||||
mov %i2, %o0
|
|
||||||
set __NR_clone, %g1
|
set __NR_clone, %g1
|
||||||
ta 0x6d
|
ta 0x6d
|
||||||
bcs,pn %xcc, 99f
|
bcs,pn %xcc, 99f
|
||||||
nop
|
nop
|
||||||
brnz,pn %o1, __thread_start
|
brnz,pn %o1, __thread_start
|
||||||
mov %o0, %i0
|
nop
|
||||||
ret
|
ret
|
||||||
restore
|
restore %o0, %g0, %o0
|
||||||
99:
|
99:
|
||||||
#ifndef _LIBC_REENTRANT
|
#ifndef _LIBC_REENTRANT
|
||||||
#ifdef PIC
|
#ifdef PIC
|
||||||
@ -77,10 +94,22 @@ __clone:
|
|||||||
|
|
||||||
.type __thread_start,@function
|
.type __thread_start,@function
|
||||||
__thread_start:
|
__thread_start:
|
||||||
|
#ifdef RESET_PID
|
||||||
|
sethi %hi(CLONE_THREAD), %l0
|
||||||
|
andcc %g4, %l0, %g0
|
||||||
|
bne,pt %icc, 1f
|
||||||
|
andcc %g4, CLONE_VM, %g0
|
||||||
|
bne,a,pn %icc, 2f
|
||||||
|
mov -1,%o0
|
||||||
|
set __NR_getpid,%g1
|
||||||
|
ta 0x6d
|
||||||
|
2: st %o0,[%g7 + PID]
|
||||||
|
st %o0,[%g7 + TID]
|
||||||
|
1:
|
||||||
|
#endif
|
||||||
mov %g0, %fp /* terminate backtrace */
|
mov %g0, %fp /* terminate backtrace */
|
||||||
sub %sp, 6*8, %sp /* provide arg storage */
|
call %g2
|
||||||
call %l0
|
mov %g3,%o0
|
||||||
mov %l3,%o0
|
|
||||||
call _exit,0
|
call _exit,0
|
||||||
nop
|
nop
|
||||||
.size __thread_start, .-__thread_start
|
.size __thread_start, .-__thread_start
|
||||||
|
|||||||
@ -1 +1,47 @@
|
|||||||
#include <sysdeps/posix/pause.c>
|
/* pause -- suspend the process until a signal arrives. POSIX.1 version.
|
||||||
|
Copyright (C) 2003 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, write to the Free
|
||||||
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||||
|
02111-1307 USA. */
|
||||||
|
|
||||||
|
#include <errno.h>
|
||||||
|
#include <signal.h>
|
||||||
|
#include <unistd.h>
|
||||||
|
#include <sysdep-cancel.h>
|
||||||
|
|
||||||
|
#include <sysdep.h>
|
||||||
|
#include <sys/syscall.h>
|
||||||
|
#include <bp-checks.h>
|
||||||
|
|
||||||
|
/* Suspend the process until a signal arrives.
|
||||||
|
This always returns -1 and sets errno to EINTR. */
|
||||||
|
int
|
||||||
|
__libc_pause (void)
|
||||||
|
{
|
||||||
|
sigset_t set;
|
||||||
|
|
||||||
|
__sigemptyset (&set);
|
||||||
|
INLINE_SYSCALL (rt_sigprocmask, 4, SIG_BLOCK, CHECK_SIGSET (NULL),
|
||||||
|
CHECK_SIGSET_NULL_OK (&set), _NSIG / 8);
|
||||||
|
|
||||||
|
/* pause is a cancellation point, but so is sigsuspend.
|
||||||
|
So no need for anything special here. */
|
||||||
|
|
||||||
|
return __sigsuspend (&set);
|
||||||
|
}
|
||||||
|
weak_alias (__libc_pause, pause)
|
||||||
|
|
||||||
|
LIBC_CANCEL_HANDLED (); /* sigsuspend handles our cancellation. */
|
||||||
|
|||||||
@ -85,11 +85,54 @@ SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
|
|||||||
sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %l7; \
|
sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %l7; \
|
||||||
call __sparc64.get_pic.l7; \
|
call __sparc64.get_pic.l7; \
|
||||||
add %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7; \
|
add %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7; \
|
||||||
ldx [%l7 + rtld_errno], %l0; \
|
sethi %hi(rtld_errno), %g1; \
|
||||||
|
or %g1, %lo(rtld_errno), %g1; \
|
||||||
|
ldx [%l7 + %g1], %l0; \
|
||||||
st %i0, [%l0]; \
|
st %i0, [%l0]; \
|
||||||
jmpl %i7+8, %g0; \
|
jmpl %i7+8, %g0; \
|
||||||
restore %g0, -1, %o0; \
|
restore %g0, -1, %o0; \
|
||||||
.previous;
|
.previous;
|
||||||
|
#elif USE___THREAD
|
||||||
|
# ifndef NOT_IN_libc
|
||||||
|
# define SYSCALL_ERROR_ERRNO __libc_errno
|
||||||
|
# else
|
||||||
|
# define SYSCALL_ERROR_ERRNO errno
|
||||||
|
# endif
|
||||||
|
# ifdef SHARED
|
||||||
|
# define SYSCALL_ERROR_HANDLER \
|
||||||
|
.section .gnu.linkonce.t.__sparc64.get_pic.l7,"ax",@progbits; \
|
||||||
|
.globl __sparc64.get_pic.l7; \
|
||||||
|
.hidden __sparc64.get_pic.l7; \
|
||||||
|
.type __sparc64.get_pic.l7,@function; \
|
||||||
|
__sparc64.get_pic.l7: \
|
||||||
|
retl; \
|
||||||
|
add %o7, %l7, %l7; \
|
||||||
|
.previous; \
|
||||||
|
SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
|
||||||
|
save %sp,-192,%sp; \
|
||||||
|
sethi %tie_hi22(SYSCALL_ERROR_ERRNO), %l1; \
|
||||||
|
sethi %hi(_GLOBAL_OFFSET_TABLE_-4), %l7; \
|
||||||
|
call __sparc64.get_pic.l7; \
|
||||||
|
add %l7, %lo(_GLOBAL_OFFSET_TABLE_+4), %l7; \
|
||||||
|
add %l1, %tie_lo10(SYSCALL_ERROR_ERRNO), %l1; \
|
||||||
|
ldx [%l7 + %l1], %l1, %tie_ldx(SYSCALL_ERROR_ERRNO); \
|
||||||
|
st %i0, [%g7 + %l1], %tie_add(SYSCALL_ERROR_ERRNO); \
|
||||||
|
jmpl %i7+8, %g0; \
|
||||||
|
restore %g0, -1, %o0; \
|
||||||
|
.previous;
|
||||||
|
# else
|
||||||
|
# define SYSCALL_ERROR_HANDLER \
|
||||||
|
SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
|
||||||
|
sethi %tie_hi22(SYSCALL_ERROR_ERRNO), %g1; \
|
||||||
|
sethi %hi(_GLOBAL_OFFSET_TABLE_), %g2; \
|
||||||
|
add %g1, %tie_lo10(SYSCALL_ERROR_ERRNO), %g1; \
|
||||||
|
add %g2, %lo(_GLOBAL_OFFSET_TABLE_), %g2; \
|
||||||
|
ldx [%g2 + %g1], %g1, %tie_ldx(SYSCALL_ERROR_ERRNO); \
|
||||||
|
st %o0, [%g7 + %g1], %tie_add(SYSCALL_ERROR_ERRNO); \
|
||||||
|
jmpl %o7+8, %g0; \
|
||||||
|
mov -1, %o0; \
|
||||||
|
.previous;
|
||||||
|
# endif
|
||||||
#else
|
#else
|
||||||
# define SYSCALL_ERROR_HANDLER \
|
# define SYSCALL_ERROR_HANDLER \
|
||||||
SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
|
SYSCALL_ERROR_HANDLER_ENTRY(__syscall_error_handler) \
|
||||||
|
|||||||
Reference in New Issue
Block a user