commit 84820518e64379178abc3989a375d97ea89d7d55
from: Sergey Bronnikov <sergeyb@bronevichok.ru>
date: Fri Jan 19 12:57:52 2018 UTC

Fix merge conflict

commit - cc632132ac542c65c3a833dbfe4991df5c0e9a59
commit + 84820518e64379178abc3989a375d97ea89d7d55
blob - dd773d10f4826529696559273eae86ad720f4544
blob + 03ec196a7e048ef90fc65e276c2300dd82451786
--- tests/atomics/Makefile
+++ tests/atomics/Makefile
@@ -14,6 +14,7 @@ build:
 	${CC} at_cpuid.cc -o ${BINDIR}/at_cpuid ${LDFLAGS} ${CFLAGS}
 	${CC} at_crypto.cc -o ${BINDIR}/at_crypto ${LDFLAGS} ${CFLAGS}
 	${CC} at_ctx.cc -o ${BINDIR}/at_ctx ${LDFLAGS} ${CFLAGS}
+	${CC} at_execv.cc -o ${BINDIR}/at_execv ${LDFLAGS} ${CFLAGS}
 	${CC} at_fork.cc -o ${BINDIR}/at_fork ${LDFLAGS} ${CFLAGS}
 	${CC} at_fsync.cc -o ${BINDIR}/at_fsync ${LDFLAGS} ${CFLAGS}
 	${CC} at_getifaddrs.cc -o ${BINDIR}/at_getifaddrs ${LDFLAGS} ${CFLAGS}
@@ -34,6 +35,7 @@ run:
 	${BINDIR}/at_cpuid ${OPTIONS}
 	${BINDIR}/at_crypto ${OPTIONS}
 	${BINDIR}/at_ctx ${OPTIONS}
+	${BINDIR}/at_execv ${OPTIONS}
 	${BINDIR}/at_fork ${OPTIONS}
 	${BINDIR}/at_fsync ${OPTIONS}
 	${BINDIR}/at_getifaddrs ${OPTIONS}
blob - /dev/null
blob + d1f54f29d7a77194b549903ec64d3295a0969118 (mode 644)
--- /dev/null
+++ tests/atomics/README.md
@@ -0,0 +1,9 @@
+## OpenBSD microbenchmarks
+
+### Build
+
+- [Google benchmark](https://github.com/google/benchmark)
+- 64-bit: ```make```
+- 32-bit: ```make CFLAGS=-m32```
+
+Copyright (c) 2017, Sergey Bronnikov sergeyb@bronevichok.ru
blob - /dev/null
blob + 6db28fc0c436347e105bb87114ef7dcb1d529752 (mode 644)
--- /dev/null
+++ tests/atomics/sample.c
@@ -0,0 +1,6 @@
+#include <unistd.h>
+
+int main() {
+
+		return 0;
+}