aboutsummaryrefslogtreecommitdiff
path: root/contrib/arm-optimized-routines/string/Dir.mk
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/arm-optimized-routines/string/Dir.mk')
-rw-r--r--contrib/arm-optimized-routines/string/Dir.mk11
1 files changed, 8 insertions, 3 deletions
diff --git a/contrib/arm-optimized-routines/string/Dir.mk b/contrib/arm-optimized-routines/string/Dir.mk
index cf3453f7580d..dd8283ec4977 100644
--- a/contrib/arm-optimized-routines/string/Dir.mk
+++ b/contrib/arm-optimized-routines/string/Dir.mk
@@ -1,7 +1,7 @@
# Makefile fragment - requires GNU make
#
# Copyright (c) 2019-2021, Arm Limited.
-# SPDX-License-Identifier: MIT
+# SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception
S := $(srcdir)/string
B := build/string
@@ -13,9 +13,12 @@ all-string bench-string check-string install-string clean-string:
else
string-lib-srcs := $(wildcard $(S)/$(ARCH)/*.[cS])
+string-lib-srcs += $(wildcard $(S)/$(ARCH)/experimental/*.[cS])
string-test-srcs := $(wildcard $(S)/test/*.c)
string-bench-srcs := $(wildcard $(S)/bench/*.c)
+string-arch-include-dir := $(wildcard $(S)/$(ARCH))
+string-arch-includes := $(wildcard $(S)/$(ARCH)/*.h)
string-includes := $(patsubst $(S)/%,build/%,$(wildcard $(S)/include/*.h))
string-libs := \
@@ -43,6 +46,7 @@ string-tests := \
string-benches := \
build/bin/bench/memcpy \
+ build/bin/bench/memset \
build/bin/bench/strlen
string-lib-objs := $(patsubst $(S)/%,$(B)/%.o,$(basename $(string-lib-srcs)))
@@ -64,8 +68,8 @@ string-files := \
all-string: $(string-libs) $(string-tests) $(string-benches) $(string-includes)
-$(string-objs): $(string-includes)
-$(string-objs): CFLAGS_ALL += $(string-cflags)
+$(string-objs): $(string-includes) $(string-arch-includes)
+$(string-objs): CFLAGS_ALL += $(string-cflags) -I$(string-arch-include-dir)
$(string-test-objs): CFLAGS_ALL += -D_GNU_SOURCE
@@ -101,6 +105,7 @@ check-string: $(string-tests-out)
bench-string: $(string-benches)
$(EMULATOR) build/bin/bench/strlen
$(EMULATOR) build/bin/bench/memcpy
+ $(EMULATOR) build/bin/bench/memset
install-string: \
$(string-libs:build/lib/%=$(DESTDIR)$(libdir)/%) \