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

[Alexey Samsonov]

================
Comment at: lib/asan/asan_mac.cc:28
@@ +27,3 @@
+#if !SANITIZER_IOS
+#include <crt_externs.h>  // for _NSGetArgv and _NSGetEnviron
+#else
----------------
How did this #include for SANITIZER_IOSSIM before this change?

================
Comment at: lib/asan/asan_mapping.h:106
@@ -103,2 +105,3 @@
+static const u64 kIosSimShadowOffset64 = kDefaultShadowOffset64;
 static const u64 kDefaultShort64bitShadowOffset = 0x7FFF8000;  // < 2G.
 static const u64 kAArch64_ShadowOffset64 = 1ULL << 36;
----------------
keep defaults together as well.

================
Comment at: lib/asan/asan_mapping.h:118
@@ -114,1 +117,3 @@
 # define SHADOW_OFFSET (0)
+#elif SANITIZER_IOS
+# if SANITIZER_WORDSIZE == 32
----------------
I think you should keep the original code layout and add ios/iossim cases to large `#if SANITIZER_WORDSIZE == 32` block, and add ios/iossim cases to large `else (SANITIZER_WORDSIZE == 64)` block.

http://reviews.llvm.org/D10515

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