arne
/
cryptopp
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove -marm from aes-armv4.S flags

pull/696/head
Jeffrey Walton 2018-07-27 22:00:28 -04:00
parent fa513df380
commit a0ad5e815c
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
GNUmakefile
View File

@ -738,9 +738,8 @@ INCL += resource.h
endif endif
# Cryptogams AES for ARMv4 and above. We couple to ARMv7. # Cryptogams AES for ARMv4 and above. We couple to ARMv7.
# Disable Thumb via -marm due to unaligned byte buffers.
ifeq ($(IS_ARM32),1) ifeq ($(IS_ARM32),1)
CRYPTOGAMS_AES_ARCH = -march=armv7-a -marm CRYPTOGAMS_AES_ARCH = -march=armv7-a
SRCS += aes-armv4.S SRCS += aes-armv4.S
endif endif
@ -1081,7 +1080,7 @@ ifeq ($(wildcard GNUmakefile.deps),GNUmakefile.deps)
-include GNUmakefile.deps -include GNUmakefile.deps
endif # Dependencies endif # Dependencies
# Cryptogams ARM asm implementation. CRYPTOGAMS_AES_ARCH includes -marm. # Cryptogams ARM asm implementation.
aes-armv4.o : aes-armv4.S aes-armv4.o : aes-armv4.S
$(CC) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_ARCH) -mfloat-abi=$(FP_ABI) -c) $< $(CC) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_ARCH) -mfloat-abi=$(FP_ABI) -c) $<

5
GNUmakefile-cross
View File

@ -326,9 +326,8 @@ SRCS := cryptlib.cpp cpu.cpp integer.cpp $(filter-out cryptlib.cpp cpu.cpp integ
INCL := $(filter-out resource.h,$(sort $(wildcard *.h))) INCL := $(filter-out resource.h,$(sort $(wildcard *.h)))
# Cryptogams AES for ARMv4 and above. We couple to ARMv7. # Cryptogams AES for ARMv4 and above. We couple to ARMv7.
# Disable Thumb via -marm due to unaligned byte buffers.
ifeq ($(IS_ARM32),1) ifeq ($(IS_ARM32),1)
CRYPTOGAMS_AES_ARCH = -march=armv7-a -marm CRYPTOGAMS_AES_ARCH = -march=armv7-a
SRCS += aes-armv4.S SRCS += aes-armv4.S
endif endif
@ -508,7 +507,7 @@ endif # Dependencies
cpu-features.o: cpu-features.h cpu-features.c cpu-features.o: cpu-features.h cpu-features.c
$(CXX) $(strip $(CXXFLAGS) -fpermissive -c) cpu-features.c $(CXX) $(strip $(CXXFLAGS) -fpermissive -c) cpu-features.c
# Cryptogams ARM asm implementation. CRYPTOGAMS_AES_ARCH includes -marm. # Cryptogams ARM asm implementation.
aes-armv4.o : aes-armv4.S aes-armv4.o : aes-armv4.S
$(CXX) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_ARCH) -c) $< $(CXX) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_ARCH) -c) $<