diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-17 02:07:34 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2005-11-17 02:07:34 +0000 |
| commit | 94a2a2040adfc4863ab2fb501cdbf4fb87849be2 (patch) | |
| tree | 39155622b8c9114bf41aa79b2918837e73a933cb /libc/sysdeps/linux/common | |
| parent | f749efc0e5f1f8602c7e4f0c8c5b7d52ac18ab53 (diff) | |
| download | uClibc-alpine-94a2a2040adfc4863ab2fb501cdbf4fb87849be2.tar.bz2 uClibc-alpine-94a2a2040adfc4863ab2fb501cdbf4fb87849be2.tar.xz | |
Massive merge from trunk.
Diffstat (limited to 'libc/sysdeps/linux/common')
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index 2ddb9128a..b287d5de9 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -14,9 +14,19 @@ ifeq ($(EXCLUDE_BRK),y) CSRC:=$(filter-out sbrk.c,$(CSRC)) endif -CSRC:=$(filter-out ssp-local.c,$(CSRC)) +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:=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.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 @@ -31,13 +41,12 @@ COMMON_SRC:=$(patsubst %.c,$(COMMON_DIR)/%.c,$(CSRC)) COMMON_OBJ:=$(patsubst %.c,$(COMMON_OUT)/%.o,$(CSRC)) libc-a-y+=$(COMMON_OBJ) -libc-a-static-$(UCLIBC_HAS_SSP)+=$(COMMON_OUT)/ssp-local.o 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 |