Merge commit '05a2d70d963b' from llvm.org/master into apple/master

git apple-llvm automerger · git apple-llvm automerger · commit f22f8519d062 · 2019-10-31T10:56:50.000-07:00
diff --git a/compiler-rt/lib/hwasan/CMakeLists.txt b/compiler-rt/lib/hwasan/CMakeLists.txt
@@ -12,11 +12,11 @@ set(HWASAN_RTL_SOURCES
   hwasan_memintrinsics.cpp
   hwasan_poisoning.cpp
   hwasan_report.cpp
+  hwasan_setjmp.S
   hwasan_tag_mismatch_aarch64.S
   hwasan_thread.cpp
   hwasan_thread_list.cpp
   hwasan_type_test.cpp
-  hwasan_setjmp.S
   )
 
 set(HWASAN_RTL_CXX_SOURCES
