diff options
| author | Kenny Root <kroot@google.com> | 2013-06-14 14:27:05 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-06-14 14:29:23 -0700 |
| commit | 5a43d1928da29b4ec7b911fe865ed78ee3c2ca26 (patch) | |
| tree | 723e2992359a87ace7ec42dddb5fde00c56351ce /import_scrypt.sh | |
| parent | a92286c64bc25e7ea9f8335789d66be9cea66bfb (diff) | |
| download | scrypt-5a43d1928da29b4ec7b911fe865ed78ee3c2ca26.tar.gz | |
Exclude NEON files for ARMs that do not have it
full_eng is a target that doesn't emulate NEON. Presumably because qemu
makes NEON slower than non-NEON.
Change-Id: I2153a62da6aef7efa75eae9892822af861ef4476
Diffstat (limited to 'import_scrypt.sh')
| -rwxr-xr-x | import_scrypt.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/import_scrypt.sh b/import_scrypt.sh index 684379d..324eae6 100755 --- a/import_scrypt.sh +++ b/import_scrypt.sh @@ -262,7 +262,7 @@ print_defines_in_mk() { # $1: Target file name. (e.g. Scrypt-config.mk) function generate_config_mk() { declare -r output="$1" - declare -r all_archs="arm x86 x86_64 mips" + declare -r all_archs="arm arm_neon x86 x86_64 mips" echo "Generating $(basename $output)" ( @@ -324,6 +324,15 @@ target_c_includes := \$(addprefix external/scrypt/,\$(common_c_includes)) \$(loc target_src_files := \$(common_src_files) \$(\$(target_arch)_src_files) target_src_files := \$(filter-out \$(\$(target_arch)_exclude_files), \$(target_src_files)) +# Hacks for ARM NEON support +ifeq (\$(target_arch),arm) +ifeq (\$(ARCH_ARM_HAVE_NEON),true) +target_c_flags += \$(arm_neon_c_flags) +target_src_files += \$(arm_neon_src_files) +target_src_files := \$(filter-out \$(arm_neon_exclude_files), \$(target_src_files)) +endif +endif + ifeq (\$(HOST_OS)-\$(HOST_ARCH),linux-x86) host_arch := x86 else |