diff options
Diffstat (limited to 'libc/sysdeps/linux/mips')
-rw-r--r-- | libc/sysdeps/linux/mips/__longjmp.c | 2 | ||||
-rw-r--r-- | libc/sysdeps/linux/mips/brk.c | 5 | ||||
-rw-r--r-- | libc/sysdeps/linux/mips/clone.S | 13 | ||||
-rw-r--r-- | libc/sysdeps/linux/mips/mmap.c | 6 | ||||
-rw-r--r-- | libc/sysdeps/linux/mips/pipe.S | 11 | ||||
-rw-r--r-- | libc/sysdeps/linux/mips/pipe.c | 3 | ||||
-rw-r--r-- | libc/sysdeps/linux/mips/pread_write.c | 8 | ||||
-rw-r--r-- | libc/sysdeps/linux/mips/sigaction.c | 11 |
8 files changed, 29 insertions, 30 deletions
diff --git a/libc/sysdeps/linux/mips/__longjmp.c b/libc/sysdeps/linux/mips/__longjmp.c index 5be2e974b..fb042218b 100644 --- a/libc/sysdeps/linux/mips/__longjmp.c +++ b/libc/sysdeps/linux/mips/__longjmp.c @@ -82,3 +82,5 @@ void __longjmp (__jmp_buf env, int val_arg) /* Avoid `volatile function does return' warnings. */ for (;;); } +libc_hidden_proto(__longjmp) +libc_hidden_def(__longjmp) diff --git a/libc/sysdeps/linux/mips/brk.c b/libc/sysdeps/linux/mips/brk.c index ba6765ca7..29479f621 100644 --- a/libc/sysdeps/linux/mips/brk.c +++ b/libc/sysdeps/linux/mips/brk.c @@ -23,7 +23,7 @@ void *__curbrk = 0; -int attribute_hidden __brk (void *addr) +int brk (void *addr) { void *newbrk; @@ -48,4 +48,5 @@ int attribute_hidden __brk (void *addr) return 0; } -strong_alias(__brk,brk) +libc_hidden_proto(brk) +libc_hidden_def(brk) diff --git a/libc/sysdeps/linux/mips/clone.S b/libc/sysdeps/linux/mips/clone.S index 9c12075b3..f3b3aadb2 100644 --- a/libc/sysdeps/linux/mips/clone.S +++ b/libc/sysdeps/linux/mips/clone.S @@ -29,12 +29,12 @@ /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */ .text -.globl __clone ; +.globl clone ; .align 2; - .type __clone,@function; - .ent __clone, 0; + .type clone,@function; + .ent clone, 0; -__clone: +clone: .frame sp, 4*SZREG, sp #ifdef __PIC__ .set noreorder @@ -106,8 +106,5 @@ __thread_start: /* Call _exit rather than doing it inline for breakpoint purposes. */ move a0,v0 - jal _exit_internal + jal HIDDEN_JUMPTARGET(_exit) .end __thread_start - -.weak clone; - clone = __clone diff --git a/libc/sysdeps/linux/mips/mmap.c b/libc/sysdeps/linux/mips/mmap.c index 25a3ef5bd..125523eef 100644 --- a/libc/sysdeps/linux/mips/mmap.c +++ b/libc/sysdeps/linux/mips/mmap.c @@ -14,7 +14,7 @@ #endif #endif -#define __NR___mmap __NR_mmap -attribute_hidden _syscall6 (__ptr_t, __mmap, __ptr_t, addr, size_t, len, int, prot, +_syscall6 (__ptr_t, mmap, __ptr_t, addr, size_t, len, int, prot, int, flags, int, fd, __off_t, offset); -strong_alias(__mmap,mmap) +libc_hidden_proto(mmap) +libc_hidden_def(mmap) diff --git a/libc/sysdeps/linux/mips/pipe.S b/libc/sysdeps/linux/mips/pipe.S index fb8f7ef7f..b5664f791 100644 --- a/libc/sysdeps/linux/mips/pipe.S +++ b/libc/sysdeps/linux/mips/pipe.S @@ -8,10 +8,8 @@ #include <asm/regdef.h> .globl pipe - .globl __pipe - .hidden __pipe - .ent __pipe, 0 -__pipe: + .ent pipe, 0 +pipe: addiu sp,sp,-24 sw a0,16(sp) li v0,__NR_pipe @@ -29,6 +27,5 @@ __pipe: 2: addiu sp,sp,24 j ra - .end __pipe - .size __pipe,.-__pipe - .weak pipe; pipe = __pipe + .end pipe + .size pipe,.-pipe diff --git a/libc/sysdeps/linux/mips/pipe.c b/libc/sysdeps/linux/mips/pipe.c index fbc73b489..65e335964 100644 --- a/libc/sysdeps/linux/mips/pipe.c +++ b/libc/sysdeps/linux/mips/pipe.c @@ -6,7 +6,7 @@ #include <unistd.h> #include <syscall.h> -int attribute_hidden __pipe(int *fd) +int pipe(int *fd) { register long int res __asm__ ("$2"); // v0 register long int res2 __asm__ ("$3"); // v1 @@ -21,4 +21,3 @@ int attribute_hidden __pipe(int *fd) fd[1] = res2; return(0); } -strong_alias(__pipe,pipe) diff --git a/libc/sysdeps/linux/mips/pread_write.c b/libc/sysdeps/linux/mips/pread_write.c index 5baba30d2..4ee81d4d9 100644 --- a/libc/sysdeps/linux/mips/pread_write.c +++ b/libc/sysdeps/linux/mips/pread_write.c @@ -60,7 +60,7 @@ ssize_t __libc_pread(int fd, void *buf, size_t count, off_t offset) { return(__syscall_pread(fd,buf,count,0,__LONG_LONG_PAIR(offset>>31,offset))); } -weak_alias (__libc_pread, pread) +strong_alias(__libc_pread,pread) #if defined __UCLIBC_HAS_LFS__ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset) @@ -69,7 +69,7 @@ ssize_t __libc_pread64(int fd, void *buf, size_t count, off64_t offset) uint32_t high = offset >> 32; return(__syscall_pread(fd, buf, count, 0, __LONG_LONG_PAIR (high, low))); } -weak_alias (__libc_pread64, pread64) +strong_alias(__libc_pread64,pread64) #endif /* __UCLIBC_HAS_LFS__ */ #endif /* !__mips64 */ @@ -97,7 +97,7 @@ ssize_t __libc_pwrite(int fd, const void *buf, size_t count, off_t offset) { return(__syscall_pwrite(fd,buf,count,0,__LONG_LONG_PAIR(offset>>31,offset))); } -weak_alias (__libc_pwrite, pwrite) +strong_alias(__libc_pwrite,pwrite) #if defined __UCLIBC_HAS_LFS__ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset) @@ -106,7 +106,7 @@ ssize_t __libc_pwrite64(int fd, const void *buf, size_t count, off64_t offset) uint32_t high = offset >> 32; return(__syscall_pwrite(fd, buf, count, 0, __LONG_LONG_PAIR (high, low))); } -weak_alias (__libc_pwrite64, pwrite64) +strong_alias(__libc_pwrite64,pwrite64) #endif /* __UCLIBC_HAS_LFS__ */ #endif /* !__mips64 */ #endif /* __NR_pwrite */ diff --git a/libc/sysdeps/linux/mips/sigaction.c b/libc/sysdeps/linux/mips/sigaction.c index b2982678b..5e2d6ccde 100644 --- a/libc/sysdeps/linux/mips/sigaction.c +++ b/libc/sysdeps/linux/mips/sigaction.c @@ -30,6 +30,8 @@ #if defined __NR_rt_sigaction +libc_hidden_proto(memcpy) + /* If ACT is not NULL, change the action for SIG to *ACT. If OACT is not NULL, put the old action for SIG in *OACT. */ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oact) @@ -39,7 +41,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa if (act) { kact.k_sa_handler = act->sa_handler; - __memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask)); + memcpy (&kact.sa_mask, &act->sa_mask, sizeof (kact.sa_mask)); kact.sa_flags = act->sa_flags; # ifdef HAVE_SA_RESTORER # if _MIPS_SIM == _ABIO32 @@ -57,7 +59,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa if (oact && result >= 0) { oact->sa_handler = koact.k_sa_handler; - __memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (oact->sa_mask)); + memcpy (&oact->sa_mask, &koact.sa_mask, sizeof (oact->sa_mask)); oact->sa_flags = koact.sa_flags; # ifdef HAVE_SA_RESTORER oact->sa_restorer = koact.sa_restorer; @@ -112,6 +114,7 @@ int __libc_sigaction (int sig, const struct sigaction *act, struct sigaction *oa #endif #ifndef LIBC_SIGACTION -hidden_weak_alias(__libc_sigaction,__sigaction) -weak_alias(__libc_sigaction,sigaction) +strong_alias(__libc_sigaction,sigaction) +libc_hidden_proto(sigaction) +libc_hidden_def(sigaction) #endif |