From b7a8aa49770626efd214c5d1a8a189f88516be80 Mon Sep 17 00:00:00 2001 From: Alessandre Laguierce Date: Tue, 8 Apr 2025 22:16:48 +0200 Subject: [PATCH] fix: conditional compilation for fibonacci --- Makefile | 6 ++++-- src/thread/thread.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index ef7c56c..aa54c67 100644 --- a/Makefile +++ b/Makefile @@ -4,11 +4,13 @@ tst_dir?=tst install_dir?=install # Comment out the bins that doesn't need to be compiled -bins+=$(wildcard ${tst_dir}/*.c) +bbins+=$(wildcard ${tst_dir}/*.c) +bins=$(filter-out ${tst_dir}/51-fibonacci.c, ${bbins}) all_bins=01-main 02-switch 03-equity 11-join 12-join-main 21-create-many 22-create-many-recursive 23-create-many-once 31-switch-many 32-switch-many-join 33-switch-many-cascade 51-fibonacci 61-mutex 62-mutex 63-mutex-equity 64-mutex-join 71-preemption 81-deadlock bins_target=$(patsubst %.c,${build_dir}/%,${bins}) install_bins_targets=$(patsubst ${tst_dir}/%.c,${install_dir}/bin/%,${bins}) +install_bins_targets+=${install_dir}/bin/51-fibonacci valgrind_targets=$(addprefix valgrind_,${all_bins}) @@ -95,7 +97,7 @@ ${check_targets}: check_%: ${build_dir}/${tst_dir}/% ${bins_target}: ${build_dir}/%: ${objs} ${build_dir}/%.o ${CC} -o $@ $^ ${CFLAGS} ./lib/libmimalloc ${LDFLAGS} -${build_dir}/51-fibonacci: ${build_dir}/src/thread/thread_fibo.o ${build_dir}/${tst_dir}/51-fibonacci.o +${build_dir}/${tst_dir}/51-fibonacci: ${build_dir}/src/thread/thread_fibo.o ${build_dir}/${tst_dir}/51-fibonacci.o ${CC} -o $@ $^ ${CFLAGS} ./lib/libmimalloc ${LDFLAGS} ${build_dir}/libthread.so: ${objs} diff --git a/src/thread/thread.c b/src/thread/thread.c index 77974cf..1b1dde0 100644 --- a/src/thread/thread.c +++ b/src/thread/thread.c @@ -28,7 +28,7 @@ #ifdef FIBO_STRAT -#define YIELD 0x20 +#define YIELD (1 << 6) #define IS_YIELD(entry) (HAS_STATUS(entry, YIELD)) #endif