From c06619d7ab2ebbbc93427ca6a49dcc8d479db549 Mon Sep 17 00:00:00 2001 From: Bernhard Reutner-Fischer Date: Sat, 12 Jun 2010 13:29:14 +0200 Subject: nptl: simplify buildsys Signed-off-by: Bernhard Reutner-Fischer --- libpthread/nptl/sysdeps/generic/Makefile.in | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'libpthread/nptl/sysdeps/generic') diff --git a/libpthread/nptl/sysdeps/generic/Makefile.in b/libpthread/nptl/sysdeps/generic/Makefile.in index 96bf2ac6d..2091dca0a 100644 --- a/libpthread/nptl/sysdeps/generic/Makefile.in +++ b/libpthread/nptl/sysdeps/generic/Makefile.in @@ -10,22 +10,16 @@ # their architecture specific directory which will override # the one here. # -ifneq ($(TARGET_ARCH),mips) - libc_a_CSRC = libc-tls.c -endif -CFLAGS-generic = $(SSP_ALL_CFLAGS) -#CFLAGS:=$(CFLAGS:-O1=-O2) - -PTHREAD_GENERIC_OUT:=$(top_builddir)libpthread/nptl/sysdeps/generic +PTHREAD_LIBC_TLS_DIR := $(top_srcdir)libpthread/nptl/sysdeps/generic +PTHREAD_LIBC_TLS_OUT := $(top_builddir)libpthread/nptl/sysdeps/generic -LIBC_GENERIC_OBJ:=$(patsubst %.c,$(PTHREAD_GENERIC_OUT)/%.o,$(libc_a_CSRC)) +PTHREAD_LIBC_TLS_CSRC = dl-tls.c libc-tls.c +PTHREAD_LIBC_TLS_OBJS = $(patsubst %.c,$(PTHREAD_LIBC_TLS_OUT)/%.o,$(PTHREAD_LIBC_TLS_CSRC)) -libc-static-y+=$(LIBC_GENERIC_OBJ) - -libc-nomulti-y+=$(LIBC_GENERIC_OBJ) +CFLAGS-generic = $(SSP_ALL_CFLAGS) objclean-y += CLEAN_libpthread/nptl/sysdeps/generic CLEAN_libpthread/nptl/sysdeps/generic: - $(do_rm) $(addprefix $(PTHREAD_GENERIC_OUT)/*., o os oS) + $(do_rm) $(addprefix $(PTHREAD_LIBC_TLS_OUT)/*., o os oS) -- cgit v1.2.3