diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-07-01 10:28:46 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-07-06 18:33:22 +0200 |
| commit | 9381d622e2411a35a5fd73a5a573eb269e2dd9c9 (patch) | |
| tree | 84b4bcad496368d6ce9875451e5adcc9c6138560 /libpthread/nptl/sysdeps/generic | |
| parent | eaae6e6776ad091a5b84c3fb09f26ff01bda2f18 (diff) | |
nptl: fix buildsys
Now automatically picks the correct (arch and subarch specific) impls in
favour of generic impls.
make O=/tmp/objs PREFIX=/my/sysroot -j
works now as expected (both out-of-tree as well as parallel-safe).
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libpthread/nptl/sysdeps/generic')
| -rw-r--r-- | libpthread/nptl/sysdeps/generic/Makefile.in | 14 | ||||
| -rw-r--r-- | libpthread/nptl/sysdeps/generic/dl-tls.c | 3 |
2 files changed, 11 insertions, 6 deletions
diff --git a/libpthread/nptl/sysdeps/generic/Makefile.in b/libpthread/nptl/sysdeps/generic/Makefile.in index 03b2aa175..890fe050d 100644 --- a/libpthread/nptl/sysdeps/generic/Makefile.in +++ b/libpthread/nptl/sysdeps/generic/Makefile.in @@ -10,16 +10,18 @@ subdirs += libpthread/nptl/sysdeps/generic # their architecture specific directory which will override # the one here. # +libpthread_generic_DIR := $(top_srcdir)libpthread/nptl/sysdeps/generic +libpthread_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 - -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)) +libpthread_generic_libc_a_CSRC = libc-tls.c +libpthread_generic_libc_a_COBJ = $(patsubst %.c,$(libpthread_generic_OUT)/%.o,$(libpthread_generic_libc_a_CSRC)) +libpthread_generic_libc_a_OBJS = $(libpthread_generic_libc_a_COBJ) +libpthread_ld_tls_CSRC = dl-tls.c +libpthread_ld_tls_COBJ = $(patsubst %.c,$(libpthread_generic_OUT)/%.o,$(libpthread_ld_tls_CSRC)) CFLAGS-generic = $(SSP_ALL_CFLAGS) objclean-y += CLEAN_libpthread/nptl/sysdeps/generic CLEAN_libpthread/nptl/sysdeps/generic: - $(do_rm) $(addprefix $(PTHREAD_LIBC_TLS_OUT)/*., o os oS) + $(do_rm) $(addprefix $(libpthread_generic_OUT)/*., o os oS) diff --git a/libpthread/nptl/sysdeps/generic/dl-tls.c b/libpthread/nptl/sysdeps/generic/dl-tls.c index b65608f80..4acfa4ba7 100644 --- a/libpthread/nptl/sysdeps/generic/dl-tls.c +++ b/libpthread/nptl/sysdeps/generic/dl-tls.c @@ -17,6 +17,9 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ +#if defined SHARED || defined NOT_IN_libc +# error in buildsystem: This file is for libc.a +#endif #include <libintl.h> #include <signal.h> #include <stdlib.h> |