X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=Makefile;h=917aa1a31b6be0d90b974da8d1759f55123cd239;hb=0d21ab2de8ec0b6607654e0122a1302639d6fe5b;hp=371c107d1300c99b4cfabd5b2ced189d13363abc;hpb=420e5b9208a77041b662c9d9cdc021287f95eec1;p=urcu.git

diff --git a/Makefile b/Makefile
index 371c107..917aa1a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,18 @@
 CFLAGS=-Wall -O2 -g -I.
 LDFLAGS=-lpthread
 
+HOSTTYPE=$(shell uname -m)
+
+ifeq ("${HOSTTYPE}","x86_64")
+ARCHTYPE=x86
+endif
+ifeq ("${HOSTTYPE}","i486")
+ARCHTYPE=x86
+endif
+ifeq ("${HOSTTYPE}","powerpc")
+ARCHTYPE=ppc
+endif
+
 #debug
 #CFLAGS=-Wall -g
 #CFLAGS+=-DDEBUG_FULL_MB
@@ -11,28 +23,46 @@ LDFLAGS=-lpthread
 
 SRC_DEP=`echo $^ | sed 's/[^ ]*\.h//g'`
 
-all: arch-api test_urcu test_urcu_dynamic_link test_urcu_timing \
-	test_rwlock_timing test_perthreadlock_timing test_urcu_yield urcu-asm.S \
-	test_qsbr_timing urcu-asm.o urcutorture urcutorture-yield liburcu.so
+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
+
+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_urcu_mb: urcu-mb.o test_urcu.c urcu.h
+	$(CC) -DDEBUG_FULL_MB ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
+
+test_qsbr: urcu-qsbr.o test_qsbr.c urcu-qsbr.h
+	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
+
+test_rwlock: urcu.o test_rwlock.c urcu.h
+	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
+
+test_perthreadlock: urcu.o test_perthreadlock.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)
 
@@ -54,6 +84,9 @@ test_perthreadlock_timing: urcu.o test_perthreadlock_timing.c urcu.h
 urcu.o: urcu.c urcu.h
 	$(CC) -fPIC ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
 
+urcu-mb.o: urcu.c urcu.h
+	$(CC) -fPIC -DDEBUG_FULL_MB ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
+
 urcu-qsbr.o: urcu-qsbr.c urcu-qsbr.h
 	$(CC) -fPIC ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
 
@@ -75,13 +108,16 @@ 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/
 	cp -f arch.h arch_atomic.h compiler.h urcu.h urcu-static.h /usr/include/
 
 clean:
-	rm -f *.o test_urcu test_urcu_timing test_rwlock_timing urcu-asm.S \
-		test_urcu_yield urcutorture urcutorture-yield liburcu.so \
-		test_urcu_dynamic_link api.h arch.h arch_atomic.h
+	rm -f *.o 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 urcutorture \
+	urcutorture-yield liburcu.so api.h arch.h arch_atomic.h
+