From 7160571c5e3ed99949f3f592246a59d01f07fea3 Mon Sep 17 00:00:00 2001 From: Atsushi Nemoto Date: Sat, 30 Jan 2010 00:24:37 +0900 Subject: getdents: Fix mips64 build On Wed, 27 Jan 2010 07:14:08 +0100, Carmelo AMOROSO wrote: > I would re-write your patch in a simpler way. > > We already have the following > > 136 #if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64 > 137 attribute_hidden strong_alias(__getdents,__getdents64) > 138 #endif > > I think that it's simpler to move in the proper place this statement. Thanks, indeed. If we came into "#elif WORDSIZE == 32" block, above condition never be true. So we can just move this statement out of "#if...#elif...#elif...#endif" block. Here is a revised patch. ------------------------------------------------------ From: Atsushi Nemoto Subject: [PATCH] getdents: Fix mips64 build Some archs (such as mips64) do not have getdents64 syscall but have getdents syscall. Define alias for it. This fixes regression from 0.9.30.1. Backgrounds: This is once done by commit e8b1c674. But after the commit 33bcf733 ("Use getdents syscall if kernel provide supports for this instead of relying upon getdents64."), if __ASSUME_GETDENTS32_D_TYPE was defined the alias for getdents64 is not defined. The macro __ASSUME_GETDENTS32_D_TYPE had been effectively ignored until 0.9.30.1 but the commit 0f0f20ab ("Move kernel-features.h header from the linuxthread directory to a common one...") really enables it. Signed-off-by: Atsushi Nemoto Signed-off-by: Khem Raj --- libc/sysdeps/linux/common/getdents.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/common/getdents.c b/libc/sysdeps/linux/common/getdents.c index 6a38772e8..5dda190a8 100644 --- a/libc/sysdeps/linux/common/getdents.c +++ b/libc/sysdeps/linux/common/getdents.c @@ -133,10 +133,6 @@ ssize_t __getdents (int fd, char *buf, size_t nbytes) return (char *) dp - buf; } -#if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64 -attribute_hidden strong_alias(__getdents,__getdents64) -#endif - #elif __WORDSIZE == 32 extern __typeof(__getdents) __getdents64 attribute_hidden; @@ -167,4 +163,8 @@ ssize_t __getdents (int fd, char *buf, size_t nbytes) #endif +#if defined __UCLIBC_HAS_LFS__ && ! defined __NR_getdents64 +attribute_hidden strong_alias(__getdents,__getdents64) +#endif + #endif -- cgit v1.2.3 From 15ba174656c69b0304a0b155b7eb741a5a5592d5 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 10 Feb 2010 15:14:14 +0100 Subject: libc: Add a common sysdep header Add a common header file to provide macros useful in asm code: C_LABEL to construct the asm name for a C symbol cfi_xxx to generate eh_frame unwind information. Ported from NPTL branch. Signed-off-by: Carmelo Amoroso --- libc/sysdeps/linux/common/sysdep.h | 139 +++++++++++++++++++++++++++++++++++++ 1 file changed, 139 insertions(+) create mode 100644 libc/sysdeps/linux/common/sysdep.h (limited to 'libc') diff --git a/libc/sysdeps/linux/common/sysdep.h b/libc/sysdeps/linux/common/sysdep.h new file mode 100644 index 000000000..cd5b2f1e3 --- /dev/null +++ b/libc/sysdeps/linux/common/sysdep.h @@ -0,0 +1,139 @@ +/* Generic asm macros used on many machines. + Copyright (C) 1991,92,93,96,98,2002,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 + +#ifndef C_LABEL + +/* Define a macro we can use to construct the asm name for a C symbol. */ +#ifndef __UCLIBC_UNDERSCORES__ +#ifdef __STDC__ +#define C_LABEL(name) name##: +#else +#define C_LABEL(name) name/**/: +#endif +#else +#ifdef __STDC__ +#define C_LABEL(name) _##name##: +#else +#define C_LABEL(name) _/**/name/**/: +#endif +#endif + +#endif + +#ifdef __ASSEMBLER__ +/* Mark the end of function named SYM. This is used on some platforms + to generate correct debugging information. */ +#ifndef END +#define END(sym) +#endif + +#ifndef JUMPTARGET +#define JUMPTARGET(sym) sym +#endif + +/* Macros to generate eh_frame unwind information. */ +# ifdef HAVE_ASM_CFI_DIRECTIVES +# define cfi_startproc .cfi_startproc +# define cfi_endproc .cfi_endproc +# define cfi_def_cfa(reg, off) .cfi_def_cfa reg, off +# define cfi_def_cfa_register(reg) .cfi_def_cfa_register reg +# define cfi_def_cfa_offset(off) .cfi_def_cfa_offset off +# define cfi_adjust_cfa_offset(off) .cfi_adjust_cfa_offset off +# define cfi_offset(reg, off) .cfi_offset reg, off +# define cfi_rel_offset(reg, off) .cfi_rel_offset reg, off +# define cfi_register(r1, r2) .cfi_register r1, r2 +# define cfi_return_column(reg) .cfi_return_column reg +# define cfi_restore(reg) .cfi_restore reg +# define cfi_same_value(reg) .cfi_same_value reg +# define cfi_undefined(reg) .cfi_undefined reg +# define cfi_remember_state .cfi_remember_state +# define cfi_restore_state .cfi_restore_state +# define cfi_window_save .cfi_window_save +# else +# define cfi_startproc +# define cfi_endproc +# define cfi_def_cfa(reg, off) +# define cfi_def_cfa_register(reg) +# define cfi_def_cfa_offset(off) +# define cfi_adjust_cfa_offset(off) +# define cfi_offset(reg, off) +# define cfi_rel_offset(reg, off) +# define cfi_register(r1, r2) +# define cfi_return_column(reg) +# define cfi_restore(reg) +# define cfi_same_value(reg) +# define cfi_undefined(reg) +# define cfi_remember_state +# define cfi_restore_state +# define cfi_window_save +# endif + +#else /* ! ASSEMBLER */ +# ifdef HAVE_ASM_CFI_DIRECTIVES +# define CFI_STRINGIFY(Name) CFI_STRINGIFY2 (Name) +# define CFI_STRINGIFY2(Name) #Name +# define CFI_STARTPROC ".cfi_startproc" +# define CFI_ENDPROC ".cfi_endproc" +# define CFI_DEF_CFA(reg, off) \ + ".cfi_def_cfa " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off) +# define CFI_DEF_CFA_REGISTER(reg) \ + ".cfi_def_cfa_register " CFI_STRINGIFY(reg) +# define CFI_DEF_CFA_OFFSET(off) \ + ".cfi_def_cfa_offset " CFI_STRINGIFY(off) +# define CFI_ADJUST_CFA_OFFSET(off) \ + ".cfi_adjust_cfa_offset " CFI_STRINGIFY(off) +# define CFI_OFFSET(reg, off) \ + ".cfi_offset " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off) +# define CFI_REL_OFFSET(reg, off) \ + ".cfi_rel_offset " CFI_STRINGIFY(reg) "," CFI_STRINGIFY(off) +# define CFI_REGISTER(r1, r2) \ + ".cfi_register " CFI_STRINGIFY(r1) "," CFI_STRINGIFY(r2) +# define CFI_RETURN_COLUMN(reg) \ + ".cfi_return_column " CFI_STRINGIFY(reg) +# define CFI_RESTORE(reg) \ + ".cfi_restore " CFI_STRINGIFY(reg) +# define CFI_UNDEFINED(reg) \ + ".cfi_undefined " CFI_STRINGIFY(reg) +# define CFI_REMEMBER_STATE \ + ".cfi_remember_state" +# define CFI_RESTORE_STATE \ + ".cfi_restore_state" +# define CFI_WINDOW_SAVE \ + ".cfi_window_save" +# else +# define CFI_STARTPROC +# define CFI_ENDPROC +# define CFI_DEF_CFA(reg, off) +# define CFI_DEF_CFA_REGISTER(reg) +# define CFI_DEF_CFA_OFFSET(off) +# define CFI_ADJUST_CFA_OFFSET(off) +# define CFI_OFFSET(reg, off) +# define CFI_REL_OFFSET(reg, off) +# define CFI_REGISTER(r1, r2) +# define CFI_RETURN_COLUMN(reg) +# define CFI_RESTORE(reg) +# define CFI_UNDEFINED(reg) +# define CFI_REMEMBER_STATE +# define CFI_RESTORE_STATE +# define CFI_WINDOW_SAVE +# endif + +#endif /* __ASSEMBLER__ */ -- cgit v1.2.3 From 60972302801d9baf8b4561fab99b2e35e2ddab90 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 10 Feb 2010 15:18:26 +0100 Subject: libc_sh: Add a sysdep header for sh A new sysdep header for sh (ported from NPTL branch) to provide some useful macros in asm code: ENTRY: an entry point visible from C PSEUDO: a wrapper for syscall with proper errno checking SYSCALL_ERROR_HANDLER: errno check (suitable for TLS) This will help in NPTL integration. Signed-off-by: Carmelo Amoroso --- libc/sysdeps/linux/sh/sysdep.h | 277 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 277 insertions(+) create mode 100644 libc/sysdeps/linux/sh/sysdep.h (limited to 'libc') diff --git a/libc/sysdeps/linux/sh/sysdep.h b/libc/sysdeps/linux/sh/sysdep.h new file mode 100644 index 000000000..6f182cd0e --- /dev/null +++ b/libc/sysdeps/linux/sh/sysdep.h @@ -0,0 +1,277 @@ +/* Assembler macros for SH. + Copyright (C) 1999, 2000, 2005 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 + +#include +#include + +#ifdef __ASSEMBLER__ + +/* Syntactic details of assembler. */ + +#define ALIGNARG(log2) log2 +/* For ELF we need the `.type' directive to make shared libs work right. */ +#define ASM_TYPE_DIRECTIVE(name,typearg) .type name,@##typearg; +#define ASM_SIZE_DIRECTIVE(name) .size name,.-name + +#ifdef SHARED +#define PLTJMP(_x) _x##@PLT +#else +#define PLTJMP(_x) _x +#endif + +/* Define an entry point visible from C. */ +#define ENTRY(name) \ + ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \ + ASM_TYPE_DIRECTIVE (C_SYMBOL_NAME(name),function) \ + .align ALIGNARG(5); \ + C_LABEL(name) \ + cfi_startproc; \ + CALL_MCOUNT + +#undef END +#define END(name) \ + cfi_endproc; \ + ASM_SIZE_DIRECTIVE(C_SYMBOL_NAME(name)) + +/* If compiled for profiling, call `mcount' at the start of each function. */ +#ifdef PROF +#define CALL_MCOUNT \ + mov.l 1f,r1; \ + sts.l pr,@-r15; \ + cfi_adjust_cfa_offset (4); \ + cfi_rel_offset (pr, 0); \ + mova 2f,r0; \ + jmp @r1; \ + lds r0,pr; \ + .align 2; \ +1: .long mcount; \ +2: lds.l @r15+,pr; \ + cfi_adjust_cfa_offset (-4); \ + cfi_restore (pr) + +#else +#define CALL_MCOUNT /* Do nothing. */ +#endif + +#ifdef __UCLIBC_UNDERSCORES__ +/* Since C identifiers are not normally prefixed with an underscore + on this system, the asm identifier `syscall_error' intrudes on the + C name space. Make sure we use an innocuous name. */ +#define syscall_error __syscall_error +#define mcount _mcount +#endif + +/* For Linux we can use the system call table in the header file + /usr/include/asm/unistd.h + of the kernel. But these symbols do not follow the SYS_* syntax + so we have to redefine the `SYS_ify' macro here. */ +#undef SYS_ify +#define SYS_ify(syscall_name) (__NR_##syscall_name) + +#define ret rts ; nop +/* The sh move insn is s, d. */ +#define MOVE(x,y) mov x , y + +/* Linux uses a negative return value to indicate syscall errors, + unlike most Unices, which use the condition codes' carry flag. + + Since version 2.1 the return value of a system call might be + negative even if the call succeeded. E.g., the `lseek' system call + might return a large offset. Therefore we must not anymore test + for < 0, but test for a real error by making sure the value in R0 + is a real error number. Linus said he will make sure the no syscall + returns a value in -1 .. -4095 as a valid result so we can savely + test with -4095. */ + +#define _IMM1 #-1 +#define _IMM12 #-12 +#undef PSEUDO +#define PSEUDO(name, syscall_name, args) \ + .text; \ + ENTRY (name); \ + DO_CALL (syscall_name, args); \ + mov r0,r1; \ + mov _IMM12,r2; \ + shad r2,r1; \ + not r1,r1; \ + tst r1,r1; \ + bf .Lpseudo_end; \ + SYSCALL_ERROR_HANDLER; \ + .Lpseudo_end: + +#undef PSEUDO_END +#define PSEUDO_END(name) \ + END (name) + +#undef PSEUDO_NOERRNO +#define PSEUDO_NOERRNO(name, syscall_name, args) \ + .text; \ + ENTRY (name); \ + DO_CALL (syscall_name, args) + +#undef PSEUDO_END_NOERRNO +#define PSEUDO_END_NOERRNO(name) \ + END (name) + +#define ret_NOERRNO ret + +#define PSEUDO_ERRVAL(name, syscall_name, args) \ + .text; \ + ENTRY (name); \ + DO_CALL (syscall_name, args); + +#undef PSEUDO_END_ERRVAL +#define PSEUDO_END_ERRVAL(name) \ + END (name) + +#define ret_ERRVAL ret + +#ifndef PIC +# define SYSCALL_ERROR_HANDLER \ + mov.l 0f,r1; \ + jmp @r1; \ + mov r0,r4; \ + .align 2; \ + 0: .long __syscall_error + +#include +#else +# ifdef RTLD_PRIVATE_ERRNO + +# define SYSCALL_ERROR_HANDLER \ + neg r0,r1; \ + mov.l 0f,r12; \ + mova 0f,r0; \ + add r0,r12; \ + mov.l 1f,r0; \ + mov.l r1,@(r0,r12) + bra .Lpseudo_end; \ + mov _IMM1,r0; \ + .align 2; \ + 0: .long _GLOBAL_OFFSET_TABLE_; \ + 1: .long rtld_errno@GOTOFF + +# elif defined _LIBC_REENTRANT + +# if USE___THREAD + +# ifndef NOT_IN_libc +# define SYSCALL_ERROR_ERRNO __libc_errno +# else +# define SYSCALL_ERROR_ERRNO errno +# endif +# define SYSCALL_ERROR_HANDLER \ + neg r0,r1; \ + mov r12,r2; \ + mov.l 0f,r12; \ + mova 0f,r0; \ + add r0,r12; \ + mov.l 1f,r0; \ + stc gbr, r4; \ + mov.l @(r0,r12),r0; \ + bra .Lskip; \ + add r4,r0; \ + .align 2; \ + 1: .long SYSCALL_ERROR_ERRNO@GOTTPOFF; \ + .Lskip: \ + mov r2,r12; \ + mov.l r1,@r0; \ + bra .Lpseudo_end; \ + mov _IMM1,r0; \ + .align 2; \ + 0: .long _GLOBAL_OFFSET_TABLE_ +# else + +# define SYSCALL_ERROR_HANDLER \ + neg r0,r1; \ + mov.l r14,@-r15; \ + mov.l r12,@-r15; \ + mov.l r1,@-r15; \ + mov.l 0f,r12; \ + mova 0f,r0; \ + add r0,r12; \ + sts.l pr,@-r15; \ + mov r15,r14; \ + mov.l 1f,r1; \ + bsrf r1; \ + nop; \ + 2: mov r14,r15; \ + lds.l @r15+,pr; \ + mov.l @r15+,r1; \ + mov.l r1,@r0; \ + mov.l @r15+,r12; \ + mov.l @r15+,r14; \ + bra .Lpseudo_end; \ + mov _IMM1,r0; \ + .align 2; \ + 0: .long _GLOBAL_OFFSET_TABLE_; \ + 1: .long PLTJMP(C_SYMBOL_NAME(__errno_location))-(2b-.) +/* A quick note: it is assumed that the call to `__errno_location' does + not modify the stack! */ +# endif +# else + +/* Store (-r0) into errno through the GOT. */ +# define SYSCALL_ERROR_HANDLER \ + neg r0,r1; \ + mov r12,r2; \ + mov.l 0f,r12; \ + mova 0f,r0; \ + add r0,r12; \ + mov.l 1f,r0; \ + mov.l @(r0,r12),r0; \ + mov r2,r12; \ + mov.l r1,@r0; \ + bra .Lpseudo_end; \ + mov _IMM1,r0; \ + .align 2; \ + 0: .long _GLOBAL_OFFSET_TABLE_; \ + 1: .long errno@GOT +# endif /* _LIBC_REENTRANT */ +#endif /* PIC */ + +# ifdef __SH4__ +# define SYSCALL_INST_PAD \ + or r0,r0; or r0,r0; or r0,r0; or r0,r0; or r0,r0 +# else +# define SYSCALL_INST_PAD +# endif + +#define SYSCALL_INST0 trapa #0x10 +#define SYSCALL_INST1 trapa #0x11 +#define SYSCALL_INST2 trapa #0x12 +#define SYSCALL_INST3 trapa #0x13 +#define SYSCALL_INST4 trapa #0x14 +#define SYSCALL_INST5 mov.l @(0,r15),r0; trapa #0x15 +#define SYSCALL_INST6 mov.l @(0,r15),r0; mov.l @(4,r15),r1; trapa #0x16 + +#undef DO_CALL +#define DO_CALL(syscall_name, args) \ + mov.l 1f,r3; \ + SYSCALL_INST##args; \ + SYSCALL_INST_PAD; \ + bra 2f; \ + nop; \ + .align 2; \ + 1: .long SYS_ify (syscall_name); \ + 2: + +#endif /* __ASSEMBLER__ */ -- cgit v1.2.3 From 63859f89f327e48037a4cdba982cd6afa3007da7 Mon Sep 17 00:00:00 2001 From: Carmelo Amoroso Date: Wed, 10 Feb 2010 15:24:03 +0100 Subject: libc_sh: Update memcpy to use the ENTRY macro Use the ENTRY macro now available through the sysdep.h header Signed-off-by: Carmelo Amoroso --- libc/string/sh/sh4/memcpy.S | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'libc') diff --git a/libc/string/sh/sh4/memcpy.S b/libc/string/sh/sh4/memcpy.S index c03c18c73..efdaf8bba 100644 --- a/libc/string/sh/sh4/memcpy.S +++ b/libc/string/sh/sh4/memcpy.S @@ -18,6 +18,7 @@ * If there is an overlap, then the results are undefined. */ +#include #include #ifdef __LITTLE_ENDIAN__ @@ -176,12 +177,7 @@ 9: rts nop -/* void * memcpy(void *dst, const void *src, size_t len) */ -.text -.align 4 -.type memcpy,@function -.globl memcpy; -memcpy: +ENTRY(memcpy) ! Calculate the invariants which will be used in the remainder ! of the code: @@ -908,6 +904,5 @@ memcpy: rts mov.b r1,@-r0 -.size memcpy,.-memcpy; - +END(memcpy) libc_hidden_def (memcpy) -- cgit v1.2.3 From c034b2e1655dd2856f8b6f3247e6e406e46c24a4 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 4 Mar 2010 12:59:10 +0100 Subject: poll: unavailable on linux < 2.2.0 fixes bug #253 Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/common/bits/kernel-features.h | 5 +++++ libc/sysdeps/linux/common/poll.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h index 88297349a..b04ad6d3e 100644 --- a/libc/sysdeps/linux/common/bits/kernel-features.h +++ b/libc/sysdeps/linux/common/bits/kernel-features.h @@ -28,6 +28,11 @@ #include #define __LINUX_KERNEL_VERSION LINUX_VERSION_CODE +/* When was `poll' introduced? */ +#if __LINUX_KERNEL_VERSION >= 131584 +# define __ASSUME_POLL_SYSCALL 1 +#endif + /* Real-time signal became usable in 2.1.70. */ #if __LINUX_KERNEL_VERSION >= 131398 # define __ASSUME_REALTIME_SIGNALS 1 diff --git a/libc/sysdeps/linux/common/poll.c b/libc/sysdeps/linux/common/poll.c index 4a6f06e19..52f6c76b4 100644 --- a/libc/sysdeps/linux/common/poll.c +++ b/libc/sysdeps/linux/common/poll.c @@ -19,8 +19,9 @@ #include #include +#include -#ifdef __NR_poll +#if defined __ASSUME_POLL_SYSCALL && defined __NR_poll _syscall3(int, poll, struct pollfd *, fds, unsigned long int, nfds, int, timeout) -- cgit v1.2.3 From 8f298a7c3593d6bdc29f45d9c5eda5a5503812f4 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Wed, 3 Mar 2010 21:38:49 +0100 Subject: pull kernel-features.h from NPTL Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/common/bits/kernel-features.h | 410 ++++++++++++++++++++++- 1 file changed, 392 insertions(+), 18 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/common/bits/kernel-features.h b/libc/sysdeps/linux/common/bits/kernel-features.h index b04ad6d3e..68b881c09 100644 --- a/libc/sysdeps/linux/common/bits/kernel-features.h +++ b/libc/sysdeps/linux/common/bits/kernel-features.h @@ -26,7 +26,25 @@ #endif #include -#define __LINUX_KERNEL_VERSION LINUX_VERSION_CODE +#define __LINUX_KERNEL_VERSION LINUX_VERSION_CODE + +/* We assume for __LINUX_KERNEL_VERSION the same encoding used in + linux/version.h. I.e., the major, minor, and subminor all get a + byte with the major number being in the highest byte. This means + we can do numeric comparisons. + + In the following we will define certain symbols depending on + whether the describes kernel feature is available in the kernel + version given by __LINUX_KERNEL_VERSION. We are not always exactly + recording the correct versions in which the features were + introduced. If somebody cares these values can afterwards be + corrected. Most of the numbers here are set corresponding to + 2.2.0. */ + +/* `getcwd' system call. */ +#if __LINUX_KERNEL_VERSION >= 131584 +# define __ASSUME_GETCWD_SYSCALL 1 +#endif /* When was `poll' introduced? */ #if __LINUX_KERNEL_VERSION >= 131584 @@ -38,16 +56,101 @@ # define __ASSUME_REALTIME_SIGNALS 1 #endif -/* Beginning with 2.5.63 support for realtime and monotonic clocks and - timers based on them is available. */ -#if __LINUX_KERNEL_VERSION >= 132415 -# define __ASSUME_POSIX_TIMERS 1 +/* When were the `pread'/`pwrite' syscalls introduced? */ +#if __LINUX_KERNEL_VERSION >= 131584 +# define __ASSUME_PREAD_SYSCALL 1 +# define __ASSUME_PWRITE_SYSCALL 1 #endif -/* On x86, the set_thread_area syscall was introduced in 2.5.29, but its - semantics was changed in 2.5.30, and again after 2.5.31. */ -#if __LINUX_KERNEL_VERSION >= 132384 && defined __i386__ -# define __ASSUME_SET_THREAD_AREA_SYSCALL 1 +/* When was `poll' introduced? */ +#if __LINUX_KERNEL_VERSION >= 131584 +# define __ASSUME_POLL_SYSCALL 1 +#endif + +/* The `lchown' syscall was introduced in 2.1.80. */ +#if __LINUX_KERNEL_VERSION >= 131408 +# define __ASSUME_LCHOWN_SYSCALL 1 +#endif + +/* When did the `setresuid' sysall became available? */ +#if __LINUX_KERNEL_VERSION >= 131584 && !defined __sparc__ +# define __ASSUME_SETRESUID_SYSCALL 1 +#endif + +/* The SIOCGIFNAME ioctl is available starting with 2.1.50. */ +#if __LINUX_KERNEL_VERSION >= 131408 +# define __ASSUME_SIOCGIFNAME 1 +#endif + +/* MSG_NOSIGNAL was at least available with Linux 2.2.0. */ +#if __LINUX_KERNEL_VERSION >= 131584 +# define __ASSUME_MSG_NOSIGNAL 1 +#endif + +/* On x86 another `getrlimit' syscall was added in 2.3.25. */ +#if __LINUX_KERNEL_VERSION >= 131865 && defined __i386__ +# define __ASSUME_NEW_GETRLIMIT_SYSCALL 1 +#endif + +/* On x86 the truncate64/ftruncate64 syscalls were introduced in 2.3.31. */ +#if __LINUX_KERNEL_VERSION >= 131871 && defined __i386__ +# define __ASSUME_TRUNCATE64_SYSCALL 1 +#endif + +/* On x86 the mmap2 syscall was introduced in 2.3.31. */ +#if __LINUX_KERNEL_VERSION >= 131871 && defined __i386__ +# define __ASSUME_MMAP2_SYSCALL 1 +#endif + +/* On x86 the stat64/lstat64/fstat64 syscalls were introduced in 2.3.34. */ +#if __LINUX_KERNEL_VERSION >= 131874 && defined __i386__ +# define __ASSUME_STAT64_SYSCALL 1 +#endif + +/* On sparc and ARM the truncate64/ftruncate64/mmap2/stat64/lstat64/fstat64 + syscalls were introduced in 2.3.35. */ +#if __LINUX_KERNEL_VERSION >= 131875 && (defined __sparc__ || defined __arm__) +# define __ASSUME_TRUNCATE64_SYSCALL 1 +# define __ASSUME_MMAP2_SYSCALL 1 +# define __ASSUME_STAT64_SYSCALL 1 +#endif + +/* I know for sure that getrlimit are in 2.3.35 on powerpc. */ +#if __LINUX_KERNEL_VERSION >= 131875 && defined __powerpc__ +# define __ASSUME_NEW_GETRLIMIT_SYSCALL 1 +#endif + +/* I know for sure that these are in 2.3.35 on powerpc. But PowerPC64 does not + support separate 64-bit syscalls, already 64-bit */ +#if __LINUX_KERNEL_VERSION >= 131875 && defined __powerpc__ \ + && !defined __powerpc64__ +# define __ASSUME_TRUNCATE64_SYSCALL 1 +# define __ASSUME_STAT64_SYSCALL 1 +#endif + +/* Linux 2.3.39 introduced 32bit UID/GIDs. Some platforms had 32 + bit type all along. */ +#if __LINUX_KERNEL_VERSION >= 131879 || defined __powerpc__ || defined __mips__ +# define __ASSUME_32BITUIDS 1 +#endif + +/* Linux 2.3.39 sparc added setresuid. */ +#if __LINUX_KERNEL_VERSION >= 131879 && defined __sparc__ +# define __ASSUME_SETRESUID_SYSCALL 1 +#endif + +#if __LINUX_KERNEL_VERSION >= 131879 +# define __ASSUME_SETRESGID_SYSCALL 1 +#endif + +/* Linux 2.3.39 introduced IPC64. Except for powerpc. */ +#if __LINUX_KERNEL_VERSION >= 131879 && !defined __powerpc__ +# define __ASSUME_IPC64 1 +#endif + +/* MIPS platforms had IPC64 all along. */ +#if defined __mips__ +# define __ASSUME_IPC64 1 #endif /* We can use the LDTs for threading with Linux 2.3.99 and newer. */ @@ -55,6 +158,74 @@ # define __ASSUME_LDT_WORKS 1 #endif +/* Linux 2.4.0 on PPC introduced a correct IPC64. But PowerPC64 does not + support a separate 64-bit sys call, already 64-bit */ +#if __LINUX_KERNEL_VERSION >= 132096 && defined __powerpc__ \ + && !defined __powerpc64__ +# define __ASSUME_IPC64 1 +#endif + +/* SH kernels got stat64, mmap2, and truncate64 during 2.4.0-test. */ +#if __LINUX_KERNEL_VERSION >= 132096 && defined __sh__ +# define __ASSUME_TRUNCATE64_SYSCALL 1 +# define __ASSUME_MMAP2_SYSCALL 1 +# define __ASSUME_STAT64_SYSCALL 1 +#endif + +/* The changed st_ino field appeared in 2.4.0-test6. But we cannot + distinguish this version from other 2.4.0 releases. Therefore play + save and assume it available is for 2.4.1 and up. However, SH is lame, + and still does not have a 64-bit inode field. */ +#if __LINUX_KERNEL_VERSION >= 132097 && !defined __alpha__ && !defined __sh__ +# define __ASSUME_ST_INO_64_BIT 1 +#endif + +/* To support locking of large files a new fcntl() syscall was introduced + in 2.4.0-test7. We test for 2.4.1 for the earliest version we know + the syscall is available. */ +#if __LINUX_KERNEL_VERSION >= 132097 && (defined __i386__ || defined __sparc__) +# define __ASSUME_FCNTL64 1 +#endif + +/* The AT_CLKTCK auxiliary vector entry was introduction in the 2.4.0 + series. */ +#if __LINUX_KERNEL_VERSION >= 132097 +# define __ASSUME_AT_CLKTCK 1 +#endif + +/* Arm got fcntl64 in 2.4.4, PowerPC and SH have it also in 2.4.4 (I + don't know when it got introduced). But PowerPC64 does not support + separate FCNTL64 call, FCNTL is already 64-bit */ +#if __LINUX_KERNEL_VERSION >= 132100 \ + && (defined __arm__ || defined __powerpc__ || defined __sh__) \ + && !defined __powerpc64__ +# define __ASSUME_FCNTL64 1 +#endif + +/* The getdents64 syscall was introduced in 2.4.0-test7. We test for + 2.4.1 for the earliest version we know the syscall is available. */ +#if __LINUX_KERNEL_VERSION >= 132097 +# define __ASSUME_GETDENTS64_SYSCALL 1 +#endif + +/* When did O_DIRECTORY became available? Early in 2.3 but when? + Be safe, use 2.3.99. */ +#if __LINUX_KERNEL_VERSION >= 131939 +# define __ASSUME_O_DIRECTORY 1 +#endif + +/* Starting with one of the 2.4.0 pre-releases the Linux kernel passes + up the page size information. */ +#if __LINUX_KERNEL_VERSION >= 132097 +# define __ASSUME_AT_PAGESIZE 1 +#endif + +/* Starting with at least 2.4.0 the kernel passes the uid/gid unconditionally + up to the child. */ +#if __LINUX_KERNEL_VERSION >= 132097 +# define __ASSUME_AT_XID 1 +#endif + /* Starting with 2.4.5 kernels PPC passes the AUXV in the standard way and the vfork syscall made it into the official kernel. */ #if __LINUX_KERNEL_VERSION >= (132096+5) && defined __powerpc__ @@ -62,17 +233,72 @@ # define __ASSUME_VFORK_SYSCALL 1 #endif +/* Starting with 2.4.5 kernels the mmap2 syscall made it into the official + kernel. But PowerPC64 does not support a separate MMAP2 call. */ +#if __LINUX_KERNEL_VERSION >= (132096+5) && defined __powerpc__ \ + && !defined __powerpc64__ +# define __ASSUME_MMAP2_SYSCALL 1 +#endif + +/* Starting with 2.4.21 PowerPC implements the new prctl syscall. + This allows applications to get/set the Floating Point Exception Mode. */ +#if __LINUX_KERNEL_VERSION >= (132096+21) && defined __powerpc__ +# define __ASSUME_NEW_PRCTL_SYSCALL 1 +#endif + +/* Starting with 2.4.21 the PowerPC32 clone syscall works as expected. */ +#if __LINUX_KERNEL_VERSION >= (132096+21) && defined __powerpc__ \ + && !defined __powerpc64__ +# define __ASSUME_FIXED_CLONE_SYSCALL 1 +#endif + +/* Starting with 2.4.21 PowerPC64 implements the new rt_sigreturn syscall. + The new rt_sigreturn takes an ucontext pointer allowing rt_sigreturn + to be used in the set/swapcontext implementation. */ +#if __LINUX_KERNEL_VERSION >= (132096+21) && defined __powerpc64__ +# define __ASSUME_NEW_RT_SIGRETURN_SYSCALL 1 +#endif + +/* On x86, the set_thread_area syscall was introduced in 2.5.29, but its + semantics was changed in 2.5.30, and again after 2.5.31. */ +#if __LINUX_KERNEL_VERSION >= 132384 && defined __i386__ +# define __ASSUME_SET_THREAD_AREA_SYSCALL 1 +#endif + /* The vfork syscall on x86 and arm was definitely available in 2.4. */ #if __LINUX_KERNEL_VERSION >= 132097 && (defined __i386__ || defined __arm__) # define __ASSUME_VFORK_SYSCALL 1 #endif -/* Starting with version 2.6.4-rc1 the getdents syscall returns d_type - * information as well and in between 2.6.5 and 2.6.8 most compat wrappers - * were fixed too. Except s390{,x} which was fixed in 2.6.11. */ -#if (__LINUX_KERNEL_VERSION >= 0x020608 && !defined __s390__) \ - || (__LINUX_KERNEL_VERSION >= 0x02060b && defined __s390__) -# define __ASSUME_GETDENTS32_D_TYPE 1 +/* There are an infinite number of PA-RISC kernel versions numbered + 2.4.0. But they've not really been released as such. We require + and expect the final version here. */ +#ifdef __hppa__ +# define __ASSUME_32BITUIDS 1 +# define __ASSUME_TRUNCATE64_SYSCALL 1 +# define __ASSUME_MMAP2_SYSCALL 1 +# define __ASSUME_STAT64_SYSCALL 1 +# define __ASSUME_IPC64 1 +# define __ASSUME_ST_INO_64_BIT 1 +# define __ASSUME_FCNTL64 1 +# define __ASSUME_GETDENTS64_SYSCALL 1 +#endif + +/* Alpha switched to a 64-bit timeval sometime before 2.2.0. */ +#if __LINUX_KERNEL_VERSION >= 131584 && defined __alpha__ +# define __ASSUME_TIMEVAL64 1 +#endif + +#if defined __mips__ && _MIPS_SIM == _ABIN32 +# define __ASSUME_FCNTL64 1 +#endif + +/* The late 2.5 kernels saw a lot of new CLONE_* flags. Summarize + their availability with one define. The changes were made first + for i386 and the have to be done separately for the other archs. + For i386 we pick 2.5.50 as the first version with support. */ +#if __LINUX_KERNEL_VERSION >= 132402 && defined __i386__ +# define __ASSUME_CLONE_THREAD_FLAGS 1 #endif /* Support for various CLOEXEC and NONBLOCK flags was added for x86, @@ -92,7 +318,155 @@ # define __ASSUME_VFORK_SYSCALL 1 #endif -/* This header was added somewhere around 2.6.13 */ -#if __LINUX_KERNEL_VERSION >= 132621 -# define HAVE_LINUX_CPUMASK_H 1 +/* Beginning with 2.5.63 support for realtime and monotonic clocks and + timers based on them is available. */ +#if __LINUX_KERNEL_VERSION >= 132415 +# define __ASSUME_POSIX_TIMERS 1 +#endif + +/* Beginning with 2.6.12 the clock and timer supports CPU clocks. */ +#if __LINUX_KERNEL_VERSION >= 0x2060c +# define __ASSUME_POSIX_CPU_TIMERS 1 +#endif + +/* The late 2.5 kernels saw a lot of new CLONE_* flags. Summarize + their availability with one define. The changes were made first + for i386 and the have to be done separately for the other archs. + For ia64, s390*, PPC, x86-64 we pick 2.5.64 as the first version + with support. */ +#if __LINUX_KERNEL_VERSION >= 132416 \ + && (defined __ia64__ || defined __s390__ || defined __powerpc__ \ + || defined __x86_64__ || defined __sh__) +# define __ASSUME_CLONE_THREAD_FLAGS 1 +#endif + +/* With kernel 2.4.17 we always have netlink support. */ +#if __LINUX_KERNEL_VERSION >= (132096+17) +# define __ASSUME_NETLINK_SUPPORT 1 +#endif + +/* The requeue futex functionality was introduced in 2.5.70. */ +#if __LINUX_KERNEL_VERSION >= 132422 +# define __ASSUME_FUTEX_REQUEUE 1 +#endif + +/* The statfs64 syscalls are available in 2.5.74. */ +#if __LINUX_KERNEL_VERSION >= 132426 +# define __ASSUME_STATFS64 1 +#endif + +/* Starting with at least 2.5.74 the kernel passes the setuid-like exec + flag unconditionally up to the child. */ +#if __LINUX_KERNEL_VERSION >= 132426 +# define __ASSUME_AT_SECURE 1 +#endif + +/* Starting with the 2.5.75 kernel the kernel fills in the correct value + in the si_pid field passed as part of the siginfo_t struct to signal + handlers. */ +#if __LINUX_KERNEL_VERSION >= 132427 +# define __ASSUME_CORRECT_SI_PID 1 +#endif + +/* The tgkill syscall was instroduced for i386 in 2.5.75. For Alpha + it was introduced in 2.6.0-test1 which unfortunately cannot be + distinguished from 2.6.0. On x86-64, ppc, and ppc64 it was + introduced in 2.6.0-test3. */ +#if (__LINUX_KERNEL_VERSION >= 132427 && defined __i386__) \ + || (__LINUX_KERNEL_VERSION >= 132609 && defined __alpha__) \ + || (__LINUX_KERNEL_VERSION >= 132609 && defined __x86_64__) \ + || (__LINUX_KERNEL_VERSION >= 132609 && defined __powerpc__) \ + || (__LINUX_KERNEL_VERSION >= 132609 && defined __sh__) +# define __ASSUME_TGKILL 1 +#endif + +/* The utimes syscall has been available for some architectures + forever. For x86 it was introduced after 2.5.75, for x86-64, + ppc, and ppc64 it was introduced in 2.6.0-test3. */ +#if defined __alpha__ || defined __ia64__ || defined __hppa__ \ + || defined __sparc__ \ + || (__LINUX_KERNEL_VERSION > 132427 && defined __i386__) \ + || (__LINUX_KERNEL_VERSION > 132609 && defined __x86_64__) \ + || (__LINUX_KERNEL_VERSION >= 132609 && defined __powerpc__) \ + || (__LINUX_KERNEL_VERSION >= 132609 && defined __sh__) +# define __ASSUME_UTIMES 1 #endif + +// XXX Disabled for now since the semantics we want is not achieved. +#if 0 +/* The CLONE_STOPPED flag was introduced in the 2.6.0-test1 series. */ +#if __LINUX_KERNEL_VERSION >= 132609 +# define __ASSUME_CLONE_STOPPED 1 +#endif +#endif + +/* The fixed version of the posix_fadvise64 syscall appeared in + 2.6.0-test3. At least for x86. Powerpc support appeared in + 2.6.2, but for 32-bit userspace only. */ +#if (__LINUX_KERNEL_VERSION >= 132609 && defined __i386__) \ + || (__LINUX_KERNEL_VERSION >= 132610 && defined __powerpc__ \ + && !defined __powerpc64__) +# define __ASSUME_FADVISE64_64_SYSCALL 1 +#endif + +/* The PROT_GROWSDOWN/PROT_GROWSUP flags were introduced in the 2.6.0-test + series. */ +#if __LINUX_KERNEL_VERSION >= 132609 +# define __ASSUME_PROT_GROWSUPDOWN 1 +#endif + +/* Starting with 2.6.0 PowerPC adds signal/swapcontext support for Vector + SIMD (AKA Altivec, VMX) instructions and register state. This changes + the overall size of the sigcontext and adds the swapcontext syscall. */ +#if __LINUX_KERNEL_VERSION >= 132608 && defined __powerpc__ +# define __ASSUME_SWAPCONTEXT_SYSCALL 1 +#endif + +/* The CLONE_DETACHED flag is not necessary in 2.6.2 kernels, it is + implied. */ +#if __LINUX_KERNEL_VERSION >= 132610 +# define __ASSUME_NO_CLONE_DETACHED 1 +#endif + +/* Starting with version 2.6.4-rc1 the getdents syscall returns d_type + information as well and in between 2.6.5 and 2.6.8 most compat wrappers + were fixed too. Except s390{,x} which was fixed in 2.6.11. */ +#if (__LINUX_KERNEL_VERSION >= 0x020608 && !defined __s390__) \ + || (__LINUX_KERNEL_VERSION >= 0x02060b && defined __s390__) +# define __ASSUME_GETDENTS32_D_TYPE 1 +#endif + +/* Starting with version 2.5.3, the initial location returned by `brk' + after exec is always rounded up to the next page. */ +#if __LINUX_KERNEL_VERSION >= 132355 +# define __ASSUME_BRK_PAGE_ROUNDED 1 +#endif + +/* Starting with version 2.6.9, the waitid system call is available. + Except for powerpc and powerpc64, where it is available in 2.6.12. */ +#if (__LINUX_KERNEL_VERSION >= 0x020609 && !defined __powerpc__) \ + || (__LINUX_KERNEL_VERSION >= 0x02060c && defined __powerpc__) +# define __ASSUME_WAITID_SYSCALL 1 +#endif + +/* Starting with version 2.6.9, SSI_IEEE_RAISE_EXCEPTION exists. */ +#if __LINUX_KERNEL_VERSION >= 0x020609 && defined __alpha__ +#define __ASSUME_IEEE_RAISE_EXCEPTION 1 +#endif + +/* Support for the FUTEX_CLOCK_REALTIME flag was added in 2.6.29. */ +#if __LINUX_KERNEL_VERSION >= 0x02061d +# define __ASSUME_FUTEX_CLOCK_REALTIME 1 +#endif + +/* Support for PI futexes was added in 2.6.18. */ +#if __LINUX_KERNEL_VERSION >= 0x020612 +# define __ASSUME_FUTEX_LOCK_PI 1 +#endif + +/* Support for private futexes was added in 2.6.22. */ +#if __LINUX_KERNEL_VERSION >= 0x020616 +# define __ASSUME_PRIVATE_FUTEX 1 +#endif + + -- cgit v1.2.3 From 919d99c7c00655a0376ed0ba0f22b1bba7510583 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Mon, 15 Mar 2010 11:04:05 +0100 Subject: nios2: Add sys/user.h This is a fixed version containing copyright information. The patch should now apply using 'git am'. linux/user.h is no longer exported during kernel make headers_install Signed-off-by: Atle Nissestad Signed-off-by: Tobias Klauser Signed-off-by: Bernhard Reutner-Fischer --- libc/sysdeps/linux/nios2/sys/user.h | 93 +++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 libc/sysdeps/linux/nios2/sys/user.h (limited to 'libc') diff --git a/libc/sysdeps/linux/nios2/sys/user.h b/libc/sysdeps/linux/nios2/sys/user.h new file mode 100644 index 000000000..b34e93e97 --- /dev/null +++ b/libc/sysdeps/linux/nios2/sys/user.h @@ -0,0 +1,93 @@ +#ifndef _SYS_USER_H +#define _SYS_USER_H 1 + +/* + This file was taken from the nios2 port of the Linux Kernel. + + Copyright (c) 2008 Atle Nissestad + Copyright (c) 2010 Tobias Klauser + + This file is licensed under the terms of the GNU General Public License, + Version 2. + */ + +#include + +/* Core file format: The core file is written in such a way that gdb + can understand it and provide useful information to the user (under + linux we use the 'trad-core' bfd). There are quite a number of + obstacles to being able to view the contents of the floating point + registers, and until these are solved you will not be able to view the + contents of them. Actually, you can read in the core file and look at + the contents of the user struct to find out what the floating point + registers contain. + The actual file contents are as follows: + UPAGE: 1 page consisting of a user struct that tells gdb what is present + in the file. Directly after this is a copy of the task_struct, which + is currently not used by gdb, but it may come in useful at some point. + All of the registers are stored as part of the upage. The upage should + always be only one page. + DATA: The data area is stored. We use current->end_text to + current->brk to pick up all of the user variables, plus any memory + that may have been malloced. No attempt is made to determine if a page + is demand-zero or if a page is totally unused, we just cover the entire + range. All of the addresses are rounded in such a way that an integral + number of pages is written. + STACK: We need the stack information in order to get a meaningful + backtrace. We need to write the data from (esp) to + current->start_stack, so we round each of these off in order to be able + to write an integer number of pages. + The minimum core file size is 3 pages, or 12288 bytes. +*/ + +struct user_nios2fp_struct { +}; + +/* This is the old layout of "struct pt_regs" as of Linux 1.x, and + is still the layout used by user (the new pt_regs doesn't have + all registers). */ +struct user_regs_struct { + long r1,r2,r3,r4,r5,r6,r7,r8; + long r9,r10,r11,r12,r13,r14,r15; + long r16,r17,r18,r19,r20,r21,r22,r23; + long gp; + long sp; + long ra; + long fp; + long orig_r2; + long estatus; + long status_extension; + long ea; +}; + +/* When the kernel dumps core, it starts by dumping the user struct - + this will be used by gdb to figure out where the data and stack segments + are within the file, and what virtual addresses to use. */ +struct user { +/* We start with the registers, to mimic the way that "memory" is returned + from the ptrace(3,...) function. */ + struct user_regs_struct regs; /* Where the registers are actually stored */ + +/* The rest of this junk is to help gdb figure out what goes where */ + unsigned long int u_tsize; /* Text segment size (pages). */ + unsigned long int u_dsize; /* Data segment size (pages). */ + unsigned long int u_ssize; /* Stack segment size (pages). */ + unsigned long start_code; /* Starting virtual address of text. */ + unsigned long start_stack; /* Starting virtual address of stack area. + This is actually the bottom of the stack, + the top of the stack is always found in the + esp register. */ + long int signal; /* Signal that caused the core dump. */ + int reserved; /* No longer used */ + unsigned long u_ar0; /* Used by gdb to help find the values for */ + /* the registers. */ + unsigned long magic; /* To uniquely identify a core file */ + char u_comm[32]; /* User command that was responsible */ +}; + +#define NBPG PAGE_SIZE +#define UPAGES 1 +#define HOST_TEXT_START_ADDR (u.start_code) +#define HOST_STACK_END_ADDR (u.start_stack + u.u_ssize * NBPG) + +#endif -- cgit v1.2.3 From 266aaaf46e136d63532a797fd8604e30d4350443 Mon Sep 17 00:00:00 2001 From: Michael Deutschmann Date: Wed, 17 Mar 2010 13:36:34 +0100 Subject: lift printf field width limit uClibc mishandles printf field width limits larger than 40959, as a result of misguided overflow-protection code. This causes spurious test failures with GNU coreutils, which depends on "%65536s" and "%20000000f" working according to spec. Signed-off-by: Michael Deutschmann Signed-off-by: Bernhard Reutner-Fischer --- libc/stdio/_vfprintf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'libc') diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c index f288cb501..6fa8ecb8d 100644 --- a/libc/stdio/_vfprintf.c +++ b/libc/stdio/_vfprintf.c @@ -161,9 +161,6 @@ /* Now controlled by uClibc_stdio.h. */ /* #define __UCLIBC_HAS_GLIBC_CUSTOM_PRINTF__ */ -/* TODO -- move these to a configuration section? */ -#define MAX_FIELD_WIDTH 4095 - #ifdef __UCLIBC_MJN3_ONLY__ #ifdef L_register_printf_function /* emit only once */ @@ -893,8 +890,11 @@ int attribute_hidden _ppfs_parsespec(ppfs_t *ppfs) } i = 0; while (isdigit(*fmt)) { - if (i < MAX_FIELD_WIDTH) { /* Avoid overflow. */ + if (i < INT_MAX / 10 + || (i == INT_MAX / 10 && (*fmt - '0') <= INT_MAX % 10)) { i = (i * 10) + (*fmt - '0'); + } else { + i = INT_MAX; /* best we can do... */ } ++fmt; } -- cgit v1.2.3 From bfb15be4e65cdcd214794060b154baeca57d8338 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 18 Mar 2010 12:24:07 +0100 Subject: nios2: Update fcntl.h from m68k Signed-off-by: Tobias Klauser Signed-off-by: Austin Foxley --- libc/sysdeps/linux/nios2/bits/fcntl.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/nios2/bits/fcntl.h b/libc/sysdeps/linux/nios2/bits/fcntl.h index 7d0bcf946..e564b4217 100644 --- a/libc/sysdeps/linux/nios2/bits/fcntl.h +++ b/libc/sysdeps/linux/nios2/bits/fcntl.h @@ -1,5 +1,5 @@ /* O_*, F_*, FD_* bit values for Linux. - Copyright (C) 2000 Free Software Foundation, Inc. + Copyright (C) 2000, 2004 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 @@ -48,6 +48,8 @@ # define O_DIRECTORY 040000 /* Must be a directory. */ # define O_NOFOLLOW 0100000 /* Do not follow links. */ # define O_DIRECT 0200000 /* Direct disk access. */ +# define O_NOATIME 01000000 /* Do not set atime. */ +# define O_CLOEXEC 02000000 /* set close_on_exec */ #endif /* For now Linux has synchronisity options for data and read operations. @@ -81,7 +83,7 @@ #define F_SETLK64 13 /* Set record locking info (non-blocking). */ #define F_SETLKW64 14 /* Set record locking info (blocking). */ -#if defined __USE_BSD || defined __USE_XOPEN2K +#if defined __USE_BSD || defined __USE_UNIX98 # define F_SETOWN 8 /* Get owner of socket (receiver of SIGIO). */ # define F_GETOWN 9 /* Set owner of socket (receiver of SIGIO). */ #endif -- cgit v1.2.3 From 41d4cc097c3ff663b2379e9740eff4f7946903c5 Mon Sep 17 00:00:00 2001 From: Tobias Klauser Date: Thu, 18 Mar 2010 12:24:08 +0100 Subject: nios2: Define INTERNAL_SYSCALL_NCS, use common sycall defines Define the nios2 version of INTERNAL_SYSCALL_NCS and remove all sycall defines already defined by the common syscall defines. This will make the master branch of uClibc compile again for nios2. Signed-off-by: Tobias Klauser Signed-off-by: Austin Foxley --- libc/sysdeps/linux/nios2/bits/syscalls.h | 359 ++++++++----------------------- 1 file changed, 85 insertions(+), 274 deletions(-) (limited to 'libc') diff --git a/libc/sysdeps/linux/nios2/bits/syscalls.h b/libc/sysdeps/linux/nios2/bits/syscalls.h index ec5370712..f80bea206 100644 --- a/libc/sysdeps/linux/nios2/bits/syscalls.h +++ b/libc/sysdeps/linux/nios2/bits/syscalls.h @@ -9,287 +9,98 @@ #include #include -#define __syscall_return(type, res) \ -do { \ - if ((unsigned long)(res) >= (unsigned long)(-125)) { \ - \ - /* avoid using res which is declared to be in \ - register r2; errno might expand to a function \ - call and clobber it. */ \ - \ - int __err = -(res); \ - errno = __err; \ - res = -1; \ - } \ - return (type) (res); \ -} while (0) +#define __syscall_return(type, res) \ + do { \ + if (unlikely(INTERNAL_SYSCALL_ERROR_P(res, ))) { \ + __set_errno(INTERNAL_SYSCALL_ERRNO(res, )); \ + res = (unsigned long) -1; \ + } \ + return (type) (res); \ + } while (0) -#define _syscall0(type,name) \ -type name(void) \ -{ \ - long __res; \ - \ - __asm__ __volatile__ ( \ - \ - " \n\t" \ - \ - " movi r2, %2\n\t" /* TRAP_ID_SYSCALL */ \ - " movi r3, %1\n\t" /* __NR_##name */ \ - \ - " trap\n\t" \ - " mov %0, r2\n\t" /* syscall rtn */ \ - \ - " \n\t" \ - \ - : "=r" (__res) /* %0 */ \ - \ - : "i" (__NR_##name) /* %1 */ \ - , "i" (TRAP_ID_SYSCALL) /* %2 */ \ - \ - : "r2" /* Clobbered */ \ - , "r3" /* Clobbered */ \ - ); \ - \ -__syscall_return(type,__res); \ -} +#define INTERNAL_SYSCALL_NCS(name, err, nr, args...) \ + ({ \ + long __res; \ + __asm__ __volatile__ ( \ + "movi r2, %2\n\t" /* TRAP_ID_SYSCALL */ \ + "movi r3, %1\n\t" /* __NR_##name */ \ + ASM_ARGS_##nr \ + "trap\n\t" \ + "mov %0, r2\n\t" /* syscall return */ \ + : "=r" (__res) /* %0 */ \ + : "i" (name) /* %1 */ \ + , "i" (TRAP_ID_SYSCALL) /* %2 */ \ + MAP_ARGS_##nr (args) /* %3-%8 */ \ + : "r2" \ + , "r3" \ + CLOB_ARGS_##nr /* Clobbered */ \ + ); \ + __res; \ + }) -#define _syscall1(type,name,atype,a) \ -type name(atype a) \ -{ \ - long __res; \ - \ - __asm__ __volatile__ ( \ - \ - " \n\t" \ - \ - " movi r2, %2\n\t" /* TRAP_ID_SYSCALL */ \ - " movi r3, %1\n\t" /* __NR_##name */ \ - " mov r4, %3\n\t" /* (long) a */ \ - \ - " trap\n\t" \ - " mov %0, r2\n\t" /* syscall rtn */ \ - \ - " \n\t" \ - \ - : "=r" (__res) /* %0 */ \ - \ - : "i" (__NR_##name) /* %1 */ \ - , "i" (TRAP_ID_SYSCALL) /* %2 */ \ - , "r" ((long) a) /* %3 */ \ - \ - : "r2" /* Clobbered */ \ - , "r3" /* Clobbered */ \ - , "r4" /* Clobbered */ \ - ); \ - \ -__syscall_return(type,__res); \ -} +#define INTERNAL_SYSCALL_ERROR_P(val, err) \ + ((unsigned long)(val) >= (unsigned long)(-125)) -#define _syscall2(type,name,atype,a,btype,b) \ -type name(atype a,btype b) \ -{ \ - long __res; \ - \ - __asm__ __volatile__ ( \ - \ - " \n\t" \ - \ - " movi r2, %2\n\t" /* TRAP_ID_SYSCALL */ \ - " movi r3, %1\n\t" /* __NR_##name */ \ - " mov r4, %3\n\t" /* (long) a */ \ - " mov r5, %4\n\t" /* (long) b */ \ - \ - " trap\n\t" \ - " mov %0, r2\n\t" /* syscall rtn */ \ - \ - " \n\t" \ - \ - : "=r" (__res) /* %0 */ \ - \ - : "i" (__NR_##name) /* %1 */ \ - , "i" (TRAP_ID_SYSCALL) /* %2 */ \ - , "r" ((long) a) /* %3 */ \ - , "r" ((long) b) /* %4 */ \ - \ - : "r2" /* Clobbered */ \ - , "r3" /* Clobbered */ \ - , "r4" /* Clobbered */ \ - , "r5" /* Clobbered */ \ - ); \ - \ -__syscall_return(type,__res); \ -} +#define ASM_ARGS_0 +#define MAP_ARGS_0() +#define CLOB_ARGS_0 -#define _syscall3(type,name,atype,a,btype,b,ctype,c) \ -type name(atype a,btype b,ctype c) \ -{ \ - long __res; \ - \ - __asm__ __volatile__ ( \ - \ - " \n\t" \ - \ - " movi r2, %2\n\t" /* TRAP_ID_SYSCALL */ \ - " movi r3, %1\n\t" /* __NR_##name */ \ - " mov r4, %3\n\t" /* (long) a */ \ - " mov r5, %4\n\t" /* (long) b */ \ - " mov r6, %5\n\t" /* (long) c */ \ - \ - " trap\n\t" \ - " mov %0, r2\n\t" /* syscall rtn */ \ - \ - " \n\t" \ - \ - : "=r" (__res) /* %0 */ \ - \ - : "i" (__NR_##name) /* %1 */ \ - , "i" (TRAP_ID_SYSCALL) /* %2 */ \ - , "r" ((long) a) /* %3 */ \ - , "r" ((long) b) /* %4 */ \ - , "r" ((long) c) /* %5 */ \ - \ - : "r2" /* Clobbered */ \ - , "r3" /* Clobbered */ \ - , "r4" /* Clobbered */ \ - , "r5" /* Clobbered */ \ - , "r6" /* Clobbered */ \ - ); \ - \ -__syscall_return(type,__res); \ -} +#define ASM_ARGS_1 \ + "mov r4, %3\n\t" +#define MAP_ARGS_1(a) \ + , "r" ((long) a) +#define CLOB_ARGS_1 \ + , "r4" -#define _syscall4(type,name,atype,a,btype,b,ctype,c,dtype,d) \ -type name (atype a, btype b, ctype c, dtype d) \ -{ \ - long __res; \ - \ - __asm__ __volatile__ ( \ - \ - " \n\t" \ - \ - " movi r2, %2\n\t" /* TRAP_ID_SYSCALL */ \ - " movi r3, %1\n\t" /* __NR_##name */ \ - " mov r4, %3\n\t" /* (long) a */ \ - " mov r5, %4\n\t" /* (long) b */ \ - " mov r6, %5\n\t" /* (long) c */ \ - " mov r7, %6\n\t" /* (long) d */ \ - \ - " trap\n\t" \ - " mov %0, r2\n\t" /* syscall rtn */ \ - \ - " \n\t" \ - \ - : "=r" (__res) /* %0 */ \ - \ - : "i" (__NR_##name) /* %1 */ \ - , "i" (TRAP_ID_SYSCALL) /* %2 */ \ - , "r" ((long) a) /* %3 */ \ - , "r" ((long) b) /* %4 */ \ - , "r" ((long) c) /* %5 */ \ - , "r" ((long) d) /* %6 */ \ - \ - : "r2" /* Clobbered */ \ - , "r3" /* Clobbered */ \ - , "r4" /* Clobbered */ \ - , "r5" /* Clobbered */ \ - , "r6" /* Clobbered */ \ - , "r7" /* Clobbered */ \ - ); \ - \ -__syscall_return(type,__res); \ -} +#define ASM_ARGS_2 \ + ASM_ARGS_1 \ + "mov r5, %4\n\t" +#define MAP_ARGS_2(a, b) \ + MAP_ARGS_1(a) \ + , "r" ((long) b) +#define CLOB_ARGS_2 \ + CLOB_ARGS_1 \ + , "r5" -#define _syscall5(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e) \ -type name (atype a,btype b,ctype c,dtype d,etype e) \ -{ \ - long __res; \ - \ - __asm__ __volatile__ ( \ - \ - " \n\t" \ - \ - " movi r2, %2\n\t" /* TRAP_ID_SYSCALL */ \ - " movi r3, %1\n\t" /* __NR_##name */ \ - " mov r4, %3\n\t" /* (long) a */ \ - " mov r5, %4\n\t" /* (long) b */ \ - " mov r6, %5\n\t" /* (long) c */ \ - " mov r7, %6\n\t" /* (long) c */ \ - " mov r8, %7\n\t" /* (long) e */ \ - \ - " trap\n\t" \ - " mov %0, r2\n\t" /* syscall rtn */ \ - \ - " \n\t" \ - \ - : "=r" (__res) /* %0 */ \ - \ - : "i" (__NR_##name) /* %1 */ \ - , "i" (TRAP_ID_SYSCALL) /* %2 */ \ - , "r" ((long) a) /* %3 */ \ - , "r" ((long) b) /* %4 */ \ - , "r" ((long) c) /* %5 */ \ - , "r" ((long) d) /* %6 */ \ - , "r" ((long) e) /* %7 */ \ - \ - : "r2" /* Clobbered */ \ - , "r3" /* Clobbered */ \ - , "r4" /* Clobbered */ \ - , "r5" /* Clobbered */ \ - , "r6" /* Clobbered */ \ - , "r7" /* Clobbered */ \ - , "r8" /* Clobbered */ \ - ); \ - \ -__syscall_return(type,__res); \ -} +#define ASM_ARGS_3 \ + ASM_ARGS_2 \ + "mov r6, %5\n\t" +#define MAP_ARGS_3(a, b, c) \ + MAP_ARGS_2(a, b) \ + , "r" ((long) c) +#define CLOB_ARGS_3 \ + CLOB_ARGS_2 \ + , "r6" -#define _syscall6(type,name,atype,a,btype,b,ctype,c,dtype,d,etype,e,ftype,f) \ -type name (atype a,btype b,ctype c,dtype d,etype e,ftype f) \ -{ \ - long __res; \ - \ - __asm__ __volatile__ ( \ - \ - " \n\t" \ - \ - " movi r2, %2\n\t" /* TRAP_ID_SYSCALL */ \ - " movi r3, %1\n\t" /* __NR_##name */ \ - " mov r4, %3\n\t" /* (long) a */ \ - " mov r5, %4\n\t" /* (long) b */ \ - " mov r6, %5\n\t" /* (long) c */ \ - " mov r7, %6\n\t" /* (long) c */ \ - " mov r8, %7\n\t" /* (long) e */ \ - " mov r9, %8\n\t" /* (long) f */ \ - \ - " trap\n\t" \ - " mov %0, r2\n\t" /* syscall rtn */ \ - \ - " \n\t" \ - \ - : "=r" (__res) /* %0 */ \ - \ - : "i" (__NR_##name) /* %1 */ \ - , "i" (TRAP_ID_SYSCALL) /* %2 */ \ - , "r" ((long) a) /* %3 */ \ - , "r" ((long) b) /* %4 */ \ - , "r" ((long) c) /* %5 */ \ - , "r" ((long) d) /* %6 */ \ - , "r" ((long) e) /* %7 */ \ - , "r" ((long) f) /* %8 */ \ - \ - : "r2" /* Clobbered */ \ - , "r3" /* Clobbered */ \ - , "r4" /* Clobbered */ \ - , "r5" /* Clobbered */ \ - , "r6" /* Clobbered */ \ - , "r7" /* Clobbered */ \ - , "r8" /* Clobbered */ \ - , "r9" /* Clobbered */ \ - ); \ - \ -__syscall_return(type,__res); \ -} +#define ASM_ARGS_4 \ + ASM_ARGS_3 \ + "mov r7, %6\n\t" +#define MAP_ARGS_4(a, b, c, d) \ + MAP_ARGS_3(a, b, c) \ + , "r" ((long) d) +#define CLOB_ARGS_4 \ + CLOB_ARGS_3 \ + , "r7" + +#define ASM_ARGS_5 \ + ASM_ARGS_4 \ + "mov r8, %7\n\t" +#define MAP_ARGS_5(a, b, c, d, e) \ + MAP_ARGS_4(a, b, c, d) \ + , "r" ((long) e) +#define CLOB_ARGS_5 \ + CLOB_ARGS_4 \ + , "r8" + +#define ASM_ARGS_6 \ + ASM_ARGS_5 \ + "mov r9, %8\n\t" +#define MAP_ARGS_6(a, b, c, d, e, f) \ + MAP_ARGS_5(a, b, c, d, e) \ + , "r" ((long) f) +#define CLOB_ARGS_6 \ + CLOB_ARGS_5 \ + , "r9" #endif /* __ASSEMBLER__ */ #endif /* _BITS_SYSCALLS_H */ - -- cgit v1.2.3 From abdbaa897b3d7b5b72c8521a38aa84cada242837 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Thu, 25 Mar 2010 15:17:10 +0100 Subject: prettify make clean Signed-off-by: Bernhard Reutner-Fischer --- libc/Makefile.in | 4 ++-- libc/inet/Makefile.in | 4 ++-- libc/inet/rpc/Makefile.in | 4 ++-- libc/misc/assert/Makefile.in | 4 ++-- libc/misc/ctype/Makefile.in | 4 ++-- libc/misc/dirent/Makefile.in | 4 ++-- libc/misc/elf/Makefile.in | 4 ++-- libc/misc/error/Makefile.in | 4 ++-- libc/misc/file/Makefile.in | 4 ++-- libc/misc/fnmatch/Makefile.in | 4 ++-- libc/misc/ftw/Makefile.in | 4 ++-- libc/misc/glob/Makefile.in | 4 ++-- libc/misc/gnu/Makefile.in | 4 ++-- libc/misc/internals/Makefile.in | 4 ++-- libc/misc/locale/Makefile.in | 4 ++-- libc/misc/mntent/Makefile.in | 4 ++-- libc/misc/pthread/Makefile.in | 4 ++-- libc/misc/regex/Makefile.in | 4 ++-- libc/misc/search/Makefile.in | 4 ++-- libc/misc/statfs/Makefile.in | 4 ++-- libc/misc/syslog/Makefile.in | 4 ++-- libc/misc/sysvipc/Makefile.in | 4 ++-- libc/misc/time/Makefile.in | 4 ++-- libc/misc/ttyent/Makefile.in | 4 ++-- libc/misc/utmp/Makefile.in | 4 ++-- libc/misc/wchar/Makefile.in | 4 ++-- libc/misc/wctype/Makefile.in | 4 ++-- libc/misc/wordexp/Makefile.in | 4 ++-- libc/pwd_grp/Makefile.in | 4 ++-- libc/signal/Makefile.in | 4 ++-- libc/stdio/Makefile.in | 4 ++-- libc/stdlib/Makefile.in | 4 ++-- libc/stdlib/malloc-simple/Makefile.in | 4 ++-- libc/stdlib/malloc-standard/Makefile.in | 4 ++-- libc/stdlib/malloc/Makefile.in | 4 ++-- libc/string/Makefile.in | 4 ++-- libc/sysdeps/linux/Makefile.commonarch | 8 ++++---- libc/sysdeps/linux/common/Makefile.in | 4 ++-- libc/termios/Makefile.in | 4 ++-- libc/unistd/Makefile.in | 4 ++-- 40 files changed, 82 insertions(+), 82 deletions(-) (limited to 'libc') diff --git a/libc/Makefile.in b/libc/Makefile.in index 7297e9284..323c4e463 100644 --- a/libc/Makefile.in +++ b/libc/Makefile.in @@ -52,7 +52,7 @@ endif lib-a-y += $(top_builddir)lib/libc.a lib-gdb-y += $(top_builddir)lib/libc.gdb lib-so-y += $(libc.depend) -objclean-y += libc_clean +objclean-y += CLEAN_libc OUTPUT_FORMAT = $(CC) $(CFLAGS) -Wl,--verbose 2>&1 | $(SED) -n '/OUTPUT_FORMAT/,/)/p' @@ -96,5 +96,5 @@ $(top_builddir)lib/libc.a: $(libc-a-y) | $(crt-y) $(top_builddir)lib/libc.gdb: $(libc_OUT)/libc_so.a $(LINK_FLAT_CRTS) $(call link-flat.so,$(@:.gdb=),$(UCLIBC_SHARED_FLAT_ID)) -libc_clean: +CLEAN_libc: $(do_rm) $(addprefix $(libc_OUT)/*., o os oS a) diff --git a/libc/inet/Makefile.in b/libc/inet/Makefile.in index 702642f00..31b270f07 100644 --- a/libc/inet/Makefile.in +++ b/libc/inet/Makefile.in @@ -57,7 +57,7 @@ INET_OBJ := $(patsubst %.c,$(INET_OUT)/%.o,$(CSRC-y)) libc-y += $(INET_OBJ) -objclean-y += inet_clean +objclean-y += CLEAN_libc/inet -inet_clean: +CLEAN_libc/inet: $(do_rm) $(addprefix $(INET_OUT)/*., o os) diff --git a/libc/inet/rpc/Makefile.in b/libc/inet/rpc/Makefile.in index b498f92d7..6ec674d10 100644 --- a/libc/inet/rpc/Makefile.in +++ b/libc/inet/rpc/Makefile.in @@ -41,7 +41,7 @@ libc-nomulti-$(UCLIBC_HAS_RPC) += $(INET_RPC_OUT)/rpc_thread.o libc-$(UCLIBC_HAS_RPC)+=$(INET_RPC_OBJ) -objclean-y+=inet_rpc_clean +objclean-y+=CLEAN_libc/inet/rpc -inet_rpc_clean: +CLEAN_libc/inet/rpc: $(do_rm) $(addprefix $(INET_RPC_OUT)/*., o os oS) diff --git a/libc/misc/assert/Makefile.in b/libc/misc/assert/Makefile.in index 1e08c1610..a49e00d2e 100644 --- a/libc/misc/assert/Makefile.in +++ b/libc/misc/assert/Makefile.in @@ -17,7 +17,7 @@ MISC_ASSERT_OBJ := $(MISC_ASSERT_OUT)/__assert.o libc-y += $(MISC_ASSERT_OBJ) -objclean-y += misc_assert_clean +objclean-y += CLEAN_libc/misc/assert -misc_assert_clean: +CLEAN_libc/misc/assert: $(do_rm) $(addprefix $(MISC_ASSERT_OUT)/*., o os) diff --git a/libc/misc/ctype/Makefile.in b/libc/misc/ctype/Makefile.in index f4705e1d5..125d91699 100644 --- a/libc/misc/ctype/Makefile.in +++ b/libc/misc/ctype/Makefile.in @@ -36,7 +36,7 @@ MISC_CTYPE_OBJ := $(patsubst %.c,$(MISC_CTYPE_OUT)/%.o,$(CSRC)) libc-y += $(MISC_CTYPE_OBJ) -objclean-y += misc_ctype_clean +objclean-y += CLEAN_libc/misc/ctype -misc_ctype_clean: +CLEAN_libc/misc/ctype: $(do_rm) $(addprefix $(MISC_CTYPE_OUT)/*., o os) diff --git a/libc/misc/dirent/Makefile.in b/libc/misc/dirent/Makefile.in index daeefb7e1..d42dfeb1e 100644 --- a/libc/misc/dirent/Makefile.in +++ b/libc/misc/dirent/Makefile.in @@ -22,7 +22,7 @@ MISC_DIRENT_OBJ := $(patsubst %.c,$(MISC_DIRENT_OUT)/%.o,$(CSRC)) libc-y += $(MISC_DIRENT_OBJ) -objclean-y += misc_dirent_clean +objclean-y += CLEAN_libc/misc/dirent -misc_dirent_clean: +CLEAN_libc/misc/dirent: $(do_rm) $(addprefix $(MISC_DIRENT_OUT)/*., o os) diff --git a/libc/misc/elf/Makefile.in b/libc/misc/elf/Makefile.in index 1b594dee6..1b4bd8bf1 100644 --- a/libc/misc/elf/Makefile.in +++ b/libc/misc/elf/Makefile.in @@ -16,7 +16,7 @@ MISC_ELF_OBJ:=$(patsubst %.c,$(MISC_ELF_OUT)/%.o,$(libc_a_CSRC)) libc-static-y += $(MISC_ELF_OBJ) libc-shared-y += $(MISC_ELF_OUT)/dl-iterate-phdr.oS -objclean-y+= misc_elf_clean +objclean-y+= CLEAN_libc/misc/elf -misc_elf_clean: +CLEAN_libc/misc/elf: $(do_rm) $(addprefix $(MISC_ELF_OUT)/*., o os oS) diff --git a/libc/misc/error/Makefile.in b/libc/misc/error/Makefile.in index fe0d0c1b9..b76a0dfff 100644 --- a/libc/misc/error/Makefile.in +++ b/libc/misc/error/Makefile.in @@ -23,7 +23,7 @@ MISC_ERROR_OBJ := $(patsubst %.c,$(MISC_ERROR_OUT)/%.o,$(CSRC)) libc-y += $(MISC_ERROR_OBJ) -objclean-y += misc_error_clean +objclean-y += CLEAN_libc/misc/error -misc_error_clean: +CLEAN_libc/misc/error: $(do_rm) $(addprefix $(MISC_ERROR_OUT)/*., o os) diff --git a/libc/misc/file/Makefile.in b/libc/misc/file/Makefile.in index cb6c85549..ace9db060 100644 --- a/libc/misc/file/Makefile.in +++ b/libc/misc/file/Makefile.in @@ -20,7 +20,7 @@ libc-y += $(MISC_FILE_OBJ) libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_FILE_OUT)/lockf64.o -objclean-y += misc_file_clean +objclean-y += CLEAN_libc/misc/file -misc_file_clean: +CLEAN_libc/misc/file: $(do_rm) $(addprefix $(MISC_FILE_OUT)/*., o os oS) diff --git a/libc/misc/fnmatch/Makefile.in b/libc/misc/fnmatch/Makefile.in index 75746ef2b..2557b5aa7 100644 --- a/libc/misc/fnmatch/Makefile.in +++ b/libc/misc/fnmatch/Makefile.in @@ -21,7 +21,7 @@ MISC_FNMATCH_OBJ := $(patsubst %.c,$(MISC_FNMATCH_OUT)/%.o,$(CSRC)) libc-$(UCLIBC_HAS_FNMATCH) += $(MISC_FNMATCH_OBJ) -objclean-y += misc_fnmatch_clean +objclean-y += CLEAN_libc/misc/fnmatch -misc_fnmatch_clean: +CLEAN_libc/misc/fnmatch: $(do_rm) $(addprefix $(MISC_FNMATCH_OUT)/*., o os) diff --git a/libc/misc/ftw/Makefile.in b/libc/misc/ftw/Makefile.in index e326d6696..2edd81959 100644 --- a/libc/misc/ftw/Makefile.in +++ b/libc/misc/ftw/Makefile.in @@ -20,7 +20,7 @@ MISC_FTW_OBJ := $(patsubst %.c,$(MISC_FTW_OUT)/%.o,$(CSRC)) libc-$(findstring y,$(UCLIBC_HAS_FTW)$(UCLIBC_HAS_NFTW)) += $(MISC_FTW_OBJ) -objclean-y += misc_ftw_clean +objclean-y += CLEAN_libc/misc/ftw -misc_ftw_clean: +CLEAN_libc/misc/ftw: $(do_rm) $(addprefix $(MISC_FTW_OUT)/*., o os) diff --git a/libc/misc/glob/Makefile.in b/libc/misc/glob/Makefile.in index 346dff316..03bfcca36 100644 --- a/libc/misc/glob/Makefile.in +++ b/libc/misc/glob/Makefile.in @@ -27,7 +27,7 @@ MISC_GLOB_OBJ := $(patsubst %.c,$(MISC_GLOB_OUT)/%.o,$(CSRC)) libc-$(UCLIBC_HAS_GLOB) += $(MISC_GLOB_OBJ) -objclean-y += misc_glob_clean +objclean-y += CLEAN_libc/misc/glob -misc_glob_clean: +CLEAN_libc/misc/glob: $(do_rm) $(addprefix $(MISC_GLOB_OUT)/*., o os) diff --git a/libc/misc/gnu/Makefile.in b/libc/misc/gnu/Makefile.in index d4a59004d..3990e4e8b 100644 --- a/libc/misc/gnu/Makefile.in +++ b/libc/misc/gnu/Makefile.in @@ -17,7 +17,7 @@ MISC_GNU_OBJ := $(MISC_GNU_OUT)/obstack.o libc-y += $(MISC_GNU_OBJ) -objclean-y += misc_gnu_clean +objclean-y += CLEAN_libc/misc/gnu -misc_gnu_clean: +CLEAN_libc/misc/gnu: $(do_rm) $(addprefix $(MISC_GNU_OUT)/*., o os) diff --git a/libc/misc/internals/Makefile.in b/libc/misc/internals/Makefile.in index 39bc8d51a..eb78e3698 100644 --- a/libc/misc/internals/Makefile.in +++ b/libc/misc/internals/Makefile.in @@ -35,7 +35,7 @@ libc-shared-$(UCLIBC_FORMAT_SHARED_FLAT) += \ $(MISC_INTERNALS_OUT)/shared_flat_add_library.os libc-nomulti-y += $(MISC_INTERNALS_OUT)/__uClibc_main.o -objclean-y += misc_internals_clean +objclean-y += CLEAN_libc/misc/internals -misc_internals_clean: +CLEAN_libc/misc/internals: $(do_rm) $(addprefix $(MISC_INTERNALS_OUT)/*., o os oS) diff --git a/libc/misc/locale/Makefile.in b/libc/misc/locale/Makefile.in index 566939804..c12befd32 100644 --- a/libc/misc/locale/Makefile.in +++ b/libc/misc/locale/Makefile.in @@ -24,7 +24,7 @@ MISC_LOCALE_OBJ := $(patsubst %.c,$(MISC_LOCALE_OUT)/%.o,$(CSRC)) libc-y += $(MISC_LOCALE_OBJ) -objclean-y += misc_locale_clean +objclean-y += CLEAN_libc/misc/locale -misc_locale_clean: +CLEAN_libc/misc/locale: $(do_rm) $(addprefix $(MISC_LOCALE_OUT)/*., o os) diff --git a/libc/misc/mntent/Makefile.in b/libc/misc/mntent/Makefile.in index 62bbdc95b..daa888da0 100644 --- a/libc/misc/mntent/Makefile.in +++ b/libc/misc/mntent/Makefile.in @@ -17,7 +17,7 @@ MISC_MNTENT_OBJ := $(MISC_MNTENT_OUT)/mntent.o libc-y += $(MISC_MNTENT_OBJ) -objclean-y += misc_mntent_clean +objclean-y += CLEAN_libc/misc/mntent -misc_mntent_clean: +CLEAN_libc/misc/mntent: $(do_rm) $(addprefix $(MISC_MNTENT_OUT)/*., o os) diff --git a/libc/misc/pthread/Makefile.in b/libc/misc/pthread/Makefile.in index ceea1c21b..36161238d 100644 --- a/libc/misc/pthread/Makefile.in +++ b/libc/misc/pthread/Makefile.in @@ -13,7 +13,7 @@ MISC_PTHREAD_OUT := $(top_builddir)libc/misc/pthread libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/unlock.o libc-$(UCLIBC_HAS_THREADS) += $(MISC_PTHREAD_OUT)/weaks.o -objclean-y += misc_pthread_clean +objclean-y += CLEAN_libc/misc/pthread -misc_pthread_clean: +CLEAN_libc/misc/pthread: $(do_rm) $(addprefix $(MISC_PTHREAD_OUT)/*., o os oS) diff --git a/libc/misc/regex/Makefile.in b/libc/misc/regex/Makefile.in index f9af23007..94710238f 100644 --- a/libc/misc/regex/Makefile.in +++ b/libc/misc/regex/Makefile.in @@ -21,7 +21,7 @@ MISC_REGEX_OBJ := $(patsubst %.c,$(MISC_REGEX_OUT)/%.o,$(CSRC)) libc-$(UCLIBC_HAS_REGEX) += $(MISC_REGEX_OBJ) -objclean-y += misc_regex_clean +objclean-y += CLEAN_libc/misc/regex -misc_regex_clean: +CLEAN_libc/misc/regex: $(do_rm) $(addprefix $(MISC_REGEX_OUT)/*., o os) diff --git a/libc/misc/search/Makefile.in b/libc/misc/search/Makefile.in index f8f846749..35dacb49b 100644 --- a/libc/misc/search/Makefile.in +++ b/libc/misc/search/Makefile.in @@ -29,7 +29,7 @@ MISC_SEARCH_OBJ := $(patsubst %.c,$(MISC_SEARCH_OUT)/%.o,$(CSRC)) libc-y += $(MISC_SEARCH_OBJ) -objclean-y += misc_search_clean +objclean-y += CLEAN_libc/misc/search -misc_search_clean: +CLEAN_libc/misc/search: $(do_rm) $(addprefix $(MISC_SEARCH_OUT)/*., o os) diff --git a/libc/misc/statfs/Makefile.in b/libc/misc/statfs/Makefile.in index a7929a5c7..aa92d1f70 100644 --- a/libc/misc/statfs/Makefile.in +++ b/libc/misc/statfs/Makefile.in @@ -25,7 +25,7 @@ libc-y += $(MISC_STATFS_OBJ) libc-nomulti-$(UCLIBC_HAS_LFS) += $(MISC_STATFS_OUT)/statvfs64.o $(MISC_STATFS_OUT)/fstatvfs64.o -objclean-y += misc_statfs_clean +objclean-y += CLEAN_libc/misc/statfs -misc_statfs_clean: +CLEAN_libc/misc/statfs: $(do_rm) $(addprefix $(MISC_STATFS_OUT)/*., o os oS) diff --git a/libc/misc/syslog/Makefile.in b/libc/misc/syslog/Makefile.in index b666f8c72..5cc4f5237 100644 --- a/libc/misc/syslog/Makefile.in +++ b/libc/misc/syslog/Makefile.in @@ -19,7 +19,7 @@ ifeq ($(UCLIBC_HAS_SYSLOG),y) libc-y += $(MISC_SYSLOG_OBJ) endif -objclean-y += misc_syslog_clean +objclean-y += CLEAN_libc/misc/syslog -misc_syslog_clean: +CLEAN_libc/misc/syslog: $(do_rm) $(addprefix $(MISC_SYSLOG_OUT)/*., o os) diff --git a/libc/misc/sysvipc/Makefile.in b/libc/misc/sysvipc/Makefile.in index e7f3a08a8..115cfc67e 100644 --- a/libc/misc/sysvipc/Makefile.in +++ b/libc/misc/sysvipc/Makefile.in @@ -26,7 +26,7 @@ MISC_SYSVIPC_OBJ := $(patsubst %.c,$(MISC_SYSVIPC_OUT)/%.o,$(CSRC)) libc-y += $(MISC_SYSVIPC_OBJ) -objclean-y += misc_sysvipc_clean +objclean-y += CLEAN_libc/misc/sysvipc -misc_sysvipc_clean: +CLEAN_libc/misc/sysvipc: $(do_rm) $(addprefix $(MISC_SYSVIPC_OUT)/*., o os) diff --git a/libc/misc/time/Makefile.in b/libc/misc/time/Makefile.in index 238170eb9..78f01ad85 100644 --- a/libc/misc/time/Makefile.in +++ b/libc/misc/time/Makefile.in @@ -37,7 +37,7 @@ MISC_TIME_OBJ := $(patsubst %.c,$(MISC_TIME_OUT)/%.o,$(CSRC)) libc-y += $(MISC_TIME_OBJ) -objclean-y += misc_time_clean +objclean-y += CLEAN_libc/misc/time -misc_time_clean: +CLEAN_libc/misc/time: $(do_rm) $(addprefix $(MISC_TIME_OUT)/*., o os) diff --git a/libc/misc/ttyent/Makefile.in b/libc/misc/ttyent/Makefile.in index 659fa7c1f..bfa80bec1 100644 --- a/libc/misc/ttyent/Makefile.in +++ b/libc/misc/ttyent/Makefile.in @@ -17,7 +17,7 @@ MISC_TTYENT_OBJ := $(patsubst %.c,$(MISC_TTYENT_OUT)/%.o,$(CSRC)) libc-y += $(MISC_TTYENT_OBJ) -objclean-y += misc_ttyent_clean +objclean-y += CLEAN_libc/misc/ttyent -misc_ttyent_clean: +CLEAN_libc/misc/ttyent: $(do_rm) $(addprefix $(MISC_TTYENT_OUT)/*., o os) diff --git a/libc/misc/utmp/Makefile.in b/libc/misc/utmp/Makefile.in index 5837171cb..b209a4587 100644 --- a/libc/misc/utmp/Makefile.in +++ b/libc/misc/utmp/Makefile.in @@ -17,7 +17,7 @@ MISC_UTMP_OBJ := $(patsubst %.c,$(MISC_UTMP_OUT)/%.o,$(CSRC)) libc-y += $(MISC_UTMP_OBJ) -objclean-y += misc_utmp_clean +objclean-y += CLEAN_libc/misc/utmp -misc_utmp_clean: +CLEAN_libc/misc/utmp: $(do_rm) $(addprefix $(MISC_UTMP_OUT)/*., o os) diff --git a/libc/misc/wchar/Makefile.in b/libc/misc/wchar/Makefile.in index 0258f9f53..be95a186a 100644 --- a/libc/misc/wchar/Makefile.in +++ b/libc/misc/wchar/Makefile.in @@ -35,7 +35,7 @@ MISC_WCHAR_OBJ := $(patsubst %.c,$(MISC_WCHAR_OUT)/%.o,$(CSRC)) libc-$(UCLIBC_HAS_WCHAR) += $(MISC_WCHAR_OBJ) -objclean-y += misc_wchar_clean +objclean-y += CLEAN_libc/misc/wchar -misc_wchar_clean: +CLEAN_libc/misc/wchar: $(do_rm) $(addprefix $(MISC_WCHAR_OUT)/*., o os) diff --git a/libc/misc/wctype/Makefile.in b/libc/misc/wctype/Makefile.in index f7c4ddd87..4eacc118e 100644 --- a/libc/misc/wctype/Makefile.in +++ b/libc/misc/wctype/Makefile.in @@ -30,7 +30,7 @@ MISC_WCTYPE_OBJ := $(patsubst %.c,$(MISC_WCTYPE_OUT)/%.o,$(CSRC)) libc-y += $(MISC_WCTYPE_OBJ) -objclean-y += misc_wctype_clean +objclean-y += CLEAN_libc/misc/wctype -misc_wctype_clean: +CLEAN_libc/misc/wctype: $(do_rm) $(addprefix $(MISC_WCTYPE_OUT)/*., o os) diff --git a/libc/misc/wordexp/Makefile.in b/libc/misc/wordexp/Makefile.in index 8d2f50ba0..981db643e 100644 --- a/libc/misc/wordexp/Makefile.in +++ b/libc/misc/wordexp/Makefile.in @@ -17,7 +17,7 @@ MISC_WORDEXP_OBJ := $(patsubst %.c,$(MISC_WORDEXP_OUT)/%.o,$(CSRC)) libc-$(UCLIBC_HAS_WORDEXP) += $(MISC_WORDEXP_OBJ) -objclean-y += misc_wordexp_clean +objclean-y += CLEAN_libc/misc/wordexp -misc_wordexp_clean: +CLEAN_libc/misc/wordexp: $(do_rm) $(addprefix $(MISC_WORDEXP_OUT)/*., o os) diff --git a/libc/pwd_grp/Makefile.in b/libc/pwd_grp/Makefile.in index 6e183cc1c..757adc85c 100644 --- a/libc/pwd_grp/Makefile.in +++ b/libc/pwd_grp/Makefile.in @@ -27,7 +27,7 @@ PWDGRP_OBJ := $(patsubst %.c,$(PWDGRP_OUT)/%.o,$(CSRC)) libc-y += $(PWDGRP_OBJ) -objclean-y += pwdgrp_clean +objclean-y += CLEAN_libc/pwd_grp -pwdgrp_clean: +CLEAN_libc/pwd_grp: $(do_rm) $(addprefix $(PWDGRP_OUT)/*., o os) diff --git a/libc/signal/Makefile.in b/libc/signal/Makefile.in index 9e234b4ce..3d989c487 100644 --- a/libc/signal/Makefile.in +++ b/libc/signal/Makefile.in @@ -28,7 +28,7 @@ SIGNAL_OBJ := $(patsubst %.c,$(SIGNAL_OUT)/%.o,$(CSRC-y)) libc-y += $(SIGNAL_OBJ) -objclean-y += signal_clean +objclean-y += CLEAN_libc/signal -signal_clean: +CLEAN_libc/signal: $(do_rm) $(addprefix $(SIGNAL_OUT)/*., o os) diff --git a/libc/stdio/Makefile.in b/libc/stdio/Makefile.in index 634b9a47d..1ca2dcff4 100644 --- a/libc/stdio/Makefile.in +++ b/libc/stdio/Makefile.in @@ -103,7 +103,7 @@ ifeq ($(UCLIBC_HAS_WCHAR),y) libc-nomulti-y += $(STDIO_OUT)/vfwprintf.o $(STDIO_OUT)/vfwscanf.o endif -objclean-y += stdio_clean +objclean-y += CLEAN_libc/stdio -stdio_clean: +CLEAN_libc/stdio: $(do_rm) $(addprefix $(STDIO_OUT)/*., o os oS) diff --git a/libc/stdlib/Makefile.in b/libc/stdlib/Makefile.in index 3d34538fb..8317a8122 100644 --- a/libc/stdlib/Makefile.in +++ b/libc/stdlib/Makefile.in @@ -72,7 +72,7 @@ libc-nonshared-y += $(STDLIB_OUT)/atexit.os libc-nomulti-y += $(STDLIB_OUT)/labs.o $(STDLIB_OUT)/atol.o $(STDLIB_OUT)/_stdlib_strto_l.o $(STDLIB_OUT)/_stdlib_strto_ll.o libc-nomulti-$(UCLIBC_HAS_XLOCALE) += $(STDLIB_OUT)/_stdlib_strto_l_l.o $(STDLIB_OUT)/_stdlib_strto_ll_l.o -objclean-y += stdlib_clean +objclean-y += CLEAN_libc/stdlib -stdlib_clean: +CLEAN_libc/stdlib: $(do_rm) $(addprefix $(STDLIB_OUT)/*., o os oS) diff --git a/libc/stdlib/malloc-simple/Makefile.in b/libc/stdlib/malloc-simple/Makefile.in index 0c050a235..351504bda 100644 --- a/libc/stdlib/malloc-simple/Makefile.in +++ b/libc/stdlib/malloc-simple/Makefile.in @@ -18,7 +18,7 @@ STDLIB_MALLOC_SIMPLE_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_SIMPLE_OUT)/%.o,$(CSR libc-$(MALLOC_SIMPLE) += $(STDLIB_MALLOC_SIMPLE_OBJ) -objclean-y += stdlib_malloc_simple_clean +objclean-y += CLEAN_libc/stdlib/malloc-simple -stdlib_malloc_simple_clean: +CLEAN_libc/stdlib/malloc-simple: $(do_rm) $(addprefix $(STDLIB_MALLOC_SIMPLE_OUT)/*., o os) diff --git a/libc/stdlib/malloc-standard/Makefile.in b/libc/stdlib/malloc-standard/Makefile.in index eb08f2699..7da7fe1df 100644 --- a/libc/stdlib/malloc-standard/Makefile.in +++ b/libc/stdlib/malloc-standard/Makefile.in @@ -19,7 +19,7 @@ STDLIB_MALLOC_STANDARD_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_STANDARD_OUT)/%.o,$ libc-$(MALLOC_STANDARD) += $(STDLIB_MALLOC_STANDARD_OBJ) -objclean-y += stdlib_malloc_standard_clean +objclean-y += CLEAN_libc/stdlib/malloc-standard -stdlib_malloc_standard_clean: +CLEAN_libc/stdlib/malloc-standard: $(do_rm) $(addprefix $(STDLIB_MALLOC_STANDARD_OUT)/*., o os) diff --git a/libc/stdlib/malloc/Makefile.in b/libc/stdlib/malloc/Makefile.in index aff48a9ec..642570c95 100644 --- a/libc/stdlib/malloc/Makefile.in +++ b/libc/stdlib/malloc/Makefile.in @@ -29,9 +29,9 @@ STDLIB_MALLOC_OBJ := $(patsubst %.c,$(STDLIB_MALLOC_OUT)/%.o,$(CSRC)) libc-$(MALLOC) += $(STDLIB_MALLOC_OBJ) -objclean-y += stdlib_malloc_clean +objclean-y += CLEAN_libc/stdlib/malloc -stdlib_malloc_clean: +CLEAN_libc/stdlib/malloc: $(do_rm) $(addprefix $(STDLIB_MALLOC_OUT)/*., o os) malloc.o free.o realloc.o memalign.o: malloc.h diff --git a/libc/string/Makefile.in b/libc/string/Makefile.in index 08a1856b7..9be083dd0 100644 --- a/libc/string/Makefile.in +++ b/libc/string/Makefile.in @@ -135,7 +135,7 @@ libc-y += $(STRING_COBJ) libc-nomulti-$(UCLIBC_HAS_XLOCALE) += $(STRING_OUT)/wcsxfrm_l.o libc-nomulti-y += $(STRING_OUT)/__xpg_strerror_r.o -objclean-y += string_clean +objclean-y += CLEAN_libc/string -string_clean: +CLEAN_libc/string: $(do_rm) $(addprefix $(STRING_OUT)/,$(addprefix *., o os oS) $(addprefix */*., o os oS) $(addprefix */*/*., o os oS)) diff --git a/libc/sysdeps/linux/Makefile.commonarch b/libc/sysdeps/linux/Makefile.commonarch index 10cfc12c3..8c893199e 100644 --- a/libc/sysdeps/linux/Makefile.commonarch +++ b/libc/sysdeps/linux/Makefile.commonarch @@ -18,12 +18,12 @@ ARCH_OBJS := $(ARCH_COBJ) $(ARCH_SOBJ) crt-y := FORCE libc-y += $(ARCH_OBJS) libc-nomulti-y += $(ARCH_SOBJ) -objclean-y += arch_clean +objclean-y += CLEAN_$(subst $(top_builddir),,$(ARCH_OUT)) CFLAGS-crti.S+=$(PICFLAG) CFLAGS-crtn.S+=$(PICFLAG) -arch_clean: +CLEAN_$(subst $(top_builddir),,$(ARCH_OUT)): $(do_rm) $(addprefix $(ARCH_OUT)/*., o os oS) $(CTOR_TARGETS) $(CRTS) ifneq ($(ARCH_HEADERS),) @@ -34,8 +34,8 @@ $(ARCH_HEADERS_OUT): $(do_ln) -fs $(call rel_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)/$(@F) $@ headers-y += $(ARCH_HEADERS_OUT) -headers_clean-y += arch_headers_clean -arch_headers_clean: +headers_clean-y += HEADERCLEAN_$(subst $(top_builddir),,$(ARCH_OUT)) +HEADERCLEAN_$(subst $(top_builddir),,$(ARCH_OUT)): $(RM) $(ARCH_HEADERS_OUT) endif diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index ec889ca0d..172feb162 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -96,7 +96,7 @@ libc-nomulti-y += $(COMMON_OUT)/__syscall_rt_sigaction.o \ $(COMMON_OUT)/stat.o libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o -objclean-y += common_clean +objclean-y += CLEAN_libc/sysdeps/linux/common -common_clean: +CLEAN_libc/sysdeps/linux/common: $(do_rm) $(addprefix $(COMMON_OUT)/*., o os oS) diff --git a/libc/termios/Makefile.in b/libc/termios/Makefile.in index 5e9d4fd48..73f72729e 100644 --- a/libc/termios/Makefile.in +++ b/libc/termios/Makefile.in @@ -15,7 +15,7 @@ TERMIOS_OBJ := $(patsubst $(TERMIOS_DIR)/%.c,$(TERMIOS_OUT)/%.o,$(TERMIOS_SRC)) libc-y += $(TERMIOS_OBJ) -objclean-y += termios_clean +objclean-y += CLEAN_libc/termios -termios_clean: +CLEAN_libc/termios: $(do_rm) $(addprefix $(TERMIOS_OUT)/*., o os) diff --git a/libc/unistd/Makefile.in b/libc/unistd/Makefile.in index d830d8115..27041773e 100644 --- a/libc/unistd/Makefile.in +++ b/libc/unistd/Makefile.in @@ -46,7 +46,7 @@ UNISTD_OBJ := $(patsubst %.c,$(UNISTD_OUT)/%.o,$(CSRC)) libc-y += $(UNISTD_OBJ) -objclean-y += unistd_clean +objclean-y += CLEAN_libc/unistd -unistd_clean: +CLEAN_libc/unistd: $(do_rm) $(addprefix $(UNISTD_OUT)/*., o os) -- cgit v1.2.3 From bbfd5def3f8b17a6381f9394e77c60a808df7a59 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Tue, 30 Mar 2010 17:18:03 +0200 Subject: resolv: DEBUG-print nameserver we talk to Signed-off-by: Bernhard Reutner-Fischer --- libc/inet/resolv.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'libc') diff --git a/libc/inet/resolv.c b/libc/inet/resolv.c index 0a6fd7aaf..056539f6e 100644 --- a/libc/inet/resolv.c +++ b/libc/inet/resolv.c @@ -1348,8 +1348,24 @@ int attribute_hidden __dns_lookup(const char *name, packet_len = i + j; /* send packet */ - DPRINTF("On try %d, sending query to port %d\n", - retries_left, NAMESERVER_PORT); +#ifdef DEBUG + { + const socklen_t plen = sa.sa.sa_family == AF_INET ? INET_ADDRSTRLEN : INET6_ADDRSTRLEN; + char *pbuf = malloc(plen); + if (pbuf == NULL) ;/* nothing */ +#ifdef __UCLIBC_HAS_IPV6__ + else if (sa.sa.sa_family == AF_INET6) + pbuf = (char*)inet_ntop(AF_INET6, &sa.sa6.sin6_addr, pbuf, plen); +#endif +#ifdef __UCLIBC_HAS_IPV4__ + else if (sa.sa.sa_family == AF_INET) + pbuf = (char*)inet_ntop(AF_INET, &sa.sa4.sin_addr, pbuf, plen); +#endif + DPRINTF("On try %d, sending query to %s, port %d\n", + retries_left, pbuf, NAMESERVER_PORT); + free(pbuf); + } +#endif fd = socket(sa.sa.sa_family, SOCK_DGRAM, IPPROTO_UDP); if (fd < 0) /* paranoia */ goto try_next_server; -- cgit v1.2.3