Skip to content

Commit 7414be1

Browse files
libspl: remove assembly atomics for i486 and amd64
These are only used by ztest and zdb, absolute speed isn't too big of a concern Signed-off-by: Ahelenia Ziemiańska <[email protected]>
1 parent 071e93a commit 7414be1

File tree

5 files changed

+3
-1557
lines changed

5 files changed

+3
-1557
lines changed

lib/libspl/Makefile.am

Lines changed: 3 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,15 @@
11
include $(top_srcdir)/config/Rules.am
22

3-
if TARGET_CPU_I386
4-
TARGET_CPU_ATOMIC_SOURCE = asm-i386/atomic.S
5-
else
6-
if TARGET_CPU_X86_64
7-
TARGET_CPU_ATOMIC_SOURCE = asm-x86_64/atomic.S
8-
else
9-
TARGET_CPU_ATOMIC_SOURCE = asm-generic/atomic.c
10-
LIBATOMIC = $(LIBATOMIC_LIBS)
11-
endif
12-
endif
13-
143
SUBDIRS = include
154

16-
AM_CCASFLAGS = \
17-
$(CFLAGS)
18-
195
noinst_LTLIBRARIES = libspl_assert.la libspl.la
206

217
libspl_assert_la_SOURCES = \
228
assert.c
239

2410
USER_C = \
2511
libspl_impl.h \
12+
atomic.c \
2613
getexecname.c \
2714
list.c \
2815
mkdirp.c \
@@ -50,20 +37,11 @@ USER_C += \
5037
os/freebsd/zone.c
5138
endif
5239

53-
libspl_la_SOURCES = \
54-
$(USER_C) \
55-
$(TARGET_CPU_ATOMIC_SOURCE)
40+
libspl_la_SOURCES = $(USER_C)
5641

5742
libspl_la_LIBADD = \
5843
libspl_assert.la
5944

60-
libspl_la_LIBADD += $(LIBATOMIC) $(LIBCLOCK_GETTIME)
45+
libspl_la_LIBADD += $(LIBATOMIC_LIBS) $(LIBCLOCK_GETTIME)
6146

6247
include $(top_srcdir)/config/CppCheck.am
63-
64-
# Override the default SOURCES which includes TARGET_CPU_ATOMIC_SOURCE
65-
# in order to always evaluate the generic asm-generic/atomic.c source.
66-
CPPCHECKSRC = $(USER_C) asm-generic/atomic.c
67-
cppcheck:
68-
$(CPPCHECK) -j$(CPU_COUNT) $(CPPCHECKFLAGS) --force \
69-
$(DEFAULT_INCLUDES) $(CPPCHECKSRC)

lib/libspl/asm-generic/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)