diff options
Diffstat (limited to 'sysdeps/unix/sysv/linux/sparc')
6 files changed, 157 insertions, 70 deletions
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S b/sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S index a639511f3e..8e88a3ff04 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/__sigtrampoline.S @@ -74,24 +74,19 @@ ENTRY(____sparc_signal_trampoline) 1: #ifdef PIC /* Save return address */ - mov %o7,%o4 -___sxx: - call ___syy - nop -___syy: - sethi %hi(_GLOBAL_OFFSET_TABLE_-(___sxx-.)),%o5 - or %o5,%lo(_GLOBAL_OFFSET_TABLE_-(___sxx-.)),%o5 - add %o7,%o5,%o5 + mov %o7,%o5 +11: call 12f + sethi %hi(_GLOBAL_OFFSET_TABLE_-(11b-.)),%o4 +12: or %o5,%lo(_GLOBAL_OFFSET_TABLE_-(11b-.)),%o4 + add %o7,%o4,%o4 /* restore return address */ - mov %o4,%o7 - mov %o5,%o4 + mov %o5,%o7 /* o4 has the GOT pointer */ #endif sethi %hi(C_SYMBOL_NAME(____sig_table)),%o5 or %o5,%lo(C_SYMBOL_NAME(____sig_table)),%o5 #ifdef PIC - add %o5,%o4,%o4 - ld [%o4],%o5 + ld [%o4+%o5], %o5 #endif sll %o0,2,%o4 add %o5,%o4,%o4 @@ -141,3 +136,5 @@ ___syy: /* if we return, sysreturn failed */ mov SYS_ify(exit),%g1 t 0x10 + +END(____sparc_signal_trampoline) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c b/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c new file mode 100644 index 0000000000..e04e926644 --- /dev/null +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/getpagesize.c @@ -0,0 +1,39 @@ +/* Copyright (C) 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 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., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +#include <unistd.h> +#include <sys/param.h> + +/* Return the system page size. This value will either be 4k or 8k depending + on whether or not we are running on Sparc v9 machine. */ + +/* If we are not a static program, this value is collected from the system + via the AT_PAGESZ auxiliary argument. If we are a static program, we + have to guess. We should _really_ get Linux a proper sysconf()... */ + +extern size_t _dl_pagesize; + +int +__getpagesize () +{ + if (_dl_pagesize == 0) + _dl_pagesize = EXEC_PAGESIZE; + return _dl_pagesize; +} + +weak_alias (__getpagesize, getpagesize) diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h b/sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h index 39822fc595..9bbe6bcdab 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/init-first.h @@ -21,32 +21,76 @@ This is done in one of two ways: either in the stack context of program start, or having dlopen pass them in. */ -#define SYSDEP_CALL_INIT(NAME, INIT) \ -void NAME (void *arg) \ -{ \ - int argc; \ - char **argv, **envp; \ - /* The next variable is only here to work around a bug in gcc <= 2.7.2.2. \ - If the address would be taken inside the expression the optimizer \ - would try to be too smart and throws it away. Grrr. */ \ - int *dummy_addr = &_dl_starting_up; \ - \ - __libc_multiple_libcs = dummy_addr && !_dl_starting_up; \ - \ - if (!__libc_multiple_libcs) \ - { \ - argc = *(int *) arg; \ - argv = (char **) (arg + 4); \ - envp = &argv[argc+1]; \ - } \ - else \ - { \ - argc = (int) arg; \ - argv = ((char ***) &arg)[1]; \ - envp = ((char ***) &arg)[2]; \ - } \ - \ - INIT (argc, argv, envp); \ -} +#include <sysdep.h> +#define __S1(x) #x +#define __S(x) __S1(x) +#ifdef PIC + +#define SYSDEP_CALL_INIT(NAME, INIT) asm("\ + .weak _dl_starting_up + .global " #NAME " + .type " #NAME ",@function +" #NAME ": + save %sp, -64, %sp +1: call 11f + sethi %hi(_GLOBAL_OFFSET_TABLE_-(1b-.)), %l7 +11: or %l7, %lo(_GLOBAL_OFFSET_TABLE_-(1b-.)), %l7 + add %l7, %o7, %l7 + /* Are we a dynamic libc being loaded into a static program? */ + sethi %hi(_dl_starting_up), %l2 + or %l2, %lo(_dl_starting_up), %l2 + ld [%l7+%l2], %l2 + cmp %l2, 0 + beq 3f + sethi %hi(__libc_multiple_libcs), %l3 + ld [%l2], %l2 + subcc %g0, %l2, %g0 + subx %g0, -1, %l2 +3: or %l3, %lo(__libc_multiple_libcs), %l3 + ld [%l7+%l3], %l3 + cmp %l2, 0 + st %l2, [%l3] + /* If so, argc et al are in %o0-%o2 already. Otherwise, load them. */ + bnz " #INIT " + restore + ld [%sp+22*4], %o0 + add %sp, 23*4, %o1 + sll %o0, 2, %o2 + add %o2, %o1, %o2 + ba " #INIT " + add %o2, 4, %o2 + .size "#NAME ", .-" #NAME); + +#else + +#define SYSDEP_CALL_INIT(NAME, INIT) asm("\ + .weak _dl_starting_up + .global " #NAME " + .type " #NAME ",@function +" #NAME ": + /* Are we a dynamic libc being loaded into a static program? */ + sethi %hi(_dl_starting_up), %g2 + or %g2, %lo(_dl_starting_up), %g2 + cmp %g2, 0 + beq 3f + sethi %hi(__libc_multiple_libcs), %g3 + ld [%g4+%g2], %g2 + subcc %g0, %g2, %g0 + subx %g0, -1, %g2 +3: or %g3, %lo(__libc_multiple_libcs), %g3 + cmp %g2, 0 + st %g2, [%g3+%g4] + /* If so, argc et al are in %o0-%o2 already. Otherwise, load them. */ + bnz " #INIT " + nop + ld [%sp+22*4], %o0 + add %sp, 23*4, %o1 + sll %o0, 2, %o2 + add %o2, %o1, %o2 + ba " #INIT " + add %o2, 4, %o2 + .size "#NAME ", .-" #NAME); + +#endif diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h index 0e5a8cd218..730332f367 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/sysdep.h @@ -36,44 +36,51 @@ /* Linux/SPARC uses a different trap number */ #undef PSEUDO #undef ENTRY +#undef END +#undef LOC #define ENTRY(name) \ .global C_SYMBOL_NAME(name); \ - .align 2;\ + .align 4;\ C_LABEL(name);\ .type name,@function; +#define END(name) \ + .size name, . - name + +#define LOC(name) . ## L ## name + #ifdef PIC -#define SYSCALL_ERROR_HANDLER \ - .global C_SYMBOL_NAME(__errno_location);\ - .type C_SYMBOL_NAME(__errno_location),@function;\ - save %sp,-96,%sp;\ - call __errno_location;\ - nop;\ - st %i0,[%o0];\ - restore;\ - retl;\ +#define SYSCALL_ERROR_HANDLER \ + .global C_SYMBOL_NAME(__errno_location); \ + .type C_SYMBOL_NAME(__errno_location),@function; \ + save %sp,-96,%sp; \ + call __errno_location; \ + nop; \ + st %i0,[%o0]; \ + restore; \ + retl; \ mov -1,%o0; #else -#define SYSCALL_ERROR_HANDLER \ - save %sp,-96,%sp; \ - call __errno_location; \ - nop; \ - st %i0,[%o0]; \ - restore; \ - retl; \ +#define SYSCALL_ERROR_HANDLER \ + save %sp,-96,%sp; \ + call __errno_location; \ + nop; \ + st %i0,[%o0]; \ + restore; \ + retl; \ mov -1,%o0; #endif /* PIC */ -#define PSEUDO(name, syscall_name, args) \ - .text; \ - ENTRY(name); \ - LOADSYSCALL(syscall_name); \ - ta 0x10; \ - bcc,a 1f; \ - nop; \ - SYSCALL_ERROR_HANDLER; \ -1:; +#define PSEUDO(name, syscall_name, args) \ + .text; \ + ENTRY(name); \ + LOADSYSCALL(syscall_name); \ + ta 0x10; \ + bcc,a 9000f; \ + nop; \ + SYSCALL_ERROR_HANDLER; \ +9000:; #endif /* ASSEMBLER */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h index 222967881f..9a4666a508 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/bits/types.h @@ -42,7 +42,7 @@ typedef signed long int __int64_t; typedef unsigned long int __uint64_t; typedef __quad_t *__qaddr_t; -typedef __u_int __dev_t; /* Type of device numbers. */ +typedef __u_long __dev_t; /* Type of device numbers. */ typedef __u_int __uid_t; /* Type of user identifications. */ typedef __u_int __gid_t; /* Type of group identifications. */ typedef __u_int __ino_t; /* Type of file serial numbers. */ diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h b/sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h index 3e27c6dcf7..955714dc4f 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/init-first.h @@ -55,7 +55,7 @@ restore ldx [%sp+" __S(STACK_BIAS) "+22*8], %o0 add %sp, " __S(STACK_BIAS) "+23*8, %o1 - sll %o0, 3, %o2 + sllx %o0, 3, %o2 add %o2, %o1, %o2 ba " #INIT " add %o2, 8, %o2 @@ -83,10 +83,10 @@ nop ldx [%sp+" __S(STACK_BIAS) "+22*8], %o0 add %sp, " __S(STACK_BIAS) "+23*8, %o1 - sll %o0, 3, %o2 + sllx %o0, 3, %o2 add %o2, %o1, %o2 - add %o2, 8, %o2 - ba,a " #INIT " + ba " #INIT " + add %o2, 8, %o2 .size "#NAME ", .-" #NAME); #endif |