From db9e7ec81939bce532fffb0bd2601c43694a8a4c Mon Sep 17 00:00:00 2001 From: Jeffrey Walton Date: Tue, 2 Feb 2016 13:57:44 -0500 Subject: [PATCH] Removed workarounds for compilers that responded to Asan and UBsan flags --- adhoc.cpp.proto | 3 +-- cryptest.sh | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/adhoc.cpp.proto b/adhoc.cpp.proto index c8d59f94..ca93c452 100644 --- a/adhoc.cpp.proto +++ b/adhoc.cpp.proto @@ -13,7 +13,6 @@ USING_NAMESPACE(CryptoPP) USING_NAMESPACE(std) // Used for testing the compiler and linker in cryptest.sh - #if defined(CRYPTOPP_ADHOC_MAIN) int main(int argc, char *argv[]) @@ -35,4 +34,4 @@ int MyAdhocTest(int argc, char *argv[]) static int s_i = (AdhocTest = &MyAdhocTest, 0); -#endif \ No newline at end of file +#endif diff --git a/cryptest.sh b/cryptest.sh index 6f90bd51..41d34a59 100755 --- a/cryptest.sh +++ b/cryptest.sh @@ -112,12 +112,6 @@ else HAVE_ASAN=0 fi -# Fixups... Cygwin and MinGW both advertise sanitizer support, but the program fails to link. -if [ "$HAVE_UBSAN" -eq "0" ] || [ "$HAVE_ASAN" -eq "0" ] || [ "$IS_CYGWIN" -ne "0" ] || [ "$IS_MINGW" -ne "0" ]; then - HAVE_UBSAN=0 - HAVE_ASAN=0 -fi - # Set to 0 if you don't have Intel multiarch HAVE_INTEL_MULTIARCH=0 if [ "$IS_DARWIN" -ne "0" ] && [ "$IS_X86" -ne "0" ]; then