libc-{a,so,multi}-y replaced by libc-y covering common objects both in libc.a/libc.so, the diffs go into libc-static-y/libc-shared-y exclusively, add IMA to libc, don't use any MSRC anymore

3 files changed, 27 insertions, 67 deletions

diff --git a/libc/sysdeps/linux/Makefile.commonarch b/libc/sysdeps/linux/Makefile.commonarch
index 5feffe8d6..ea4ba53b3 100644
--- a/libc/sysdeps/linux/Makefile.commonarch
+++ b/libc/sysdeps/linux/Makefile.commonarch
@@ -1,6 +1,6 @@
 # Makefile template to be included by sysdeps/linux/<ARCH>/Makefile.arch
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
@@ -16,9 +16,7 @@ ARCH_SOBJ := $(patsubst %.s,$(ARCH_OUT)/%.o,$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSR
 ARCH_OBJS := $(ARCH_COBJ) $(ARCH_SOBJ)
 
 crt-y          := create
-libc-a-y       += $(ARCH_OBJS)
-libc-so-y      += $(ARCH_OBJS:.o=.os)
-libc-multi-y   += $(ARCH_CSRC)
+libc-y         += $(ARCH_OBJS)
 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 8869c5aa8..e1fda271c 100644
--- a/libc/sysdeps/linux/common/Makefile.in
+++ b/libc/sysdeps/linux/common/Makefile.in
@@ -1,57 +1,47 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-COMMON_DIR:=$(top_srcdir)libc/sysdeps/linux/common
-COMMON_OUT:=$(top_builddir)libc/sysdeps/linux/common
+COMMON_DIR := $(top_srcdir)libc/sysdeps/linux/common
+COMMON_OUT := $(top_builddir)libc/sysdeps/linux/common
 
-CSRC:=$(patsubst $(COMMON_DIR)/%.c,%.c,$(wildcard $(COMMON_DIR)/*.c))
+CSRC := $(notdir $(wildcard $(COMMON_DIR)/*.c))
 
 ifeq ($(EXCLUDE_BRK),y)
-CSRC:=$(filter-out sbrk.c,$(CSRC))
+CSRC := $(filter-out sbrk.c,$(CSRC))
 endif
 
 ifneq ($(UCLIBC_HAS_LFS),y)
-CSRC_LFS:=$(patsubst $(COMMON_DIR)/%.c,%.c,$(wildcard $(COMMON_DIR)/*64.c))
-CSRC:=$(filter-out llseek.c $(CSRC_LFS),$(CSRC))
+CSRC_LFS := $(notdir $(wildcard $(COMMON_DIR)/*64.c))
+CSRC := $(filter-out llseek.c $(CSRC_LFS),$(CSRC))
 endif
 
-# 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:=getrlimit.c getrlimit64.c setrlimit.c setrlimit64.c getpriority.c setpriority.c getrusage.c getitimer.c setitimer.c uname.c __syscall_rt_sigaction.c
-
-CSRC:=$(filter-out ssp-local.c,$(CSRC))
+CSRC := $(filter-out ssp-local.c,$(CSRC))
 ifneq ($(UCLIBC_HAS_SSP),y)
-CSRC:=$(filter-out ssp.c,$(CSRC))
-endif
-
-ifneq ($(DOMULTI),n)
-CSRC:=$(filter-out $(COMMON_NO_MULTI),$(CSRC))
+CSRC := $(filter-out ssp.c,$(CSRC))
 endif
 
 # fails for some reason
 ifneq ($(strip $(ARCH_OBJS)),)
-CSRC:=$(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC))
+CSRC := $(filter-out $(notdir $(ARCH_OBJS:.o=.c)),$(CSRC))
 endif
 
-CFLAGS-ssp.c=$(SSP_DISABLE_FLAGS)
-CFLAGS-ssp-local.c=$(SSP_DISABLE_FLAGS)
+CFLAGS-ssp.c := $(SSP_DISABLE_FLAGS)
+CFLAGS-ssp-local.c := $(SSP_DISABLE_FLAGS)
 
-COMMON_SRC:=$(patsubst %.c,$(COMMON_DIR)/%.c,$(CSRC))
-COMMON_OBJ:=$(patsubst %.c,$(COMMON_OUT)/%.o,$(CSRC))
+COMMON_SRC := $(patsubst %.c,$(COMMON_DIR)/%.c,$(CSRC))
+COMMON_OBJ := $(patsubst %.c,$(COMMON_OUT)/%.o,$(CSRC))
 
-libc-a-y+=$(COMMON_OBJ)
-libc-so-y+=$(COMMON_OBJ:.o=.os)
-libc-static-$(UCLIBC_HAS_SSP)+=$(COMMON_OUT)/ssp-local.o
-libc-nonshared-$(UCLIBC_HAS_SSP)+=$(COMMON_OUT)/ssp-local.os
+libc-y += $(COMMON_OBJ)
+libc-static-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp-local.o
+libc-nonshared-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp-local.os
 
-libc-multi-y+=$(COMMON_SRC)
-libc-nomulti-y+=$(patsubst %.c,$(COMMON_OUT)/%.o,$(COMMON_NO_MULTI))
+libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o
 
-objclean-y+=common_objclean
+objclean-y += common_objclean
 
 common_objclean:
 	$(RM) $(COMMON_OUT)/*.{o,os}
diff --git a/libc/sysdeps/linux/vax/Makefile.arch b/libc/sysdeps/linux/vax/Makefile.arch
index 4a0d52877..0e4df44e0 100644
--- a/libc/sysdeps/linux/vax/Makefile.arch
+++ b/libc/sysdeps/linux/vax/Makefile.arch
@@ -1,41 +1,13 @@
 # Makefile for uClibc
 #
-# Copyright (C) 2000-2005 Erik Andersen <andersen@uclibc.org>
-# Copyright (C) 2005 Jan-Benedict Glaw <jbglaw@lug-owl.de>
+# Copyright (C) 2000-2006 Erik Andersen <andersen@uclibc.org>
+# Copyright (C) 2005-2006 Jan-Benedict Glaw <jbglaw@lug-owl.de>
 #
 # Licensed under the LGPL v2.1, see the file COPYING.LIB in this tarball.
 #
 
-CSRC:=brk.c _mmap.c
-SSRC:=__longjmp.S setjmp.S _setjmp.S clone.S
-
-ARCH_DIR:=$(top_srcdir)libc/sysdeps/linux/vax
-ARCH_OUT:=$(top_builddir)libc/sysdeps/linux/vax
-
-ARCH_CSRC:=$(patsubst %.c,$(ARCH_DIR)/%.c,$(CSRC))
-ARCH_COBJ:=$(patsubst %.c,$(ARCH_OUT)/%.o,$(CSRC))
-ARCH_SSRC:=$(patsubst %.S,$(ARCH_DIR)/%.S,$(SSRC))
-ARCH_SOBJ:=$(patsubst %.S,$(ARCH_OUT)/%.o,$(SSRC))
-
-ARCH_OBJS:=$(ARCH_COBJ) $(ARCH_SOBJ)
-
-crt-y:=create
-libc-a-y+=$(ARCH_OBJS)
-libc-a-pic-y+=$(ARCH_OBJS:.o=.os)
-libc-so-y+=$(ARCH_OBJS:.o=.os)
-
-#libc-multi-y+=$(ARCH_CSRC)
-libc-nomulti-y+=$(ARCH_OBJS)
-
-objclean-y+=arch_objclean
-
-arch_objclean:
-	$(RM) $(ARCH_OUT)/*.{o,os}
-
-headers-y+=arch_headers
-#
-arch_headers:
-#	arm has this, but we don't (yet?)...
-#	$(LN) -fs ../libc/sysdeps/linux/vax/fpu_control.h $(top_builddir)include/
-#
+# psm: rename _mmap.c, else the generic won't be overwritten
+CSRC := brk.c _mmap.c
+SSRC := __longjmp.S setjmp.S _setjmp.S clone.S
 
+include $(top_srcdir)libc/sysdeps/linux/Makefile.commonarch