Merge pull request #7101 from mwwa/oslog-format-parser-3.1

[oslog-overlay-fixes] 3.1 backport

Author: DougGregor

stdlib/public/SDK/os/CMakeLists.txt

@@ -1,6 +1,8 @@
 add_swift_library(swiftos ${SWIFT_SDK_OVERLAY_LIBRARY_BUILD_TYPES} IS_SDK_OVERLAY
   os_log.swift
-  os.mm
+  os_log.m
+  os_trace_blob.c
+  thunks.mm
 
   SWIFT_COMPILE_FLAGS "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}"
   LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"