diff --git a/lib/libclang_rt/asan/Makefile b/lib/libclang_rt/asan/Makefile
index bea52db93e91..9cbfa685d719 100644
--- a/lib/libclang_rt/asan/Makefile
+++ b/lib/libclang_rt/asan/Makefile
@@ -52,8 +52,8 @@ SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc
diff --git a/lib/libclang_rt/asan_dynamic/Makefile b/lib/libclang_rt/asan_dynamic/Makefile
index 4edb66e9c52c..7f27e0162147 100644
--- a/lib/libclang_rt/asan_dynamic/Makefile
+++ b/lib/libclang_rt/asan_dynamic/Makefile
@@ -55,8 +55,8 @@ SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc
diff --git a/lib/libclang_rt/safestack/Makefile b/lib/libclang_rt/safestack/Makefile
index 9bb10f46dbb8..4d387feb2614 100644
--- a/lib/libclang_rt/safestack/Makefile
+++ b/lib/libclang_rt/safestack/Makefile
@@ -24,8 +24,8 @@ SRCS+=		sanitizer_common/sanitizer_platform_limits_linux.cc
 SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace_printer.cc
diff --git a/lib/libclang_rt/stats/Makefile b/lib/libclang_rt/stats/Makefile
index 3ffa2f8a6b0d..14dca76b2378 100644
--- a/lib/libclang_rt/stats/Makefile
+++ b/lib/libclang_rt/stats/Makefile
@@ -26,8 +26,8 @@ SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc
diff --git a/lib/libclang_rt/tsan/Makefile b/lib/libclang_rt/tsan/Makefile
index 416fa377938b..c310c1bf47c6 100644
--- a/lib/libclang_rt/tsan/Makefile
+++ b/lib/libclang_rt/tsan/Makefile
@@ -28,8 +28,8 @@ SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc
diff --git a/lib/libclang_rt/ubsan_standalone/Makefile b/lib/libclang_rt/ubsan_standalone/Makefile
index 888037f32f4a..6b9a49d32bd8 100644
--- a/lib/libclang_rt/ubsan_standalone/Makefile
+++ b/lib/libclang_rt/ubsan_standalone/Makefile
@@ -28,8 +28,8 @@ SRCS+=		sanitizer_common/sanitizer_platform_limits_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix.cc
 SRCS+=		sanitizer_common/sanitizer_posix_libcdep.cc
 SRCS+=		sanitizer_common/sanitizer_printf.cc
+SRCS+=		sanitizer_common/sanitizer_procmaps_bsd.cc
 SRCS+=		sanitizer_common/sanitizer_procmaps_common.cc
-SRCS+=		sanitizer_common/sanitizer_procmaps_freebsd.cc
 SRCS+=		sanitizer_common/sanitizer_stackdepot.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace.cc
 SRCS+=		sanitizer_common/sanitizer_stacktrace_libcdep.cc