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/sysdeps/linux/common') 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 --- Rules.mak | 1 + libc/sysdeps/linux/common/sysdep.h | 139 +++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 libc/sysdeps/linux/common/sysdep.h (limited to 'libc/sysdeps/linux/common') diff --git a/Rules.mak b/Rules.mak index 039625f66..bb19c7efd 100644 --- a/Rules.mak +++ b/Rules.mak @@ -547,6 +547,7 @@ NOSTDLIB_CFLAGS:=$(call check_gcc,-nostdlib,) CFLAGS := -include $(top_srcdir)include/libc-symbols.h \ $(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \ -nostdinc -I$(top_builddir)include -I$(top_srcdir)include -I. \ + -I$(top_srcdir)libc/sysdeps/linux \ -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"") CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS)) 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 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/sysdeps/linux/common') 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/sysdeps/linux/common') 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 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 --- Makefile.in | 10 +++++----- Makerules | 2 +- extra/locale/Makefile.in | 4 ++-- ldso/ldso/Makefile.in | 4 ++-- ldso/libdl/Makefile.in | 4 ++-- 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 ++-- libcrypt/Makefile.in | 4 ++-- libintl/Makefile.in | 4 ++-- libm/Makefile.in | 4 ++-- libnsl/Makefile.in | 4 ++-- libpthread/linuxthreads.old/Makefile.in | 8 ++++---- libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch | 4 ++-- libpthread/linuxthreads.old_db/Makefile.in | 8 ++++---- libpthread/linuxthreads/Makefile.in | 8 ++++---- libpthread/linuxthreads_db/Makefile.in | 8 ++++---- libresolv/Makefile.in | 4 ++-- librt/Makefile.in | 4 ++-- libutil/Makefile.in | 4 ++-- utils/Makefile.in | 4 ++-- 58 files changed, 128 insertions(+), 128 deletions(-) (limited to 'libc/sysdeps/linux/common') diff --git a/Makefile.in b/Makefile.in index 048cd76a0..aacb1ab6a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,7 +9,7 @@ # You shouldn't need to mess with anything beyond this point... #-------------------------------------------------------------- clean_targets := clean realclean distclean \ - objclean-y headers_clean-y utils_clean + objclean-y headers_clean-y CLEAN_utils noconfig_targets := menuconfig config oldconfig silentoldconfig randconfig \ defconfig allyesconfig allnoconfig \ release dist tags help @@ -148,9 +148,9 @@ endif $(target-headers-sysdep): | $(top_builddir)include/bits $(top_builddir)include/sys -sysdep_common_headers-clean: - $(RM) $(ALL_HEADERS_COMMON) -headers_clean-y += sysdep_common_headers-clean +HEADERCLEAN_common: + $(do_rm) $(ALL_HEADERS_COMMON) +headers_clean-y += HEADERCLEAN_common # The headers. Arch specific headers are specified via ARCH_HEADERS in # libc/sysdeps/linux/$(TARGET_ARCH)/Makefile.arch which appends those via @@ -446,7 +446,7 @@ include_clean: clean: include_clean $(Q)$(RM) -r $(top_builddir)lib $(top_builddir)include/bits - @$(MAKE) -C utils utils_clean + @$(MAKE) -C utils CLEAN_utils +$(MAKE) -s -C test clean @$(RM) $(top_builddir)include/linux $(top_builddir)include/asm* $(Q)$(RM) $(top_builddir)extra/scripts/unifdef diff --git a/Makerules b/Makerules index 38e19d72c..5e5a84f70 100644 --- a/Makerules +++ b/Makerules @@ -95,7 +95,7 @@ pur_disp_ln = echo " "LN $(show_objs) pur_disp_mkdir = echo " "MKDIR $(show_objs) pur_disp_gen = echo " "GEN $(show_objs) pur_disp_unifdef = echo " "UNIFDEF $(show_objs) -pur_disp_rm = echo " "CLEAN $(@:_clean=) +pur_disp_rm = echo " "CLEAN $(subst CLEAN_,,$(patsubst HEADERCLEAN_%,include \(%\),$@)) sil_disp_compile.c = true sil_disp_compile.i = true diff --git a/extra/locale/Makefile.in b/extra/locale/Makefile.in index 8bda8d8aa..221a51585 100644 --- a/extra/locale/Makefile.in +++ b/extra/locale/Makefile.in @@ -234,9 +234,9 @@ $(top_builddir)include/bits/uClibc_locale_data.h: $(locale_OUT)/uClibc_locale_da $(Q)$(AWK) 'BEGIN{i=1}{if (/WANT_/) i=/endif/;else if (i) print $0}' \ $< > $@ -objclean-y += locale_clean +objclean-y += CLEAN_extra/locale # lmmtolso.c/gen_mmap.c/tst-*.c not used -locale_clean: +CLEAN_extra/locale: $(do_rm) $(locale_HOBJ) $(locale_SRC) $(addprefix $(locale_OUT)/*., o os txt) \ $(addprefix $(locale_OUT)/,$(addsuffix .h,uClibc_locale_data lt_defines c8tables wctables locale_tables locale_collate) lmmtolso gen_mmap locale.mmap) diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in index 9e228b7a0..724563155 100644 --- a/ldso/ldso/Makefile.in +++ b/ldso/ldso/Makefile.in @@ -60,7 +60,7 @@ $(UCLIBC_LDSO_NAME)_OBJS := $($(UCLIBC_LDSO_NAME)_COBJ) $($(UCLIBC_LDSO_NAME)_SO ldso-y := $($(UCLIBC_LDSO_NAME)_OBJS:.o=.oS) lib-so-y += $(ldso) -objclean-y += $(UCLIBC_LDSO_NAME)_clean +objclean-y += CLEAN_ldso/ldso $(ldso): $(ldso:.$(MAJOR_VERSION)=) $(ldso:.$(MAJOR_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a @@ -70,5 +70,5 @@ $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y) $(Q)$(RM) $@ $(do_ar) -$(UCLIBC_LDSO_NAME)_clean: +CLEAN_ldso/ldso: $(do_rm) $(addprefix $($(UCLIBC_LDSO_NAME)_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*.,$(d)$(e)))) diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in index 077b8b3ea..64a320e1c 100644 --- a/ldso/libdl/Makefile.in +++ b/ldso/libdl/Makefile.in @@ -41,7 +41,7 @@ libdl-so-y := $(libdl_OUT)/libdl.oS lib-a-$(HAVE_SHARED) += $(top_builddir)lib/libdl.a lib-so-y += $(top_builddir)lib/libdl.so -objclean-y += libdl_clean +objclean-y += CLEAN_ldso/libdl $(top_builddir)lib/libdl.so: $(libdl_OUT)/libdl_so.a $(libc.depend) $(call link.so,$(libdl_FULL_NAME),$(MAJOR_VERSION)) @@ -55,5 +55,5 @@ $(top_builddir)lib/libdl.a: $(libdl-a-y) $(Q)$(RM) $@ $(do_ar) -libdl_clean: +CLEAN_ldso/libdl: $(do_rm) $(addprefix $(libdl_OUT)/*., o os oS a) 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) diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in index cb1c5d326..964c74f2e 100644 --- a/libcrypt/Makefile.in +++ b/libcrypt/Makefile.in @@ -34,7 +34,7 @@ libcrypt-so-y := $(libcrypt_OBJ:.o=.os) lib-a-$(UCLIBC_HAS_CRYPT) += $(top_builddir)lib/libcrypt.a lib-so-$(UCLIBC_HAS_CRYPT) += $(top_builddir)lib/libcrypt.so -objclean-y += libcrypt_clean +objclean-y += CLEAN_libcrypt ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) @@ -61,5 +61,5 @@ $(top_builddir)lib/libcrypt.a: $(libcrypt-a-y) $(Q)$(RM) $@ $(do_ar) -libcrypt_clean: +CLEAN_libcrypt: $(do_rm) $(addprefix $(libcrypt_OUT)/*., o os oS a) diff --git a/libintl/Makefile.in b/libintl/Makefile.in index eba867fd3..6c0c4b6d2 100644 --- a/libintl/Makefile.in +++ b/libintl/Makefile.in @@ -39,7 +39,7 @@ libintl-so-y := $(libintl_MOBJ:.o=.os) lib-a-$(UCLIBC_HAS_GETTEXT_AWARENESS) += $(top_builddir)lib/libintl.a lib-so-$(UCLIBC_HAS_GETTEXT_AWARENESS) += $(top_builddir)lib/libintl.so -objclean-y += libintl_clean +objclean-y += CLEAN_libintl ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) @@ -72,5 +72,5 @@ $(libintl_MOBJ): $(libintl_MSRC) $(libintl_MOBJ:.o=.os): $(libintl_MSRC) $(compile.m) -libintl_clean: +CLEAN_libintl: $(do_rm) $(addprefix $(libintl_OUT)/*., o os oS a) diff --git a/libm/Makefile.in b/libm/Makefile.in index 6eb935851..6cf0925fe 100644 --- a/libm/Makefile.in +++ b/libm/Makefile.in @@ -270,7 +270,7 @@ libm-so-y += $(libm_OBJS:.o=.os) lib-a-$(UCLIBC_HAS_FLOATS) += $(top_builddir)lib/libm.a lib-so-$(UCLIBC_HAS_FLOATS) += $(top_builddir)lib/libm.so -objclean-y += libm_clean +objclean-y += CLEAN_libm ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) @@ -316,5 +316,5 @@ $(libm_MOBJ_FL:.o=.i): $(libm_MSRC_FL) $(libm_MOBJ_LD:.o=.i): $(libm_MSRC_LD) $(compile.mi) -libm_clean: +CLEAN_libm: $(do_rm) $(addprefix $(libm_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*.,$(d)$(e)))) diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in index 24d530a83..fde3f6928 100644 --- a/libnsl/Makefile.in +++ b/libnsl/Makefile.in @@ -30,7 +30,7 @@ libnsl-so-y := $(libnsl_OBJ:.o=.os) lib-a-$(UCLIBC_HAS_LIBNSL_STUB) += $(top_builddir)lib/libnsl.a lib-so-$(UCLIBC_HAS_LIBNSL_STUB) += $(top_builddir)lib/libnsl.so -objclean-y += libnsl_clean +objclean-y += CLEAN_libnsl ifeq ($(DOPIC),y) $(top_builddir)lib/libnsl.so: $(top_builddir)lib/libnsl.a $(libc.depend) @@ -48,5 +48,5 @@ $(top_builddir)lib/libnsl.a: $(libnsl-a-y) $(Q)$(RM) $@ $(do_ar) -libnsl_clean: +CLEAN_libnsl: $(do_rm) $(addprefix $(libnsl_OUT)/*., o os a) diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in index 2fed1dafd..f292eea57 100644 --- a/libpthread/linuxthreads.old/Makefile.in +++ b/libpthread/linuxthreads.old/Makefile.in @@ -117,10 +117,10 @@ linuxthreads_headers := $(top_builddir)include/pthread.h \ $(linuxthreads_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h)) headers-$(UCLIBC_HAS_THREADS) += $(linuxthreads_headers) -objclean-y += libpthread_clean -headers_clean-y += linuxthreads_headers_clean -linuxthreads_headers_clean: +objclean-y += CLEAN_libpthread/linuxthreads.old +headers_clean-y += HEADERCLEAN_libpthread/linuxthreads.old +HEADERCLEAN_libpthread/linuxthreads.old: $(do_rm) $(linuxthreads_headers) -libpthread_clean: +CLEAN_libpthread/linuxthreads.old: $(do_rm) $(addprefix $(libpthread_OUT)/*., o os oS a) diff --git a/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch index ce00f4d8e..ddb56645c 100644 --- a/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch +++ b/libpthread/linuxthreads.old/sysdeps/sh64/Makefile.arch @@ -17,7 +17,7 @@ libpthread-so-y+=$(libpthread_ARCH_OBJ:.o=.os) libpthread-multi-y+=$(libpthread_ARCH_SRC) -objclean-y+=libpthread_arch_clean +objclean-y += CLEAN_$($(top_builddir),,$(libpthread_ARCH_OUT)) # We need to build as SHcompact for tas.. $(libpthread_ARCH_OBJ): %.o : %.c @@ -26,5 +26,5 @@ $(libpthread_ARCH_OBJ): %.o : %.c $(libpthread_ARCH_OBJ:.o=.os): %.os : %.c $(compile.c:32media=compact) -libpthread_arch_clean: +CLEAN_$($(top_builddir),,$(libpthread_ARCH_OUT)): $(do_rm) $(addprefix $(libpthread_ARCH_OUT)/*., o os) diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in index 2f9077905..623ee3958 100644 --- a/libpthread/linuxthreads.old_db/Makefile.in +++ b/libpthread/linuxthreads.old_db/Makefile.in @@ -68,11 +68,11 @@ linuxthreads_db_headers := $(top_builddir)include/thread_db.h $(linuxthreads_db_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h)) headers-$(PTHREADS_DEBUG_SUPPORT) += $(linuxthreads_db_headers) -objclean-y += libthread_db_clean -headers_clean-y += linuxthreads_db_headers_clean +objclean-y += CLEAN_libpthread/linuxthreads.old_db +headers_clean-y += HEADERCLEAN_libpthread/linuxthreads.old_db -linuxthreads_db_headers_clean: +HEADERCLEAN_libpthread/linuxthreads.old_db: $(do_rm) $(linuxthreads_db_headers) -libthread_db_clean: +CLEAN_libpthread/linuxthreads.old_db: $(do_rm) $(addprefix $(libthread_db_OUT)/*., o os oS a) diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in index 7ed3ec510..165ae5532 100644 --- a/libpthread/linuxthreads/Makefile.in +++ b/libpthread/linuxthreads/Makefile.in @@ -132,10 +132,10 @@ linuxthreads_headers := $(top_builddir)include/pthread.h \ $(linuxthreads_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h)) headers-$(UCLIBC_HAS_THREADS) += $(linuxthreads_headers) -objclean-y += libpthread_clean -headers_clean-y += linuxthreads_headers_clean -linuxthreads_headers_clean: +objclean-y += CLEAN_libpthread/linuxthreads +headers_clean-y += HEADERCLEAN_libpthread/linuxthreads +HEADERCLEAN_libpthread/linuxthreads: $(do_rm) $(linuxthreads_headers) -libpthread_clean: +CLEAN_libpthread/linuxthreads: $(do_rm) $(addprefix $(libpthread_OUT)/,$(foreach e, o os oS a,$(foreach d, *. */*. */*/*. */*/*/*.,$(d)$(e)))) diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in index 5804922de..64a964438 100644 --- a/libpthread/linuxthreads_db/Makefile.in +++ b/libpthread/linuxthreads_db/Makefile.in @@ -68,11 +68,11 @@ linuxthreads_db_headers := $(top_builddir)include/thread_db.h $(linuxthreads_db_headers): $(wildcard $(addprefix $(top_builddir)include/config/linuxthreads/,old.h new.h)) headers-$(PTHREADS_DEBUG_SUPPORT) += $(linuxthreads_db_headers) -objclean-y += libthread_db_clean -headers_clean-y += linuxthreads_db_headers_clean +objclean-y += CLEAN_libpthread/linuxthreads_db +headers_clean-y += HEADERCLEAN_libpthread/linuxthreads_db -linuxthreads_db_headers_clean: +HEADERCLEAN_libpthread/linuxthreads_db: $(do_rm) $(linuxthreads_db_headers) -libthread_db_clean: +CLEAN_libpthread/linuxthreads_db: $(do_rm) $(addprefix $(libthread_db_OUT)/*., o os oS a) diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in index c859c4c7a..83d03b72a 100644 --- a/libresolv/Makefile.in +++ b/libresolv/Makefile.in @@ -30,7 +30,7 @@ libresolv-so-y := $(libresolv_OBJ:.o=.os) lib-a-$(UCLIBC_HAS_LIBRESOLV_STUB) += $(top_builddir)lib/libresolv.a lib-so-$(UCLIBC_HAS_LIBRESOLV_STUB) += $(top_builddir)lib/libresolv.so -objclean-y += libresolv_clean +objclean-y += CLEAN_libresolv ifeq ($(DOPIC),y) $(top_builddir)lib/libresolv.so: $(top_builddir)lib/libresolv.a $(libc.depend) @@ -48,5 +48,5 @@ $(top_builddir)lib/libresolv.a: $(libresolv-a-y) $(Q)$(RM) $@ $(do_ar) -libresolv_clean: +CLEAN_libresolv: $(do_rm) $(addprefix $(libresolv_OUT)/*., o os a) diff --git a/librt/Makefile.in b/librt/Makefile.in index aaa19185a..5a8668f45 100644 --- a/librt/Makefile.in +++ b/librt/Makefile.in @@ -49,7 +49,7 @@ $(top_builddir)lib/librt.a: $(librt-a-y) $(Q)$(RM) $@ $(do_ar) -objclean-y += librt_clean +objclean-y += CLEAN_librt -librt_clean: +CLEAN_librt: $(do_rm) $(addprefix $(librt_OUT)/*., o os oS a) diff --git a/libutil/Makefile.in b/libutil/Makefile.in index b0182015c..d45760296 100644 --- a/libutil/Makefile.in +++ b/libutil/Makefile.in @@ -37,7 +37,7 @@ libutil-so-y := $(libutil_OBJ:.o=.os) lib-a-$(UCLIBC_HAS_LIBUTIL) += $(top_builddir)lib/libutil.a lib-so-$(UCLIBC_HAS_LIBUTIL) += $(top_builddir)lib/libutil.so -objclean-y += libutil_clean +objclean-y += CLEAN_libutil ifeq ($(DOMULTI),n) ifeq ($(DOPIC),y) @@ -64,5 +64,5 @@ $(top_builddir)lib/libutil.a: $(libutil-a-y) $(Q)$(RM) $@ $(do_ar) -libutil_clean: +CLEAN_libutil: $(do_rm) $(addprefix $(libutil_OUT)/*., o os oS a) diff --git a/utils/Makefile.in b/utils/Makefile.in index c2466542c..9ac9d6ad8 100644 --- a/utils/Makefile.in +++ b/utils/Makefile.in @@ -125,9 +125,9 @@ ifeq ($(UCLIBC_HAS_LOCALE),y) endif -objclean-y += utils_clean +objclean-y += CLEAN_utils -utils_clean: +CLEAN_utils: $(do_rm) $(addprefix $(utils_OUT)/, ldconfig ldd iconv locale *.host) # This is a hack.. $(Q)$(RM) $(utils_OUT)/.*.dep -- cgit v1.2.3