diff options
| -rw-r--r-- | cmake/config-ix.cmake | 2 | ||||
| -rw-r--r-- | lib/sanitizer_common/sanitizer_stacktrace.cc | 2 | ||||
| -rw-r--r-- | test/ubsan/TestCases/Float/cast-overflow.cpp | 9 |
3 files changed, 11 insertions, 2 deletions
diff --git a/cmake/config-ix.cmake b/cmake/config-ix.cmake index 8035f7eb5..44f85c659 100644 --- a/cmake/config-ix.cmake +++ b/cmake/config-ix.cmake @@ -134,7 +134,7 @@ filter_available_targets(LSAN_COMMON_SUPPORTED_ARCH filter_available_targets(MSAN_SUPPORTED_ARCH x86_64) filter_available_targets(PROFILE_SUPPORTED_ARCH x86_64 i386 arm aarch64) filter_available_targets(TSAN_SUPPORTED_ARCH x86_64) -filter_available_targets(UBSAN_SUPPORTED_ARCH x86_64 i386 arm aarch64) +filter_available_targets(UBSAN_SUPPORTED_ARCH x86_64 i386 arm aarch64 mips) if(ANDROID) set(OS_NAME "Android") diff --git a/lib/sanitizer_common/sanitizer_stacktrace.cc b/lib/sanitizer_common/sanitizer_stacktrace.cc index 21f710ddd..7a00e3ad8 100644 --- a/lib/sanitizer_common/sanitizer_stacktrace.cc +++ b/lib/sanitizer_common/sanitizer_stacktrace.cc @@ -25,7 +25,7 @@ uptr StackTrace::GetPreviousInstructionPc(uptr pc) { #if defined(__powerpc__) || defined(__powerpc64__) // PCs are always 4 byte aligned. return pc - 4; -#elif defined(__sparc__) +#elif defined(__sparc__) || defined(__mips__) return pc - 8; #else return pc - 1; diff --git a/test/ubsan/TestCases/Float/cast-overflow.cpp b/test/ubsan/TestCases/Float/cast-overflow.cpp index 28a6672b0..b9d88d23c 100644 --- a/test/ubsan/TestCases/Float/cast-overflow.cpp +++ b/test/ubsan/TestCases/Float/cast-overflow.cpp @@ -14,6 +14,7 @@ // This test assumes float and double are IEEE-754 single- and double-precision. +#include <endian.h> #include <stdint.h> #include <stdio.h> #include <string.h> @@ -41,12 +42,20 @@ int main(int argc, char **argv) { unsigned Zero = NearlyMinusOne; // ok // Build a '+Inf'. +#if __BYTE_ORDER == __LITTLE_ENDIAN char InfVal[] = { 0x00, 0x00, 0x80, 0x7f }; +#else + char InfVal[] = { 0x7f, 0x80, 0x00, 0x00 }; +#endif float Inf; memcpy(&Inf, InfVal, 4); // Build a 'NaN'. +#if __BYTE_ORDER == __LITTLE_ENDIAN char NaNVal[] = { 0x01, 0x00, 0x80, 0x7f }; +#else + char NaNVal[] = { 0x7f, 0x80, 0x00, 0x01 }; +#endif float NaN; memcpy(&NaN, NaNVal, 4); |