← Back to branch summary

~linaro-toolchain-dev/cortex-strings/trunk

« back to all changes in this revision

Viewing changes to Makefile.am

  • Committer: Will Newton
  • Date: 2013-06-18 16:19:32 UTC
  • mfrom: (103.1.2 a15-strlen)
  • Revision ID: will.newton@linaro.org-20130618161932-l0fj2a7xv64i5316
Merged Thumb-2 strlen implementation.

Show diffs side-by-side

added added

removed removed

Lines of Context:
Makefile.am
44
44
        tests/test-strcmp \
45
45
        tests/test-strcpy \
46
46
        tests/test-strlen \
47
 
        tests/test-strncmp
 
47
        tests/test-strncmp \
 
48
        tests/test-strnlen
48
49
 
49
50
# Options for the tests
50
51
tests_cflags = -I$(srcdir)/tests $(AM_CFLAGS)
170
171
 
171
172
if WITH_NEON
172
173
# Pull in the NEON specific files
173
 
neon_sources = \
174
 
        src/linaro-a9/memcpy-hybrid.S
175
 
neon_bionic_sources = \
176
 
        reference/bionic/memcpy.S
177
 
neon_cppflags = -mfpu=neon
178
 
neon_dirs = neon
179
 
else
180
 
alternate_sources = \
181
 
        src/linaro-a9/memcpy.S
 
174
neon_bionic_a9_sources = \
 
175
        reference/bionic-a9/memcpy.S \
 
176
        reference/bionic-a9/memset.S
 
177
neon_bionic_a15_sources = \
 
178
        reference/bionic-a15/memcpy.S \
 
179
        reference/bionic-a15/memset.S
 
180
fpu_flags = -mfpu=neon
 
181
else
 
182
if WITH_VFP
 
183
fpu_flags = -mfpu=vfp
 
184
else
 
185
fpu_flags = -msoft-float
 
186
endif
182
187
endif
183
188
 
184
189
# Benchmarks and example programs
185
190
noinst_PROGRAMS += \
186
 
        try-bionic \
 
191
        try-bionic-a9 \
 
192
        try-bionic-a15 \
187
193
        try-csl \
188
194
        try-glibc \
189
195
        try-newlib \
191
197
 
192
198
# Libraries used in the benchmarks and examples
193
199
noinst_LIBRARIES += \
194
 
        libbionic.a \
 
200
        libbionic-a9.a \
 
201
        libbionic-a15.a \
195
202
        libcsl.a \
196
203
        libglibc.a \
197
204
        libnewlib.a \
199
206
 
200
207
# Main library
201
208
libcortex_strings_la_SOURCES = \
202
 
        $(neon_sources) \
203
 
        $(alternate_sources) \
204
209
        src/thumb-2/strcpy.c \
205
210
        src/linaro-a9/memchr.S \
206
211
        src/linaro-a9/strchr.S \
207
212
        src/linaro-a9/strlen.S \
208
 
        src/linaro-a9/memset.S
 
213
        src/linaro-a9/memset.S \
 
214
        src/linaro-a9/memcpy.S
209
215
 
210
216
# Libraries containing the difference reference versions
211
 
libbionic_a_SOURCES = \
212
 
        $(neon_bionic_sources) \
213
 
        reference/bionic/memcmp.S \
214
 
        reference/bionic/memset.S \
215
 
        reference/bionic/strcmp.S \
216
 
        reference/bionic/strcpy.S \
217
 
        reference/bionic/strlen.c
218
 
 
219
 
libbionic_a_CFLAGS = -Wa,-mimplicit-it=thumb
 
217
libbionic_a9_a_SOURCES = \
 
218
        $(neon_bionic_a9_sources) \
 
219
        reference/bionic-a9/memcmp.S \
 
220
        reference/bionic-a9/strcmp.S \
 
221
        reference/bionic-a9/strcpy.S \
 
222
        reference/bionic-a9/strlen.c
 
223
 
 
224
libbionic_a9_a_CFLAGS = -Wa,-mimplicit-it=thumb
 
225
 
 
226
libbionic_a15_a_SOURCES = \
 
227
        $(neon_bionic_a15_sources) \
 
228
        reference/bionic-a15/memcmp.S \
 
229
        reference/bionic-a15/strcmp.S \
 
230
        reference/bionic-a15/strcpy.S \
 
231
        reference/bionic-a15/strlen.c
 
232
 
 
233
libbionic_a15_a_CFLAGS = -Wa,-mimplicit-it=thumb
220
234
 
221
235
libcsl_a_SOURCES = \
222
236
        reference/csl/memcpy.c \
247
261
        reference/newlib-xscale/xscale.h
248
262
 
249
263
# Flags for the benchmark helpers
250
 
try_bionic_SOURCES =
251
 
try_bionic_LDADD = libmulti.a libbionic.a -lrt
 
264
try_bionic_a9_SOURCES =
 
265
try_bionic_a9_LDADD = libmulti.a libbionic-a9.a -lrt
 
266
try_bionic_a15_SOURCES =
 
267
try_bionic_a15_LDADD = libmulti.a libbionic-a15.a -lrt
252
268
try_csl_SOURCES =
253
269
try_csl_LDADD = libmulti.a libcsl.a -lrt
254
270
try_glibc_SOURCES =
258
274
try_newlib_xscale_SOURCES =
259
275
try_newlib_xscale_LDADD = libmulti.a libnewlib-xscale.a -lrt
260
276
 
261
 
AM_CPPFLAGS = $(neon_cppflags)
 
277
AM_CPPFLAGS = $(fpu_flags)
 
278
AM_LDFLAGS = $(fpu_flags)
262
279
 
263
280
endif
264
281
 
266
283
if HOST_AARCH64
267
284
 
268
285
libcortex_strings_la_SOURCES = \
 
286
        src/aarch64/memcmp.S \
269
287
        src/aarch64/memcpy.S \
270
288
        src/aarch64/memmove.S \
271
289
        src/aarch64/memset.S \
272
 
        src/aarch64/strcmp.S
 
290
        src/aarch64/strcmp.S \
 
291
        src/aarch64/strlen.S \
 
292
        src/aarch64/strncmp.S \
 
293
        src/aarch64/strnlen.S
273
294
 
274
295
endif
275
296