diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 23:04:41 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-12-10 23:04:41 +0000 |
| commit | 9184de4614953897215e989b8720ad7fe6cfde86 (patch) | |
| tree | 3fbdd8c59ed45fee7162fc51241cb59ee51afcf2 /libc/sysdeps/linux | |
| parent | f335b8c0ffb5fd7ae44d154900d78988b6abf769 (diff) | |
| download | uClibc-alpine-9184de4614953897215e989b8720ad7fe6cfde86.tar.bz2 uClibc-alpine-9184de4614953897215e989b8720ad7fe6cfde86.tar.xz | |
Finish merge from trunk, again, no really.
Diffstat (limited to 'libc/sysdeps/linux')
| -rw-r--r-- | libc/sysdeps/linux/common/ssp.c | 7 | ||||
| -rw-r--r-- | libc/sysdeps/linux/mips/pipe.S | 13 | ||||
| -rw-r--r-- | libc/sysdeps/linux/mips/pipe.c | 3 |
3 files changed, 14 insertions, 9 deletions
diff --git a/libc/sysdeps/linux/common/ssp.c b/libc/sysdeps/linux/common/ssp.c index fe7a56f71..05e53c29d 100644 --- a/libc/sysdeps/linux/common/ssp.c +++ b/libc/sysdeps/linux/common/ssp.c @@ -31,6 +31,7 @@ #define closelog __closelog #define sigfillset __sigfillset_internal #define sigdelset __sigdelset_internal +#define sigaction __sigaction #define kill __kill #include <string.h> @@ -62,9 +63,9 @@ static __always_inline void ssp_write(int fd, const char *msg1, const char *msg2 __write(fd, msg2, __strlen(msg2)); __write(fd, msg3, __strlen(msg3)); __write(fd, "()\n", 3); - __openlog("ssp", LOG_CONS | LOG_PID, LOG_USER); - __syslog(LOG_INFO, "%s%s%s()", msg1, msg2, msg3); - __closelog(); + openlog("ssp", LOG_CONS | LOG_PID, LOG_USER); + syslog(LOG_INFO, "%s%s%s()", msg1, msg2, msg3); + closelog(); } static __always_inline attribute_noreturn void terminate(void) diff --git a/libc/sysdeps/linux/mips/pipe.S b/libc/sysdeps/linux/mips/pipe.S index c3afae550..1936d7626 100644 --- a/libc/sysdeps/linux/mips/pipe.S +++ b/libc/sysdeps/linux/mips/pipe.S @@ -7,9 +7,12 @@ #include <asm/unistd.h> #include <asm/regdef.h> - .globl pipe - .ent pipe, 0 -pipe: + .globl pipe + .set pipe,__pipe + .globl __pipe + .hidden __pipe + .ent __pipe, 0 +__pipe: addiu sp,sp,-24 sw a0,16(sp) li v0,__NR_pipe @@ -27,5 +30,5 @@ pipe: 2: addiu sp,sp,24 j ra - .end pipe - .size pipe,.-pipe + .end __pipe + .size __pipe,.-__pipe diff --git a/libc/sysdeps/linux/mips/pipe.c b/libc/sysdeps/linux/mips/pipe.c index 65e335964..fbc73b489 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 pipe(int *fd) +int attribute_hidden __pipe(int *fd) { register long int res __asm__ ("$2"); // v0 register long int res2 __asm__ ("$3"); // v1 @@ -21,3 +21,4 @@ int pipe(int *fd) fd[1] = res2; return(0); } +strong_alias(__pipe,pipe) |