diff options
| author | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-24 02:51:45 +0000 |
|---|---|---|
| committer | "Steven J. Hill" <sjhill@realitydiluted.com> | 2006-08-24 02:51:45 +0000 |
| commit | d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c (patch) | |
| tree | 6f5cb1fa2fc62027df2614e8f8498f3eea8bc465 /libc/sysdeps/linux | |
| parent | e116018ce23fc3dcee95c2c23f9f4f7b54acd92e (diff) | |
| download | uClibc-alpine-d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c.tar.bz2 uClibc-alpine-d2db9bdb4c79afcd4b09353346cd4eaf63b6cd2c.tar.xz | |
Merge from trunk and bring in NPTL code in the various 'misc' subsystems.
Diffstat (limited to 'libc/sysdeps/linux')
| -rw-r--r-- | libc/sysdeps/linux/Makefile.commonarch | 3 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/libc/sysdeps/linux/Makefile.commonarch b/libc/sysdeps/linux/Makefile.commonarch index ea4ba53b3..d45aa5756 100644 --- a/libc/sysdeps/linux/Makefile.commonarch +++ b/libc/sysdeps/linux/Makefile.commonarch @@ -16,6 +16,9 @@ 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 c3f2009cc..c2c756edc 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -25,7 +25,9 @@ CSRC := $(filter-out ssp.c,$(CSRC)) endif ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y) -CSRC := $(filter-out fork.c getpid.c raise.c pause.c open.c close.c read.c write.c nanosleep.c __syscall_rt_sigaction.c,$(CSRC)) +CSRC := $(filter-out fork.c getpid.c raise.c pause.c open.c close.c \ + read.c write.c nanosleep.c __syscall_rt_sigaction.c msync.c \ + lseek.c __syscall_fcntl64.c, $(CSRC)) endif # fails for some reason @@ -42,6 +44,9 @@ COMMON_OBJ := $(patsubst %.c,$(COMMON_OUT)/%.o,$(CSRC)) 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-a-y += $(COMMON_OBJ) +libc-so-y += $(COMMON_OBJ) +libc-a-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp-local.o libc-nomulti-y += $(COMMON_OUT)/__syscall_rt_sigaction.o $(COMMON_OUT)/__syscall_sigaction.o libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o |