Skip to content

Commit

Permalink
MFC: r307977
Browse files Browse the repository at this point in the history
Prefer ACFLAGS over CFLAGS for compiling aarch64 assembly files.
  • Loading branch information
juikim committed Nov 2, 2017
1 parent ffd1bb8 commit 8c6a7dd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions secure/lib/libcrypto/Makefile
Expand Up @@ -24,7 +24,7 @@ SRCS= cpt_err.c cryptlib.c cversion.c ex_data.c mem.c mem_dbg.c o_dir.c \
o_fips.c o_init.c o_str.c o_time.c uid.c
.if defined(ASM_aarch64)
SRCS+= arm64cpuid.S armcap.c mem_clr.c
CFLAGS.arm64cpuid.S= -march=armv8-a+crypto
ACFLAGS.arm64cpuid.S= -march=armv8-a+crypto
.elif defined(ASM_amd64)
SRCS+= x86_64cpuid.S
.elif defined(ASM_arm)
Expand All @@ -40,7 +40,7 @@ INCS+= crypto.h ebcdic.h opensslv.h ossl_typ.h symhacks.h ../e_os2.h
SRCS+= aes_cfb.c aes_ctr.c aes_ecb.c aes_ige.c aes_misc.c aes_ofb.c aes_wrap.c
.if defined(ASM_aarch64)
SRCS+= aes_cbc.c aes_core.c aesv8-armx.S
CFLAGS.aesv8-armx.S= -march=armv8-a+crypto
ACFLAGS.aesv8-armx.S= -march=armv8-a+crypto
.elif defined(ASM_amd64)
SRCS+= aes-x86_64.S aesni-mb-x86_64.S aesni-sha1-x86_64.S \
aesni-sha256-x86_64.S aesni-x86_64.S bsaes-x86_64.S vpaes-x86_64.S
Expand Down Expand Up @@ -246,7 +246,7 @@ SRCS+= cbc128.c ccm128.c cfb128.c ctr128.c cts128.c gcm128.c ofb128.c \
wrap128.c xts128.c
.if defined(ASM_aarch64)
SRCS+= ghashv8-armx.S
CFLAGS.ghashv8-armx.S= -march=armv8-a+crypto
ACFLAGS.ghashv8-armx.S= -march=armv8-a+crypto
.elif defined(ASM_amd64)
SRCS+= aesni-gcm-x86_64.S ghash-x86_64.S
.elif defined(ASM_arm)
Expand Down

0 comments on commit 8c6a7dd

Please sign in to comment.