[git commit nptl] no need for bits/syscalls.h on target

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


commit: http://git.uclibc.org/uClibc/commit/?id=a81e1180eb8da569ba778eadf2fc1fc65d3a452c
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/nptl

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop at gmail.com>
Signed-off-by: Austin Foxley <austinf at cetoncorp.com>
---
 Makefile.in           |    5 +----
 include/sys/syscall.h |   10 +++++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index e4321b9..448c741 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -216,6 +216,7 @@ HEADERS_RM- := \
 	bits/kernel_sigaction.h \
 	bits/kernel_stat.h \
 	bits/kernel_types.h \
+	bits/syscalls.h \
 	bits/syscalls-common.h \
 	bits/utmpx.h \
 	bits/uClibc_errno.h \
@@ -294,10 +295,6 @@ install_headers: headers $(top_builddir)extra/scripts/unifdef
 	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)include
 	top_builddir=$(top_builddir) \
 	$(top_srcdir)extra/scripts/install_headers.sh include $(PREFIX)$(DEVEL_PREFIX)include
-	# Disabled. If libc-internal.h is needed, document here why!
-	#printf '#ifndef _LIBC_INTERNAL_H\n#define _LIBC_INTERNAL_H 1\n#endif\n' >$(PREFIX)$(DEVEL_PREFIX)include/libc-internal.h
-	echo '/* Dont use _syscall#() macros; use the syscall() function */' > \
-		$(PREFIX)$(DEVEL_PREFIX)include/bits/syscalls.h
 	cd $(PREFIX)$(DEVEL_PREFIX)include && $(RM) -r $(HEADERS_RM-)
 ifeq ($(UCLIBC_HAS_WCHAR),)
 	cd $(PREFIX)$(DEVEL_PREFIX)include && mv -f wchar-stub.h wchar.h
diff --git a/include/sys/syscall.h b/include/sys/syscall.h
index db8364b..25264cf 100644
--- a/include/sys/syscall.h
+++ b/include/sys/syscall.h
@@ -19,18 +19,18 @@
 #ifndef _SYSCALL_H
 #define _SYSCALL_H	1
 
+/* User application code should use syscall(). */
+
+#include <features.h>
+#include <bits/sysnum.h>
+#ifdef _LIBC
 /* The _syscall#() macros are for uClibc internal use only.
- * User application code should use syscall() instead.
  *
  * The kernel provided _syscall[0-6] macros from asm/unistd.h are not suitable
  * for use in uClibc as they lack PIC support etc, so for uClibc we use our own
  * local _syscall# macros to be certain all such variations are handled
  * properly.
  */
-
-#include <features.h>
-#include <bits/sysnum.h>
-#if defined _LIBC && (defined IS_IN_libc || defined NOT_IN_libc)
 # include <bits/syscalls.h>
 # include <bits/syscalls-common.h>
 #endif
-- 
1.6.3.3



More information about the uClibc-cvs mailing list