diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-30 20:38:08 +0000 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-05-30 20:38:08 +0000 |
| commit | 73372af094d8631c004ef9c6804364308c7d6093 (patch) | |
| tree | da145b90b9296884734c15e5a86048313595f84a | |
| parent | 60cb5307b9ae5614f0cbb280e19727e0c719a974 (diff) | |
- cannot really guarantee proper order, so play safe and compile the problematic
sources separately for now.
| -rw-r--r-- | libc/string/Makefile.in | 1 | ||||
| -rw-r--r-- | libc/string/__xpg_strerror_r.c | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 12 |
3 files changed, 6 insertions, 9 deletions
diff --git a/libc/string/Makefile.in b/libc/string/Makefile.in index 376316b7e..8931cc81a 100644 --- a/libc/string/Makefile.in +++ b/libc/string/Makefile.in @@ -106,6 +106,7 @@ STRING_COBJ := $(patsubst $(STRING_DIR)/%.c,$(STRING_OUT)/%.o,$(STRING_CSRC)) libc-y += $(STRING_COBJ) libc-nomulti-$(UCLIBC_HAS_XLOCALE) += $(STRING_OUT)/wcsxfrm_l.o +libc-nomulti-y += $(STRING_OUT)/__xpg_strerror_r.o objclean-y += string_objclean diff --git a/libc/string/__xpg_strerror_r.c b/libc/string/__xpg_strerror_r.c index ce186a061..001115261 100644 --- a/libc/string/__xpg_strerror_r.c +++ b/libc/string/__xpg_strerror_r.c @@ -6,7 +6,7 @@ */ /* Make sure we get proper strerror_r() prototype */ -#define strerror_r __moo +#define strerror_r _hidestrerror_r #include <features.h> #include <errno.h> diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index 64421b98d..618785d62 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -37,13 +37,6 @@ endif CFLAGS-ssp.c := $(SSP_DISABLE_FLAGS) CFLAGS-ssp-local.c := $(SSP_DISABLE_FLAGS) -ifneq ($(findstring mremap.c,$(CSRC)),) -# for -combine, make sure that we don't pollute our non-varargs mremap decl -# with some vararg decl from later in the TU by putting ours after anybody -# else who is picking up mman.h. -# This is admittedly a small work-around.. -CSRC := $(filter-out mremap.c,$(CSRC)) mremap.c -endif COMMON_SRC := $(patsubst %.c,$(COMMON_DIR)/%.c,$(CSRC)) COMMON_OBJ := $(patsubst %.c,$(COMMON_OUT)/%.o,$(CSRC)) @@ -51,7 +44,10 @@ 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-nomulti-y += $(COMMON_OUT)/__syscall_rt_sigaction.o $(COMMON_OUT)/__syscall_sigaction.o +libc-nomulti-y += $(COMMON_OUT)/__syscall_rt_sigaction.o \ + $(COMMON_OUT)/__syscall_sigaction.o \ + $(COMMON_OUT)/mremap.o \ + $(COMMON_OUT)/stat.o libc-nomulti-$(UCLIBC_HAS_SSP) += $(COMMON_OUT)/ssp.o objclean-y += common_objclean |