[PATCH] Working on reconciling out-of-tree patches to compiler-rt for building for iOS.

[Alexey Samsonov]

================
Comment at: lib/asan/asan_mac.cc:27
@@ -26,2 +26,3 @@
 
-#include <crt_externs.h>  // for _NSGetArgv
+#if !TARGET_OS_IPHONE
+#include <crt_externs.h>  // for _NSGetArgv and _NSGetEnviron
----------------
`SANITIZER_IOS`

================
Comment at: lib/asan/asan_mac.cc:73
@@ -64,2 +72,3 @@
 void LeakyResetEnv(const char *name, const char *name_value) {
+#if !TARGET_OS_IPHONE
   char ***env_ptr = _NSGetEnviron();
----------------
Looks like this logic is copied from http://reviews.llvm.org/D10510. Consider introducing a function instead.

================
Comment at: lib/asan/asan_mapping.h:101
@@ -100,3 +100,3 @@
 static const u64 kDefaultShadowOffset32 = 1ULL << 29;  // 0x20000000
 static const u64 kIosShadowOffset32 = 1ULL << 30;  // 0x40000000
 static const u64 kDefaultShadowOffset64 = 1ULL << 44;
----------------
Please group iossim constants together,

================
Comment at: lib/asan/asan_mapping.h:120
@@ +119,3 @@
+# if SANITIZER_WORDSIZE == 32
+#   if SANITIZER_IOSSIM
+#     define SHADOW_OFFSET kIosSimShadowOffset32
----------------
indentation looks inconsistent.

http://reviews.llvm.org/D10515

EMAIL PREFERENCES
  http://reviews.llvm.org/settings/panel/emailpreferences/