diff --git a/GNUmakefile b/GNUmakefile index 78a393ed..69d9fbd4 100755 --- a/GNUmakefile +++ b/GNUmakefile @@ -738,9 +738,8 @@ INCL += resource.h endif # Cryptogams AES for ARMv4 and above. We couple to ARMv7. -# Disable Thumb via -marm due to unaligned byte buffers. ifeq ($(IS_ARM32),1) -CRYPTOGAMS_AES_ARCH = -march=armv7-a -marm +CRYPTOGAMS_AES_ARCH = -march=armv7-a SRCS += aes-armv4.S endif @@ -1081,7 +1080,7 @@ ifeq ($(wildcard GNUmakefile.deps),GNUmakefile.deps) -include GNUmakefile.deps endif # Dependencies -# Cryptogams ARM asm implementation. CRYPTOGAMS_AES_ARCH includes -marm. +# Cryptogams ARM asm implementation. aes-armv4.o : aes-armv4.S $(CC) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_ARCH) -mfloat-abi=$(FP_ABI) -c) $< diff --git a/GNUmakefile-cross b/GNUmakefile-cross index 1b7ed873..ef2113d7 100755 --- a/GNUmakefile-cross +++ b/GNUmakefile-cross @@ -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))) # Cryptogams AES for ARMv4 and above. We couple to ARMv7. -# Disable Thumb via -marm due to unaligned byte buffers. ifeq ($(IS_ARM32),1) -CRYPTOGAMS_AES_ARCH = -march=armv7-a -marm +CRYPTOGAMS_AES_ARCH = -march=armv7-a SRCS += aes-armv4.S endif @@ -508,7 +507,7 @@ endif # Dependencies cpu-features.o: cpu-features.h 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 $(CXX) $(strip $(CXXFLAGS) $(CRYPTOGAMS_AES_ARCH) -c) $<