Last bits for IMA, now everything can be built w/ DOMULTI=y on gcc-3.4.4 with my config (no locale, the rest enabled). Not tested if libc is complete and usable. All the files listed in *_NO_MULTI need love, best would be to replace all multisources w/ single sources.

10 files changed, 17 insertions, 17 deletions

diff --git a/libc/sysdeps/linux/alpha/Makefile.arch b/libc/sysdeps/linux/alpha/Makefile.arch
index 4b9c45037..7022f636a 100644
--- a/libc/sysdeps/linux/alpha/Makefile.arch
+++ b/libc/sysdeps/linux/alpha/Makefile.arch
@@ -23,8 +23,8 @@ crt-y:=create
 libc-a-y+=$(ARCH_OBJS)
 libc-so-y+=$(ARCH_OBJS:.o=.os)
 
-#libc-multi-y+=$(ARCH_CSRC)
-libc-nomulti-y+=$(ARCH_OBJS)
+libc-multi-y+=$(ARCH_CSRC)
+libc-nomulti-y+=$(ARCH_SOBJ)
 
 objclean-y+=arch_objclean
 
diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch
index e44b145f9..dfea3b72f 100644
--- a/libc/sysdeps/linux/arm/Makefile.arch
+++ b/libc/sysdeps/linux/arm/Makefile.arch
@@ -23,8 +23,8 @@ crt-y:=create
 libc-a-y+=$(ARCH_OBJS)
 libc-so-y+=$(ARCH_OBJS:.o=.os)
 
-#libc-multi-y+=$(ARCH_CSRC)
-libc-nomulti-y+=$(ARCH_OBJS)
+libc-multi-y+=$(ARCH_CSRC)
+libc-nomulti-y+=$(ARCH_SOBJ)
 
 objclean-y+=arch_objclean
 
diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in
index 26560e84d..b287d5de9 100644
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@@ -18,7 +18,6 @@ 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)
diff --git a/libc/sysdeps/linux/cris/Makefile.arch b/libc/sysdeps/linux/cris/Makefile.arch
index 321ea3478..f7bb743af 100644
--- a/libc/sysdeps/linux/cris/Makefile.arch
+++ b/libc/sysdeps/linux/cris/Makefile.arch
@@ -25,8 +25,8 @@ crt-y:=create
 libc-a-y+=$(ARCH_OBJS)
 libc-so-y+=$(ARCH_OBJS:.o=.os)
 
-#libc-multi-y+=$(ARCH_CSRC)
-libc-nomulti-y+=$(ARCH_OBJS)
+libc-multi-y+=$(ARCH_CSRC)
+libc-nomulti-y+=$(ARCH_SOBJ)
 
 objclean-y+=arch_objclean
 
diff --git a/libc/sysdeps/linux/i386/Makefile.arch b/libc/sysdeps/linux/i386/Makefile.arch
index dff7e4407..a5c969bce 100644
--- a/libc/sysdeps/linux/i386/Makefile.arch
+++ b/libc/sysdeps/linux/i386/Makefile.arch
@@ -25,6 +25,7 @@ libc-a-y+=$(ARCH_OBJS)
 libc-so-y+=$(ARCH_OBJS:.o=.os)
 
 libc-multi-y+=$(ARCH_CSRC)
+libc-nomulti-y+=$(ARCH_SOBJ)
 
 objclean-y+=arch_objclean
 
diff --git a/libc/sysdeps/linux/mips/Makefile.arch b/libc/sysdeps/linux/mips/Makefile.arch
index 5878aa708..792ac5340 100644
--- a/libc/sysdeps/linux/mips/Makefile.arch
+++ b/libc/sysdeps/linux/mips/Makefile.arch
@@ -25,8 +25,8 @@ crt-y:=create
 libc-a-y+=$(ARCH_OBJS)
 libc-so-y+=$(ARCH_OBJS:.o=.os)
 
-#libc-multi-y+=$(ARCH_CSRC)
-libc-nomulti-y+=$(ARCH_OBJS)
+libc-multi-y+=$(ARCH_CSRC)
+libc-nomulti-y+=$(ARCH_SOBJ)
 
 objclean-y+=arch_objclean
 
diff --git a/libc/sysdeps/linux/powerpc/Makefile.arch b/libc/sysdeps/linux/powerpc/Makefile.arch
index f0c5d9f02..d3ee147c1 100644
--- a/libc/sysdeps/linux/powerpc/Makefile.arch
+++ b/libc/sysdeps/linux/powerpc/Makefile.arch
@@ -23,8 +23,8 @@ crt-y:=create
 libc-a-y+=$(ARCH_OBJS)
 libc-so-y+=$(ARCH_OBJS:.o=.os)
 
-#libc-multi-y+=$(ARCH_CSRC)
-libc-nomulti-y+=$(ARCH_OBJS)
+libc-multi-y+=$(ARCH_CSRC)
+libc-nomulti-y+=$(ARCH_SOBJ)
 
 objclean-y+=arch_objclean
 
diff --git a/libc/sysdeps/linux/sh/Makefile.arch b/libc/sysdeps/linux/sh/Makefile.arch
index 686361772..e3a9fd936 100644
--- a/libc/sysdeps/linux/sh/Makefile.arch
+++ b/libc/sysdeps/linux/sh/Makefile.arch
@@ -23,8 +23,8 @@ crt-y:=create
 libc-a-y+=$(ARCH_OBJS)
 libc-so-y+=$(ARCH_OBJS:.o=.os)
 
-#libc-multi-y+=$(ARCH_CSRC)
-libc-nomulti-y+=$(ARCH_OBJS)
+libc-multi-y+=$(ARCH_CSRC)
+libc-nomulti-y+=$(ARCH_SOBJ)
 
 objclean-y+=arch_objclean
 
diff --git a/libc/sysdeps/linux/sparc/Makefile.arch b/libc/sysdeps/linux/sparc/Makefile.arch
index c446653b2..b7899b1cd 100644
--- a/libc/sysdeps/linux/sparc/Makefile.arch
+++ b/libc/sysdeps/linux/sparc/Makefile.arch
@@ -23,8 +23,8 @@ crt-y:=create
 libc-a-y+=$(ARCH_OBJS)
 libc-so-y+=$(ARCH_OBJS:.o=.os)
 
-#libc-multi-y+=$(ARCH_CSRC)
-libc-nomulti-y+=$(ARCH_OBJS)
+libc-multi-y+=$(ARCH_CSRC)
+libc-nomulti-y+=$(ARCH_SOBJ)
 
 objclean-y+=arch_objclean
 
diff --git a/libc/sysdeps/linux/x86_64/Makefile.arch b/libc/sysdeps/linux/x86_64/Makefile.arch
index 6752c275d..5ba47ce2e 100644
--- a/libc/sysdeps/linux/x86_64/Makefile.arch
+++ b/libc/sysdeps/linux/x86_64/Makefile.arch
@@ -23,8 +23,8 @@ crt-y:=create
 libc-a-y+=$(ARCH_OBJS)
 libc-so-y+=$(ARCH_OBJS:.o=.os)
 
-#libc-multi-y+=$(ARCH_CSRC)
-libc-nomulti-y+=$(ARCH_OBJS)
+libc-multi-y+=$(ARCH_CSRC)
+libc-nomulti-y+=$(ARCH_SOBJ)
 
 objclean-y+=arch_objclean