This reverts commit c1f3367e5701333dd9c2bdd629754d5278b66d2a. Commit ca0fdef62907 ("CodeSamples: Add #ifndef SUBOBJ to api-pthreads.h") resolved root cause of build failures that commit c1f3367e5701 had worked around. The band-aid fix can be reverted now. Signed-off-by: Akira Yokosawa <akiyks@xxxxxxxxx> --- CodeSamples/datastruct/Issaquah/Makefile | 1 - CodeSamples/datastruct/hash/Makefile | 1 - CodeSamples/defer/Makefile | 1 - 3 files changed, 3 deletions(-) diff --git a/CodeSamples/datastruct/Issaquah/Makefile b/CodeSamples/datastruct/Issaquah/Makefile index ca379b3e..d3a5fcb2 100644 --- a/CodeSamples/datastruct/Issaquah/Makefile +++ b/CodeSamples/datastruct/Issaquah/Makefile @@ -32,7 +32,6 @@ endif include $(top)/recipes.mk -GCC_ARGS += -fcommon LURCU_SIG := $(shell pkg-config --libs liburcu-signal 2>/dev/null) # NOTE: For decent scalability on update-side tests as of early 2015, diff --git a/CodeSamples/datastruct/hash/Makefile b/CodeSamples/datastruct/hash/Makefile index 5f3d740c..a84499eb 100644 --- a/CodeSamples/datastruct/hash/Makefile +++ b/CodeSamples/datastruct/hash/Makefile @@ -32,7 +32,6 @@ endif include $(top)/recipes.mk -GCC_ARGS += -fcommon LURCU_SIG := $(shell pkg-config --libs liburcu-signal 2>/dev/null) hash_bkt: hash_bkt.c ../../api.h hashtorture.h diff --git a/CodeSamples/defer/Makefile b/CodeSamples/defer/Makefile index 0cb77122..69516958 100644 --- a/CodeSamples/defer/Makefile +++ b/CodeSamples/defer/Makefile @@ -61,7 +61,6 @@ endif include $(top)/recipes.mk -GCC_ARGS += -fcommon LURCU_SIG := $(shell pkg-config --libs liburcu-signal 2>/dev/null) # Note that bug_srcu_a is disabled until completed. base-commit: 6081ef4580d7495727eeb87beb93b3b0dedf0139 -- 2.34.1