diff options
| author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-06-08 23:05:48 +0200 |
|---|---|---|
| committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2010-06-08 23:05:48 +0200 |
| commit | 85998f8b7b0b50729c3b0bc491aa995f799e5637 (patch) | |
| tree | 9c02877b15d97c3c307caa592b19581a334a5c80 /libpthread | |
| parent | 94a99ff6131111381e7f803e10638ab547c40c2f (diff) | |
nptl: fix for !ipv4 && !ipv6
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Diffstat (limited to 'libpthread')
| -rw-r--r-- | libpthread/nptl/Makefile.in | 11 | ||||
| -rw-r--r-- | libpthread/nptl/pthread_create.c | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in index c229673c5..a5bffdfd5 100644 --- a/libpthread/nptl/Makefile.in +++ b/libpthread/nptl/Makefile.in @@ -9,7 +9,7 @@ subdirs += libpthread/nptl/sysdeps/$(TARGET_ARCH) \ libpthread/nptl/sysdeps/unix/sysv/linux \ libpthread/nptl/sysdeps/pthread -libpthread-routines = init vars events version \ +libpthread-routines-y = init vars events version \ pthread_create pthread_exit pthread_detach \ pthread_join pthread_tryjoin pthread_timedjoin \ pthread_self pthread_equal pthread_yield \ @@ -95,16 +95,17 @@ libpthread-routines = init vars events version \ pt-raise pt-system \ flockfile ftrylockfile funlockfile \ sigaction \ - herrno res \ + herrno \ pthread_kill_other_threads \ pthread_getaffinity pthread_setaffinity \ pthread_attr_getaffinity pthread_attr_setaffinity \ cleanup_routine unwind-forcedunwind +libpthread-routines-$(findstring y,$(UCLIBC_HAS_IPV4)$(UCLIBC_HAS_IPV6)) += res libpthread-shared-only-routines = version pt-allocrtsig unwind-forcedunwind ifeq ($(TARGET_ARCH),x86_64) -libpthread-routines := $(filter-out cancellation,$(libpthread-routines)) +libpthread-routines-y := $(filter-out cancellation,$(libpthread-routines-y)) endif CFLAGS-pthread_atfork.c = -DNOT_IN_libc @@ -244,10 +245,10 @@ libpthread_a_SRC = $(patsubst %, $(PTHREAD_DIR)/%.c, \ $(filter-out $(libpthread-os-routines) \ $(libpthread-misc-routines) \ $(libpthread-shared-only-routines), \ - $(libpthread-routines))) + $(libpthread-routines-y))) libpthread_so_SRC = $(patsubst %, $(PTHREAD_DIR)/%.c, \ $(filter-out $(libpthread-os-routines) \ - $(libpthread-misc-routines), $(libpthread-routines))) + $(libpthread-misc-routines), $(libpthread-routines-y))) ifeq ($(TARGET_ARCH),x86_64) libc-static-y += $(patsubst %.c, $(PTHREAD_OUT)/%.o, alloca_cutoff.c) diff --git a/libpthread/nptl/pthread_create.c b/libpthread/nptl/pthread_create.c index 8b53cb199..63e5588d5 100644 --- a/libpthread/nptl/pthread_create.c +++ b/libpthread/nptl/pthread_create.c @@ -233,10 +233,10 @@ start_thread (void *arg) HP_TIMING_NOW (now); THREAD_SETMEM (pd, cpuclock_offset, now); #endif - +#if defined __UCLIBC_HAS_IPV4__ || defined __UCLIBC_HAS_IPV6__ /* Initialize resolver state pointer. */ __resp = &pd->res; - +#endif #ifdef __NR_set_robust_list # ifndef __ASSUME_SET_ROBUST_LIST if (__set_robust_list_avail >= 0) |