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

Cleanup Makefiles and Android and iOS scripts

pull/696/head
Jeffrey Walton 2018-07-28 18:45:37 -04:00
parent 86a212b85f
commit 138ce8f626
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
4 changed files with 45 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
GNUmakefile
View File

@ -739,8 +739,8 @@ endif
# Cryptogams AES for ARMv4 and above. We couple to ARMv7. # Cryptogams AES for ARMv4 and above. We couple to ARMv7.
ifeq ($(IS_ARM32),1) ifeq ($(IS_ARM32),1)
CRYPTOGAMS_AES_ARCH = -march=armv7-a CRYPTOGAMS_AES_FLAG = -march=armv7-a
CRYPTOGAMS_AES_ARCH += -Wa,--noexecstack CRYPTOGAMS_AES_FLAG += -Wa,--noexecstack
SRCS += aes-armv4.S SRCS += aes-armv4.S
endif endif
@ -1091,7 +1091,7 @@ endif # Dependencies
# Cryptogams ARM asm implementation. # 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_FLAG) -mfloat-abi=$(FP_ABI) -c) $<
# SSSE3 or NEON available # SSSE3 or NEON available
aria-simd.o : aria-simd.cpp aria-simd.o : aria-simd.cpp

6
GNUmakefile-cross
View File

@ -327,8 +327,8 @@ 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.
ifeq ($(IS_ARM32),1) ifeq ($(IS_ARM32),1)
CRYPTOGAMS_AES_ARCH = -march=armv7-a CRYPTOGAMS_AES_FLAG = -march=armv7-a
CRYPTOGAMS_AES_ARCH += -Wa,--noexecstack CRYPTOGAMS_AES_FLAG += -Wa,--noexecstack
SRCS += aes-armv4.S SRCS += aes-armv4.S
endif endif
@ -519,7 +519,7 @@ cpu-features.o: cpu-features.h cpu-features.c
# Cryptogams ARM asm implementation. # 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_FLAG) -c) $<
# SSE4.2 or NEON available # SSE4.2 or NEON available
aria-simd.o : aria-simd.cpp aria-simd.o : aria-simd.cpp

36
TestScripts/cryptest-android.sh
View File

@ -31,29 +31,31 @@ do
# Test if we can set the environment for the platform # Test if we can set the environment for the platform
./setenv-android-gcc.sh "$platform" "$runtime" ./setenv-android-gcc.sh "$platform" "$runtime"
if [ "$?" -eq "0" ]; if [ "$?" -ne "0" ];
then then
echo
echo "Building for $platform using $runtime..."
echo
# run in subshell to not keep any env vars
(
source ./setenv-android-gcc.sh "$platform" "$runtime" > /dev/null 2>&1
make -f GNUmakefile-cross static dynamic cryptest.exe
if [ "$?" -eq "0" ]; then
echo "$platform:$runtime ==> SUCCESS" >> /tmp/build.log
else
echo "$platform:$runtime ==> FAILURE" >> /tmp/build.log
touch /tmp/build.failed
fi
)
else
echo echo
echo "There were problems testing $platform with $runtime" echo "There were problems testing $platform with $runtime"
echo "$platform:$runtime ==> FAILURE" >> /tmp/build.log echo "$platform:$runtime ==> FAILURE" >> /tmp/build.log
touch /tmp/build.failed touch /tmp/build.failed
continue
fi fi
echo
echo "Building for $platform using $runtime..."
echo
# run in subshell to not keep any env vars
(
source ./setenv-android-gcc.sh "$platform" "$runtime" > /dev/null 2>&1
make -f GNUmakefile-cross static dynamic cryptest.exe
if [ "$?" -eq "0" ]; then
echo "$platform:$runtime ==> SUCCESS" >> /tmp/build.log
else
echo "$platform:$runtime ==> FAILURE" >> /tmp/build.log
touch /tmp/build.failed
fi
)
done done
done done

37
TestScripts/cryptest-ios.sh
View File

@ -27,28 +27,31 @@ do
# Test if we can set the environment for the platform # Test if we can set the environment for the platform
./setenv-ios.sh "$platform" ./setenv-ios.sh "$platform"
if [ "$?" -eq "0" ]; then if [ "$?" -ne "0" ];
echo then
echo "Building for $platform using $runtime..."
echo
# run in subshell to not keep any env vars
(
. ./setenv-ios.sh "$platform" > /dev/null 2>&1
make -f GNUmakefile-cross static dynamic cryptest.exe
if [ "$?" -eq "0" ]; then
echo "$platform ==> SUCCESS" >> /tmp/build.log
else
echo "$platform ==> FAILURE" >> /tmp/build.log
touch /tmp/build.failed
fi
)
else
echo echo
echo "$platform not supported by Xcode" echo "$platform not supported by Xcode"
echo "$platform ==> FAILURE" >> /tmp/build.log echo "$platform ==> FAILURE" >> /tmp/build.log
touch /tmp/build.failed touch /tmp/build.failed
continue
fi fi
echo
echo "Building for $platform using $runtime..."
echo
# run in subshell to not keep any env vars
(
source ./setenv-ios.sh "$platform" > /dev/null 2>&1
make -f GNUmakefile-cross static dynamic cryptest.exe
if [ "$?" -eq "0" ]; then
echo "$platform ==> SUCCESS" >> /tmp/build.log
else
echo "$platform ==> FAILURE" >> /tmp/build.log
touch /tmp/build.failed
fi
)
done done
cat /tmp/build.log cat /tmp/build.log