diff options
| -rw-r--r-- | test/nptl/Makefile | 16 | ||||
| -rw-r--r-- | test/nptl/tst-barrier4.c | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/test/nptl/Makefile b/test/nptl/Makefile index 8ac8c8c63..130a1fc88 100644 --- a/test/nptl/Makefile +++ b/test/nptl/Makefile @@ -20,18 +20,16 @@ TOPDIR = ../../ PTDIR = $(TOPDIR)libpthread/nptl include ../Rules.mak -TARGET_ARCH:=$(strip $(subst ",, $(strip $(TARGET_ARCH)))) +TARGET_ARCH := $(strip $(subst ",, $(strip $(TARGET_ARCH)))) INCLUDES := -I$(TOPDIR)include -I. \ -I$(PTDIR) \ - -I$(PTDIR)/compat \ -I$(PTDIR)/sysdeps/unix/sysv/linux/$(TARGET_ARCH) \ -I$(PTDIR)/sysdeps/$(TARGET_ARCH) \ -I$(PTDIR)/sysdeps/unix/sysv/linux \ -I$(PTDIR)/sysdeps/pthread \ -I$(PTDIR)/sysdeps/pthread/bits \ -I$(PTDIR)/sysdeps/generic \ - -include $(PTDIR)/compat/libc-symbols.h \ -I$(TOPDIR)ldso/include \ -I$(TOPDIR)ldso/ldso/$(TARGET_ARCH) @@ -75,13 +73,13 @@ SO_LDFLAGS-tst-tls5mod.os=-Wl,-soname,tst-tls5mod.so # # DSO modules # -OS_OBJS = $(patsubst %.c, %.os, $(wildcard tst-*mod*.c)) -SO_OBJS = $(patsubst %.c, %.so, $(wildcard tst-*mod*.c)) +OS_OBJS := $(patsubst %.c, %.os, $(wildcard tst-*mod*.c)) +SO_OBJS := $(patsubst %.c, %.so, $(wildcard tst-*mod*.c)) # # Test applications and support objects # -OBJS = tst-cleanup4aux.o +OBJS := tst-cleanup4aux.o TARGETS = tst-align tst-align2 \ tst-atfork1 \ @@ -90,7 +88,7 @@ TARGETS = tst-align tst-align2 \ tst-basic1 tst-basic2 tst-basic4 tst-basic5 tst-basic6 \ tst-cancel1 tst-cancel8 tst-cancel10 tst-cancel12 \ tst-cancel16 tst-cancel19 \ - tst-cleanup1 tst-cleanup2 tst-cleanup3 \ + tst-cleanup0 tst-cleanup1 tst-cleanup2 tst-cleanup3 \ tst-clock1 tst-clock2 \ tst-cond1 tst-cond2 tst-cond3 tst-cond4 tst-cond5 tst-cond6 \ tst-cond7 tst-cond8 tst-cond9 tst-cond10 tst-cond11 \ @@ -98,7 +96,6 @@ TARGETS = tst-align tst-align2 \ tst-cond17 tst-cond18 tst-cond19 tst-cond20 tst-cond21 \ tst-detach1 \ tst-eintr1 tst-eintr2 tst-eintr3 tst-eintr4 tst-eintr5 \ - tst-exec2 tst-exec3 tst-exec4 \ tst-flock1 tst-flock2 \ tst-fork1 tst-fork2 tst-fork3 tst-fork4 \ tst-initializers1 \ @@ -147,6 +144,9 @@ $(patsubst %, %, $(TARGETS)): $(patsubst %, %.o, $(TARGETS)) $(patsubst %, %.o, $(TARGETS)): %.o : %.c $(CC) $(CFLAGS) $(CFLAGS-$<) -c $< -o $@ +$(OBJS): %.o : %.c + $(CC) $(CFLAGS) -c $< -o $@ + $(OS_OBJS): %.os : %.c $(CC) $(SO_CFLAGS) -c $< -o $@ diff --git a/test/nptl/tst-barrier4.c b/test/nptl/tst-barrier4.c index 56ea044e0..efc27551c 100644 --- a/test/nptl/tst-barrier4.c +++ b/test/nptl/tst-barrier4.c @@ -21,6 +21,7 @@ #include <errno.h> #include <pthread.h> #include <stdio.h> +#include <stdlib.h> static pthread_barrier_t b1; |