[git commit nptl_merge] rm uClibc_arch_features.h on install

Peter S. Mazinger ps.m at gmx.net
Sun Nov 22 08:37:56 UTC 2009


commit: http://git.uclibc.org/uClibc/commit/?id=a46c18e3ee62ea2e5c0498d1ef1ca2afb47f3022
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl_merge

uClibc_arch_features.h is included already by libc-symbols.h.
If gcc needs it, fix gcc.

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
---
 Makefile.in        |    3 +--
 include/features.h |    3 ---
 2 files changed, 1 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index affbe53..f0a6fb4 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -203,6 +203,7 @@ $(top_builddir)extra/scripts/unifdef: $(top_srcdir)extra/scripts/unifdef.c
 HEADERS_RM- := \
 	dl-osinfo.h \
 	_lfs_64.h \
+	bits/uClibc_arch_features.h \
 	bits/kernel_sigaction.h \
 	bits/kernel_stat.h \
 	bits/kernel_types.h \
@@ -215,8 +216,6 @@ HEADERS_RM- := \
 	bits/sigcontextinfo.h \
 	bits/stackinfo.h \
 	tls.h
-	# gcc 4.3.1 needs it, dont rm:
-	#bits/uClibc_arch_features.h
 HEADERS_RM-$(UCLIBC_HAS_FLOATS) += \
 	complex.h \
 	fpu_control.h \
diff --git a/include/features.h b/include/features.h
index 66447e2..8a39cc8 100644
--- a/include/features.h
+++ b/include/features.h
@@ -34,9 +34,6 @@
 #define __need_uClibc_config_h
 #include <bits/uClibc_config.h>
 #undef __need_uClibc_config_h
-#ifdef _LIBC
-#include <bits/uClibc_arch_features.h>
-#endif
 
 /* For uClibc, always optimize for size -- this should disable
  * a lot of expensive inlining...
-- 
1.6.3.3



More information about the uClibc-cvs mailing list