diff options
Diffstat (limited to 'sysdeps/sparc')
| -rw-r--r-- | sysdeps/sparc/Dist | 1 | ||||
| -rw-r--r-- | sysdeps/sparc/bsd-_setjmp.S | 47 | ||||
| -rw-r--r-- | sysdeps/sparc/bsd-setjmp.S | 44 | ||||
| -rw-r--r-- | sysdeps/sparc/divrem.m4 | 4 | ||||
| -rw-r--r-- | sysdeps/sparc/dl-machine.h | 145 | ||||
| -rw-r--r-- | sysdeps/sparc/elf/DEFS.h | 5 | ||||
| -rw-r--r-- | sysdeps/sparc/elf/start.S | 31 | ||||
| -rw-r--r-- | sysdeps/sparc/fpu_control.h | 7 | ||||
| -rw-r--r-- | sysdeps/sparc/rem.S | 4 | ||||
| -rw-r--r-- | sysdeps/sparc/sdiv.S | 4 | ||||
| -rw-r--r-- | sysdeps/sparc/setjmp.S | 44 | ||||
| -rw-r--r-- | sysdeps/sparc/udiv.S | 4 | ||||
| -rw-r--r-- | sysdeps/sparc/urem.S | 4 |
13 files changed, 227 insertions, 117 deletions
diff --git a/sysdeps/sparc/Dist b/sysdeps/sparc/Dist index ef6c44f78e..55f26143fd 100644 --- a/sysdeps/sparc/Dist +++ b/sysdeps/sparc/Dist @@ -1,4 +1,5 @@ DEFS.h +elf/DEFS.h dotmul.S umul.S divrem.m4 sdiv.S udiv.S rem.S urem.S alloca.S diff --git a/sysdeps/sparc/bsd-_setjmp.S b/sysdeps/sparc/bsd-_setjmp.S index 5b685d5496..522fe0e3a1 100644 --- a/sysdeps/sparc/bsd-_setjmp.S +++ b/sysdeps/sparc/bsd-_setjmp.S @@ -1,26 +1,43 @@ /* BSD `_setjmp' entry point to `sigsetjmp (..., 0)'. Sparc version. -Copyright (C) 1994 Free Software Foundation, Inc. -This file is part of the GNU C Library. + Copyright (C) 1994, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <sysdep.h> -ENTRY (setjmp) +ENTRY (_setjmp) +#ifdef PIC +1: + jmpl 2f,%o1 + nop +2: + sethi %hi(_GLOBAL_OFFSET_TABLE_-(1b-.)),%l7 + or %l7,%lo(_GLOBAL_OFFSET_TABLE_-(1b-.)),%l7 + add %l7,%o1,%l7 + sethi %hi(C_SYMBOL_NAME (__sigsetjmp)),%g1 + or %g1,%lo(C_SYMBOL_NAME (__sigsetjmp)),%g1 + ld [%l7+%g1],%g1 + ld [%g1],%g1 + jmpl %g1,%g0 + mov %g0,%o1 /* Pass second argument of zero */ +#else + sethi %hi(C_SYMBOL_NAME (__sigsetjmp)), %g1 or %lo(C_SYMBOL_NAME (__sigsetjmp)), %g1, %g1 jmp %g1 mov %g0, %o1 /* Pass second argument of zero. */ +#endif diff --git a/sysdeps/sparc/bsd-setjmp.S b/sysdeps/sparc/bsd-setjmp.S index b0a6326a2c..09aee661da 100644 --- a/sysdeps/sparc/bsd-setjmp.S +++ b/sysdeps/sparc/bsd-setjmp.S @@ -1,26 +1,42 @@ /* BSD `setjmp' entry point to `sigsetjmp (..., 1)'. Sparc version. -Copyright (C) 1994 Free Software Foundation, Inc. -This file is part of the GNU C Library. + Copyright (C) 1994, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <sysdep.h> ENTRY (setjmp) +#ifdef PIC +1: + jmpl 2f,%o1 + nop +2: + sethi %hi(_GLOBAL_OFFSET_TABLE_-(1b-.)),%l7 + or %l7,%lo(_GLOBAL_OFFSET_TABLE_-(1b-.)),%l7 + add %l7,%o1,%l7 + sethi %hi(C_SYMBOL_NAME (__sigsetjmp)),%g1 + or %g1,%lo(C_SYMBOL_NAME (__sigsetjmp)),%g1 + ld [%l7+%g1],%g1 + ld [%g1],%g1 + jmpl %g1,%g0 + mov 1,%o1 +#else sethi %hi(C_SYMBOL_NAME (__sigsetjmp)), %g1 or %lo(C_SYMBOL_NAME (__sigsetjmp)), %g1, %g1 jmp %g1 mov 1, %o1 /* Pass second argument of one. */ +#endif diff --git a/sysdeps/sparc/divrem.m4 b/sysdeps/sparc/divrem.m4 index bde8a21e29..cada804706 100644 --- a/sysdeps/sparc/divrem.m4 +++ b/sysdeps/sparc/divrem.m4 @@ -83,11 +83,15 @@ L.$1.eval(2**N+$2): ifelse($1, 1, `9:')')dnl #include "DEFS.h" +#ifdef __linux__ +#include <asm/traps.h> +#else #ifdef __svr4__ #include <sys/trap.h> #else #include <machine/trap.h> #endif +#endif FUNC(NAME) ifelse(S, `true', diff --git a/sysdeps/sparc/dl-machine.h b/sysdeps/sparc/dl-machine.h index ad288e15b2..5240b0cf81 100644 --- a/sysdeps/sparc/dl-machine.h +++ b/sysdeps/sparc/dl-machine.h @@ -1,5 +1,5 @@ /* Machine-dependent ELF dynamic relocation inline functions. SPARC version. - Copyright (C) 1996 Free Software Foundation, Inc. + Copyright (C) 1996, 1997 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 @@ -36,13 +36,7 @@ static inline int elf_machine_matches_host (Elf32_Half e_machine) { - switch (e_machine) - { - case EM_SPARC: - return 1; - default: - return 0; - } + return e_machine == EM_SPARC; } @@ -62,28 +56,50 @@ static inline Elf32_Addr elf_machine_load_address (void) { Elf32_Addr addr; -??? + + asm ( + "add %%fp,0x44,%%o2\n\t" /* o2 = point to argc */ + "ld [%%o2 - 4],%%o0\n\t" /* o0 = load argc */ + "sll %%o0, 2, %%o0\n\t" /* o0 = argc * sizeof (int) */ + "add %%o2,%%o0,%%o2\n\t" /* o2 = skip over argv */ + "add %%o2,4,%%o2\n\t" /* skip over null after argv */ + + /* Now %o2 is pointing to env, skip over that as well. */ + "1:\n\t" + "ld [%%o2],%%o0\n\t" + "cmp %%o0,0\n\t" + "bnz 1b\n\t" + "add %%o2,4,%%o2\n\t" + + /* Note that above, we want to advance the NULL after envp so + we always add 4. */ + + /* Now, search for the AT_BASE property. */ + "2:\n\t" + "ld [%%o2],%%o0\n\t" + "cmp %%o0,0\n\t" + "be,a 3f\n\t" + "or %%g0,%%g0,%0\n\t" + "cmp %%o0,7\n\t" /* AT_BASE = 7 */ + "be,a 3f\n\t" + "ld [%%o2+4],%0\n\t" + "b 2b\n\t" + "add %%o2,8,%%o2\n\t" + /* At this point %0 has the load address for the interpreter */ + "3:\n\t" + : "=r" (addr) + : /* no inputs */ + : "o0", "o2"); return addr; } -/* The `subl' insn above will contain an R_68K_RELATIVE relocation - entry intended to insert the run-time address of the label `here'. - This will be the first relocation in the text of the dynamic - linker; we skip it to avoid trying to modify read-only text in this - early stage. */ -#define ELF_MACHINE_BEFORE_RTLD_RELOC(dynamic_info) \ - ((dynamic_info)[DT_RELA]->d_un.d_ptr += sizeof (Elf32_Rela), \ - (dynamic_info)[DT_RELASZ]->d_un.d_val -= sizeof (Elf32_Rela)) - +#ifdef RESOLVE /* Perform the relocation specified by RELOC and SYM (which is fully resolved). MAP is the object containing the reloc. */ static inline void elf_machine_rela (struct link_map *map, - const Elf32_Rela *reloc, const Elf32_Sym *sym, - Elf32_Addr (*resolve) (const Elf32_Sym **ref, - Elf32_Addr reloc_addr, - int noplt)) + const Elf32_Rela *reloc, const Elf32_Sym *sym) { Elf32_Addr *const reloc_addr = (void *) (map->l_addr + reloc->r_offset); Elf32_Addr loadbase; @@ -91,21 +107,17 @@ elf_machine_rela (struct link_map *map, switch (ELF32_R_TYPE (reloc->r_info)) { case R_SPARC_COPY: - loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + loadbase = RESOLVE (&sym, DL_LOOKUP_NOEXEC); memcpy (reloc_addr, (void *) (loadbase + sym->st_value), sym->st_size); break; case R_SPARC_GLOB_DAT: case R_SPARC_32: - loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) : - /* RESOLVE is null during bootstrap relocation. */ - map->l_addr); + loadbase = RESOLVE (&sym, 0); *reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + reloc->r_addend); break; case R_SPARC_JMP_SLOT: - loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 1) : - /* RESOLVE is null during bootstrap relocation. */ - map->l_addr); + loadbase = RESOLVE (&sym, DL_LOOKUP_NOPLT); { Elf32_Addr value = ((sym ? (loadbase + sym->st_value) : 0) + reloc->r_addend); @@ -114,25 +126,20 @@ elf_machine_rela (struct link_map *map, } break; case R_SPARC_8: - loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + loadbase = RESOLVE (&sym, 0); *(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + reloc->r_addend); break; case R_SPARC_16: - loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + loadbase = RESOLVE (&sym, 0); *(short *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + reloc->r_addend); break; - case R_SPARC_32: - loadbase = (resolve ? (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0) : - /* RESOLVE is null during bootstrap relocation. */ - map->l_addr); - break; case R_SPARC_RELATIVE: - *reloc_addr = map->l_addr + reloc->r_addend; + *reloc_addr += map->l_addr + reloc->r_addend; break; case R_SPARC_DISP8: - loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + loadbase = RESOLVE (&sym, 0); *(char *) reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + reloc->r_addend - (Elf32_Addr) reloc_addr); @@ -144,11 +151,31 @@ elf_machine_rela (struct link_map *map, - (Elf32_Addr) reloc_addr); break; case R_SPARC_DISP32: - loadbase = (*resolve) (&sym, (Elf32_Addr) reloc_addr, 0); + loadbase = RESOLVE (&sym, 0); *reloc_addr = ((sym ? (loadbase + sym->st_value) : 0) + reloc->r_addend - (Elf32_Addr) reloc_addr); break; + case R_SPARC_LO10: + { + unsigned int saddr; + + loadbase = RESOLVE (&sym, 0); + saddr = (loadbase ? loadbase : map->l_addr) + reloc->r_addend; + + *reloc_addr = (*reloc_addr & ~0x3ff) | (saddr & 0x3ff); + } + break; + case R_SPARC_HI22: + { + unsigned int saddr; + + loadbase = RESOLVE (&sym, 0); + saddr = (loadbase ? loadbase : map->l_addr) + reloc->r_addend; + + *reloc_addr = (*reloc_addr & 0xffc00000)|(saddr >> 10); + } + break; case R_SPARC_NONE: /* Alright, Wilbur. */ break; default: @@ -172,6 +199,10 @@ elf_machine_lazy_rel (struct link_map *map, const Elf32_Rela *reloc) } } +#define ELF_ADJUST_ARG(arg) __asm__("\tadd %%fp,64,%0\n" : "=r" (arg)) + +#endif /* RESOLV */ + /* Nonzero iff TYPE describes relocation of a PLT entry, so PLT entries should not be allowed to define the value. */ #define elf_machine_pltrel_p(type) ((type) == R_SPARC_JMP_SLOT) @@ -213,26 +244,27 @@ elf_machine_runtime_setup (struct link_map *l, int lazy) plt[1] = OPCODE_CALL | (((Elf32_Addr) &_dl_runtime_resolve - (Elf32_Addr) &plt[1]) >> 2); plt[2] = OPCODE_NOP; /* Fill call delay slot. */ - plt[3] = l; + plt[3] = (Elf32_Addr *) l; } /* This code is used in dl-runtime.c to call the `fixup' function and then redirect to the address it returns. */ #define ELF_MACHINE_RUNTIME_TRAMPOLINE asm ("\ -| Trampoline for _dl_runtime_resolver +# Trampoline for _dl_runtime_resolver .globl _dl_runtime_resolve .type _dl_runtime_resolve, @function _dl_runtime_resolve: - | Pass two args to fixup: the PLT address computed from the PC saved - | in the PLT's call insn, and the reloc offset passed in %g1. - ld [%o7 + 8], %o1 | Second arg, loaded from PLTPC[2]. - call fixup - shrl %g1, 22, %o0 | First arg, set in delay slot of call. - | Jump to the real function. - jmpl %o0, %g0 - | In the delay slot of that jump, restore the register window - | saved by the first insn of the PLT. - restore + #call %g0 + # Pass two args to fixup: the PLT address computed from the PC saved + # in the PLT's call insn, and the reloc offset passed in %g1. + #ld [%o7 + 8], %o1 | Second arg, loaded from PLTPC[2]. + #call fixup + #shrl %g1, 22, %o0 | First arg, set in delay slot of call. + # Jump to the real function. + #jmpl %o0, %g0 + # In the delay slot of that jump, restore the register window + # saved by the first insn of the PLT. + #restore .size _dl_runtime_resolve, . - _dl_runtime_resolve "); /* The PLT uses Elf32_Rela relocs. */ @@ -248,4 +280,13 @@ _dl_runtime_resolve: The C function `_dl_start' is the real entry point; its return value is the user program's entry point. */ -#define RTLD_START asm (???) +#define RTLD_START __asm__ ( \ +".text\n\ + .globl _start\n\ + .type _start,@function\n\ +_start:\n\ + call _dl_start\n\ + nop\n\ + call %o0\n\ + nop\n\ +"); diff --git a/sysdeps/sparc/elf/DEFS.h b/sysdeps/sparc/elf/DEFS.h new file mode 100644 index 0000000000..84f078ae40 --- /dev/null +++ b/sysdeps/sparc/elf/DEFS.h @@ -0,0 +1,5 @@ +#define FUNC(name) \ + .global name; \ + .type name,@function; \ + .align 4; \ + name: diff --git a/sysdeps/sparc/elf/start.S b/sysdeps/sparc/elf/start.S index 6dae08bafa..db407d7bae 100644 --- a/sysdeps/sparc/elf/start.S +++ b/sysdeps/sparc/elf/start.S @@ -1,21 +1,21 @@ /* Startup code compliant to the ELF SPARC ABI. -Copyright (C) 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. + Copyright (C) 1996, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ /* This is the canonical entry point, usually the first thing in the text segment. The SVR4/SPARC ABI (NOTE: I don't actually have it) says that @@ -82,7 +82,7 @@ nofini: sll ENVP, 2, ENVP add ARGV, ENVP, ENVP /* Store ENVP in the global variable `_environ'. */ - st [TMP + %lo(_environ)], ENVP + ld [TMP + %lo(_environ)], ENVP /* Call `_init', which is the entry point to our own `.init' section; and register with `atexit' to have `exit' call @@ -100,6 +100,7 @@ nofini: mov ENVP, %o2 call exit /* This should never return. */ + nop unimp 0 /* Crash if somehow it does return. */ /* Define a symbol for the first piece of initialized data. */ diff --git a/sysdeps/sparc/fpu_control.h b/sysdeps/sparc/fpu_control.h index a8015abc29..cfd85844c3 100644 --- a/sysdeps/sparc/fpu_control.h +++ b/sysdeps/sparc/fpu_control.h @@ -53,13 +53,6 @@ /* private namespace. It should only be used by crt0.o. */ extern unsigned short __fpu_control; -__BEGIN_DECLS - -/* called by crt0.o. It can be used to manipulate 387 control word. */ -extern void __setfpucw __P ((unsigned short)); - -__END_DECLS - /* Type of the control word. */ typedef unsigned int fpu_control_t __attribute__ ((__mode__ (__HI__))); diff --git a/sysdeps/sparc/rem.S b/sysdeps/sparc/rem.S index 17662f7fd4..565fc0f678 100644 --- a/sysdeps/sparc/rem.S +++ b/sysdeps/sparc/rem.S @@ -38,11 +38,15 @@ #include "DEFS.h" +#ifdef __linux__ +#include <asm/traps.h> +#else #ifdef __svr4__ #include <sys/trap.h> #else #include <machine/trap.h> #endif +#endif FUNC(.rem) ! compute sign of result; if neither is negative, no problem diff --git a/sysdeps/sparc/sdiv.S b/sysdeps/sparc/sdiv.S index dadbb36b0a..7397e5edb8 100644 --- a/sysdeps/sparc/sdiv.S +++ b/sysdeps/sparc/sdiv.S @@ -38,11 +38,15 @@ #include "DEFS.h" +#ifdef __linux__ +#include <asm/traps.h> +#else #ifdef __svr4__ #include <sys/trap.h> #else #include <machine/trap.h> #endif +#endif FUNC(.div) ! compute sign of result; if neither is negative, no problem diff --git a/sysdeps/sparc/setjmp.S b/sysdeps/sparc/setjmp.S index db8a3c2916..d9599079c2 100644 --- a/sysdeps/sparc/setjmp.S +++ b/sysdeps/sparc/setjmp.S @@ -1,20 +1,20 @@ -/* Copyright (C) 1991, 1993, 1994, 1996 Free Software Foundation, Inc. -This file is part of the GNU C Library. +/* Copyright (C) 1991, 1993, 1994, 1996, 1997 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 Library General Public License as -published by the Free Software Foundation; either version 2 of the -License, or (at your option) any later version. + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public License as + published by the Free Software Foundation; either version 2 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 -Library General Public License for more details. + 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 + Library General Public License for more details. -You should have received a copy of the GNU Library General Public -License along with the GNU C Library; see the file COPYING.LIB. If -not, write to the Free Software Foundation, Inc., 675 Mass Ave, -Cambridge, MA 02139, USA. */ + You should have received a copy of the GNU Library General Public + License along with the GNU C Library; see the file COPYING.LIB. If not, + write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ #include <sysdep.h> @@ -25,9 +25,25 @@ ENTRY (__sigsetjmp) /* Save our SP and FP; in the delay slot of the jump, save our return PC. Save the signal mask if requested with a tail-call for simplicity; it always returns zero. */ +#ifdef PIC +2: + jmpl 1f,%g2 + nop +1: + sethi %hi(_GLOBAL_OFFSET_TABLE_-(2b-.)),%l7 + sethi %hi(C_SYMBOL_NAME (__sigjmp_save)), %g3 + st %sp, [%o0 + (JB_SP * 4)] + or %l7,%lo(_GLOBAL_OFFSET_TABLE_-(2b-.)),%l7 + or %g3,%lo(C_SYMBOL_NAME (__sigjmp_save)), %g3 + st %fp, [%o0 + (JB_FP * 4)] + ld [%l7+%g3],%g1 + jmp %g1 + st %o7, [%o0+(JB_PC*4)] +#else sethi %hi(C_SYMBOL_NAME (__sigjmp_save)), %g1 st %sp, [%o0 + (JB_SP*4)] or %lo(C_SYMBOL_NAME (__sigjmp_save)), %g1, %g1 st %fp, [%o0 + (JB_FP*4)] jmp %g1 st %o7, [%o0 + (JB_PC*4)] +#endif /* PIC */ diff --git a/sysdeps/sparc/udiv.S b/sysdeps/sparc/udiv.S index 826d01183d..252afd0193 100644 --- a/sysdeps/sparc/udiv.S +++ b/sysdeps/sparc/udiv.S @@ -38,11 +38,15 @@ #include "DEFS.h" +#ifdef __linux__ +#include <asm/traps.h> +#else #ifdef __svr4__ #include <sys/trap.h> #else #include <machine/trap.h> #endif +#endif FUNC(.udiv) diff --git a/sysdeps/sparc/urem.S b/sysdeps/sparc/urem.S index 9f64c8859e..99a5acf40a 100644 --- a/sysdeps/sparc/urem.S +++ b/sysdeps/sparc/urem.S @@ -38,11 +38,15 @@ #include "DEFS.h" +#ifdef __linux__ +#include <asm/traps.h> +#else #ifdef __svr4__ #include <sys/trap.h> #else #include <machine/trap.h> #endif +#endif FUNC(.urem) |