Index: compiler-rt/trunk/lib/asan/asan_globals.cc
===================================================================
--- compiler-rt/trunk/lib/asan/asan_globals.cc
+++ compiler-rt/trunk/lib/asan/asan_globals.cc
@@ -115,15 +115,12 @@
     if (flags()->report_globals >= 2)
       ReportGlobal(g, "Search");
     if (IsAddressNearGlobal(addr, g)) {
-#if defined(__GNUC__) && defined(__sparc__)
       internal_memcpy(&globals[res], &g, sizeof(g));
-#else
-      globals[res] = g;
-#endif
       if (reg_sites)
         reg_sites[res] = FindRegistrationSite(&g);
       res++;
-      if (res == max_globals) break;
+      if (res == max_globals)
+        break;
     }
   }
   return res;
Index: compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc
===================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_symbolizer_win.cc
@@ -35,6 +35,9 @@
 
 class WinSymbolizerTool : public SymbolizerTool {
  public:
+  // The constructor is provided to avoid synthesized memsets.
+  WinSymbolizerTool() {}
+
   bool SymbolizePC(uptr addr, SymbolizedStack *stack) override;
   bool SymbolizeData(uptr addr, DataInfo *info) override {
     return false;