X-Git-Url: https://git.liburcu.org/?p=urcu.git;a=blobdiff_plain;f=Makefile;h=98f9c4ac3d5c3839e410142c607716d33341f294;hp=e8d11bba7e9554940bad0441169f3cab6341a7e7;hb=b4ce15269d95cb1fc5542d0e192ec593b2222dd5;hpb=321e29d945372e2195082b95c7740e1d79ed5b55

diff --git a/Makefile b/Makefile
index e8d11bb..98f9c4a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,10 +19,24 @@ endif
 ifeq ("${HOSTTYPE}","ppc64")
 ARCHTYPE=ppc
 endif
+ifeq ("${HOSTTYPE}","s390")
+ARCHTYPE=s390
+endif
+ifeq ("${HOSTTYPE}","s390x")
+ARCHTYPE=s390
+endif
+
+ifeq ($(findstring ${ARCHTYPE},"x86 ppc"),)
+APIHEADER=api_gcc.h
+else
+APIHEADER=api_${ARCHTYPE}.h
+endif
 
 #debug
 #CFLAGS=-Wall -g
-#CFLAGS+=-DDEBUG_FULL_MB
+
+#Build the library without using signals. Slower read-side.
+#CFLAGS+=-DCONFIG_URCU_AVOID_SIGNALS
 
 #Changing the signal number used by the library. SIGUSR1 by default.
 #CFLAGS+=-DSIGURCU=SIGUSR2
@@ -46,15 +60,15 @@ 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
+api.h: ${APIHEADER}
+	cp -f ${APIHEADER} api.h
 
 arch_atomic.h: arch_atomic_${ARCHTYPE}.h
 	cp -f arch_atomic_${ARCHTYPE}.h arch_atomic.h
 
-urcu.h: arch.h api.h arch_atomic.h
+urcu.h: arch.h arch_atomic.h
 
-urcu-qsbr.h: arch.h api.h arch_atomic.h
+urcu-qsbr.h: arch.h arch_atomic.h
 
 test_urcu: urcu.o test_urcu.c urcu.h
 	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
@@ -63,19 +77,19 @@ 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)
+	$(CC) -DCONFIG_URCU_AVOID_SIGNALS ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
 test_urcu_gc: urcu.o test_urcu_gc.c urcu.h
 	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
 test_urcu_gc_mb: urcu-mb.o test_urcu_gc.c urcu.h
-	$(CC) -DDEBUG_FULL_MB ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
+	$(CC) -DCONFIG_URCU_AVOID_SIGNALS ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
 test_urcu_lgc: urcu.o test_urcu_gc.c urcu.h
 	$(CC) -DTEST_LOCAL_GC ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
 test_urcu_lgc_mb: urcu-mb.o test_urcu_gc.c urcu.h
-	$(CC) -DTEST_LOCAL_GC -DDEBUG_FULL_MB ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
+	$(CC) -DTEST_LOCAL_GC -DCONFIG_URCU_AVOID_SIGNALS ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
 test_qsbr: urcu-qsbr.o test_qsbr.c urcu-qsbr.h
 	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
@@ -117,7 +131,7 @@ 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)
+	$(CC) -fPIC -DCONFIG_URCU_AVOID_SIGNALS ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
 
 urcu-qsbr.o: urcu-qsbr.c urcu-qsbr.h
 	$(CC) -fPIC ${CFLAGS} $(LDFLAGS) -c -o $@ $(SRC_DEP)
@@ -134,10 +148,10 @@ urcu-asm.S: urcu-asm.c urcu.h
 urcu-asm.o: urcu-asm.c urcu.h
 	$(CC) ${CFLAGS} -c -o $@ $(SRC_DEP)
 
-urcutorture: urcutorture.c urcu.o urcu.h rcutorture.h
+urcutorture: urcutorture.c urcu.o urcu.h rcutorture.h api.h
 	$(CC) ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
-urcutorture-yield: urcutorture.c urcu-yield.o urcu.h rcutorture.h
+urcutorture-yield: urcutorture.c urcu-yield.o urcu.h rcutorture.h api.h
 	$(CC) -DDEBUG_YIELD ${CFLAGS} $(LDFLAGS) -o $@ $(SRC_DEP)
 
 .PHONY: clean install checkarch