X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=Makefile;h=02d3b2774d531c4550c81b7b2d90f6926d9523fa;hp=5b8e6557c5fffe1a9d5e7946fa0d42d6a31014ed;hb=1050892f30b28680a92f7d6966656d688201037b;hpb=b82229e490f08be13bc5c9916ec4793410467f7b

diff --git a/Makefile b/Makefile
index 5b8e655..02d3b27 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,24 @@
 CFLAGS=-Wall -O2 -g -I.
 LDFLAGS=-lpthread
 
+HOSTTYPE=$(shell uname -m)
+
+ifeq ("${HOSTTYPE}","x86_64")
+ARCHTYPE=x86
+endif
+ifeq ("${HOSTTYPE}","i586")
+ARCHTYPE=x86
+endif
+ifeq ("${HOSTTYPE}","i686")
+ARCHTYPE=x86
+endif
+ifeq ("${HOSTTYPE}","powerpc")
+ARCHTYPE=ppc
+endif
+ifeq ("${HOSTTYPE}","ppc64")
+ARCHTYPE=ppc
+endif
+
 #debug
 #CFLAGS=-Wall -g
 #CFLAGS+=-DDEBUG_FULL_MB
@@ -11,30 +29,37 @@ LDFLAGS=-lpthread
 
 SRC_DEP=`echo $^ | sed 's/[^ ]*\.h//g'`
 
-all: arch-api test_urcu test_urcu_dynamic_link test_urcu_timing \
+all: checkarch test_urcu test_urcu_dynamic_link test_urcu_timing \
 	test_rwlock_timing test_rwlock test_perthreadlock_timing \
 	test_perthreadlock test_urcu_yield test_urcu_mb \
 	urcu-asm.S test_qsbr_timing test_qsbr urcu-asm.o urcutorture \
-	urcutorture-yield liburcu.so
+	urcutorture-yield liburcu.so test_mutex test_looplen
+
+checkarch:
+ifeq (${ARCHTYPE},)
+	@echo "Architecture ${HOSTTYPE} is currently unsupported by liburcu"
+	@exit 1
+endif
+
+arch.h: arch_${ARCHTYPE}.h
+	cp -f arch_${ARCHTYPE}.h arch.h
+
+api.h: api_${ARCHTYPE}.h
+	cp -f api_${ARCHTYPE}.h api.h
 
-arch-api: api.h arch.h
-	# Run either make pthreads-x86 or make pthreads-ppc prior to build
-	# the RCU library. Architecture auto-detectection not implemented
-	# in the build system yet.
+arch_atomic.h: arch_atomic_${ARCHTYPE}.h
+	cp -f arch_atomic_${ARCHTYPE}.h arch_atomic.h
 
-pthreads-x86: clean
-	cp api_x86.h api.h
-	cp arch_x86.h arch.h
-	cp arch_atomic_x86.h arch_atomic.h
+urcu.h: arch.h api.h arch_atomic.h
 
-pthreads-ppc: clean
-	cp api_ppc.h api.h
-	cp arch_ppc.h arch.h
-	cp arch_atomic_ppc.h arch_atomic.h
+urcu-qsbr.h: arch.h api.h arch_atomic.h
 
 test_urcu: urcu.o test_urcu.c urcu.h
 	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
+test_looplen: test_looplen.c urcu.h
+	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
+
 test_urcu_mb: urcu-mb.o test_urcu.c urcu.h
 	$(CC) -DDEBUG_FULL_MB ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
@@ -47,6 +72,9 @@ test_rwlock: urcu.o test_rwlock.c urcu.h
 test_perthreadlock: urcu.o test_perthreadlock.c urcu.h
 	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
+test_mutex: urcu.o test_mutex.c urcu.h
+	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
+
 test_urcu_dynamic_link: urcu.o test_urcu.c urcu.h
 	$(CC) ${CFLAGS} -DDYNAMIC_LINK_TEST $(LDFLAGS) -o $@ $(SRC_DEP)
 
@@ -92,7 +120,7 @@ urcutorture: urcutorture.c urcu.o urcu.h rcutorture.h
 urcutorture-yield: urcutorture.c urcu-yield.o urcu.h rcutorture.h
 	$(CC) -DDEBUG_YIELD ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
-.PHONY: clean install arch-api
+.PHONY: clean install checkarch
 
 install: liburcu.so
 	cp -f liburcu.so /usr/lib/
@@ -103,5 +131,6 @@ clean:
 	test_rwlock_timing test_rwlock test_perthreadlock_timing \
 	test_perthreadlock test_urcu_yield test_urcu_mb \
 	urcu-asm.S test_qsbr_timing test_qsbr urcutorture \
-	urcutorture-yield liburcu.so
+	urcutorture-yield liburcu.so api.h arch.h arch_atomic.h \
+	test_mutex