[profile] Flatten profile runtime - define platform-specific code in sources, not in the build system

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@206915 91177308-0d34-0410-b5e6-96231b3b80d8

3 files changed, 14 insertions, 16 deletions

diff --git a/lib/profile/CMakeLists.txt b/lib/profile/CMakeLists.txt
index 4165374fd..2255277ed 100644
--- a/lib/profile/CMakeLists.txt
+++ b/lib/profile/CMakeLists.txt
@@ -1,27 +1,20 @@
 add_custom_target(profile)
 
-if(APPLE)
-  set(PROFILE_SOURCES
-    GCDAProfiling.c
-    InstrProfiling.c
-    InstrProfilingBuffer.c
-    InstrProfilingFile.c
-    InstrProfilingPlatformDarwin.c
-    InstrProfilingRuntime.cc)
+set(PROFILE_SOURCES
+  GCDAProfiling.c
+  InstrProfiling.c
+  InstrProfilingBuffer.c
+  InstrProfilingFile.c
+  InstrProfilingPlatformDarwin.c
+  InstrProfilingPlatformOther.c
+  InstrProfilingRuntime.cc)
 
+if(APPLE)
   add_compiler_rt_osx_static_runtime(clang_rt.profile_osx
     ARCH ${PROFILE_SUPPORTED_ARCH}
     SOURCES ${PROFILE_SOURCES})
   add_dependencies(profile clang_rt.profile_osx)
 else()
-  set(PROFILE_SOURCES
-    GCDAProfiling.c
-    InstrProfiling.c
-    InstrProfilingBuffer.c
-    InstrProfilingFile.c
-    InstrProfilingPlatformOther.c
-    InstrProfilingRuntime.cc)
-
   foreach(arch ${PROFILE_SUPPORTED_ARCH})
     add_compiler_rt_runtime(clang_rt.profile-${arch} ${arch} STATIC
       SOURCES ${PROFILE_SOURCES})
diff --git a/lib/profile/InstrProfilingPlatformDarwin.c b/lib/profile/InstrProfilingPlatformDarwin.c
index 1ba672d1e..6e34db612 100644
--- a/lib/profile/InstrProfilingPlatformDarwin.c
+++ b/lib/profile/InstrProfilingPlatformDarwin.c
@@ -9,6 +9,7 @@
 
 #include "InstrProfiling.h"
 
+#if defined(__APPLE__)
 /* Use linker magic to find the bounds of the Data section. */
 extern __llvm_profile_data DataStart __asm("section$start$__DATA$__llvm_prf_data");
 extern __llvm_profile_data DataEnd   __asm("section$end$__DATA$__llvm_prf_data");
@@ -27,3 +28,4 @@ const char *__llvm_profile_names_begin(void) { return &NamesStart; }
 const char *__llvm_profile_names_end(void) { return &NamesEnd; }
 uint64_t *__llvm_profile_counters_begin(void) { return &CountersStart; }
 uint64_t *__llvm_profile_counters_end(void) { return &CountersEnd; }
+#endif
diff --git a/lib/profile/InstrProfilingPlatformOther.c b/lib/profile/InstrProfilingPlatformOther.c
index 69b59254f..e5a5fc54a 100644
--- a/lib/profile/InstrProfilingPlatformOther.c
+++ b/lib/profile/InstrProfilingPlatformOther.c
@@ -8,6 +8,8 @@
 \*===----------------------------------------------------------------------===*/
 
 #include "InstrProfiling.h"
+
+#if !defined(__APPLE__)
 #include <stdlib.h>
 
 static const __llvm_profile_data *DataFirst = NULL;
@@ -62,3 +64,4 @@ const char *__llvm_profile_names_begin(void) { return NamesFirst; }
 const char *__llvm_profile_names_end(void) { return NamesLast; }
 uint64_t *__llvm_profile_counters_begin(void) { return CountersFirst; }
 uint64_t *__llvm_profile_counters_end(void) { return CountersLast; }
+#endif