svn commit: trunk/uClibc/libc/sysdeps/linux/common
psm at uclibc.org
psm at uclibc.org
Wed Nov 2 23:51:32 UTC 2005
Author: psm
Date: 2005-11-02 15:51:31 -0800 (Wed, 02 Nov 2005)
New Revision: 12121
Log:
Allow partly IMA compile of this directory
Modified:
trunk/uClibc/libc/sysdeps/linux/common/Makefile.in
trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl.c
trunk/uClibc/libc/sysdeps/linux/common/getcwd.c
trunk/uClibc/libc/sysdeps/linux/common/open64.c
trunk/uClibc/libc/sysdeps/linux/common/wait4.c
Changeset:
Modified: trunk/uClibc/libc/sysdeps/linux/common/Makefile.in
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/Makefile.in 2005-11-02 23:48:06 UTC (rev 12120)
+++ trunk/uClibc/libc/sysdeps/linux/common/Makefile.in 2005-11-02 23:51:31 UTC (rev 12121)
@@ -14,11 +14,22 @@
CSRC:=$(filter-out sbrk.c,$(CSRC))
endif
+COMMON_SSP:=ssp.c ssp-local.c
+
+# full list
+#COMMON_NO_MULTI:=getcwd.c getrlimit.c getrlimit64.c setrlimit.c setrlimit64.c getpriority.c getpriority64.c setpriority.c getrusage.c wait4.c getitimer.c setitimer.c open.c open64.c uname.c __syscall_fcntl.c __syscall_fcntl64.c
+#COMMON_NO_MULTI:=getcwd.c getrlimit.c getrlimit64.c setrlimit.c setrlimit64.c getpriority.c setpriority.c getrusage.c wait4.c getitimer.c setitimer.c open.c uname.c __syscall_fcntl.c __syscall_rt_sigaction.c
+COMMON_NO_MULTI:=getrlimit.c getrlimit64.c setrlimit.c setrlimit64.c getpriority.c setpriority.c getrusage.c getitimer.c setitimer.c uname.c __syscall_rt_sigaction.c
+
ifneq ($(UCLIBC_HAS_SSP),y)
-CSRC:=$(filter-out ssp-local.c,$(CSRC))
-CSRC:=$(filter-out ssp.c,$(CSRC))
+CSRC:=$(filter-out $(COMMON_SSP),$(CSRC))
endif
+ifneq ($(DOMULTI),n)
+CSRC:=$(filter-out $(COMMON_NO_MULTI),$(CSRC))
+CSRC:=$(filter-out $(COMMON_SSP),$(CSRC))
+endif
+
# fails for some reason
ifneq ($(strip $(ARCH_OBJS)),)
CSRC:=$(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC))
@@ -34,9 +45,9 @@
libc-so-y+=$(COMMON_OBJ:.o=.os)
libc-nonshared-$(UCLIBC_HAS_SSP)+=$(COMMON_OUT)/ssp-local.os
-#libc-multi-y+=$(filter-out $(COMMON_DIR)/ssp.c,$(COMMON_SRC))
-#libc-nomulti-$(UCLIBC_HAS_SSP)+=$(COMMON_OUT)/ssp.o
-libc-nomulti-y+=$(COMMON_OBJ)
+libc-multi-y+=$(COMMON_SRC)
+libc-nomulti-y+=$(patsubst %.c,$(COMMON_OUT)/%.o,$(COMMON_NO_MULTI))
+libc-nomulti-$(UCLIBC_HAS_SSP)+=$(patsubst %.c,$(COMMON_OUT)/%.o,$(COMMON_SSP))
objclean-y+=common_objclean
Modified: trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl.c 2005-11-02 23:48:06 UTC (rev 12120)
+++ trunk/uClibc/libc/sysdeps/linux/common/__syscall_fcntl.c 2005-11-02 23:51:31 UTC (rev 12121)
@@ -12,7 +12,7 @@
#include <fcntl.h>
#if defined __UCLIBC_HAS_LFS__ && defined __NR_fcntl64
-extern int __libc_fcntl64(int fd, int cmd, long arg);
+extern int __libc_fcntl64(int fd, int cmd, ...);
#endif
#define __NR___syscall_fcntl __NR_fcntl
Modified: trunk/uClibc/libc/sysdeps/linux/common/getcwd.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/getcwd.c 2005-11-02 23:48:06 UTC (rev 12120)
+++ trunk/uClibc/libc/sysdeps/linux/common/getcwd.c 2005-11-02 23:51:31 UTC (rev 12121)
@@ -153,7 +153,7 @@
#endif
-char *getcwd(char *buf, int size)
+char *getcwd(char *buf, size_t size)
{
int ret;
char *path;
Modified: trunk/uClibc/libc/sysdeps/linux/common/open64.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/open64.c 2005-11-02 23:48:06 UTC (rev 12120)
+++ trunk/uClibc/libc/sysdeps/linux/common/open64.c 2005-11-02 23:51:31 UTC (rev 12121)
@@ -26,7 +26,7 @@
#endif
#ifdef __UCLIBC_HAS_LFS__
-extern int __libc_open (__const char *file, int oflag, mode_t mode);
+extern int __libc_open (__const char *file, int oflag, ...);
/* Open FILE with access OFLAG. If OFLAG includes O_CREAT,
a third argument is the file protection. */
Modified: trunk/uClibc/libc/sysdeps/linux/common/wait4.c
===================================================================
--- trunk/uClibc/libc/sysdeps/linux/common/wait4.c 2005-11-02 23:48:06 UTC (rev 12120)
+++ trunk/uClibc/libc/sysdeps/linux/common/wait4.c 2005-11-02 23:51:31 UTC (rev 12121)
@@ -8,12 +8,13 @@
*/
#include "syscalls.h"
+#include <sys/resource.h>
#define __NR___syscall_wait4 __NR_wait4
static inline _syscall4(int, __syscall_wait4, __kernel_pid_t, pid,
int *, status, int, opts, void *, rusage);
-int wait4(pid_t pid, int *status, int opts, void *rusage)
+int wait4(pid_t pid, int *status, int opts, struct rusage *rusage)
{
return (__syscall_wait4(pid, status, opts, rusage));
}
More information about the uClibc-cvs
mailing list