Revert of roll clang 254049:254793

build/config/sanitizers/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/sanitizers/sanitizers.gni")
 
 # Contains the dependencies needed for sanitizers to link into executables and
 # shared_libraries. Unconditionally depend upon this target as it is empty if
 # |is_asan|, |is_lsan|, |is_tsan|, |is_msan| and |use_custom_libcxx| are false.
@@ skipping 18 matching lines @@
   if (is_asan) {
     ldflags += [ "-fsanitize=address" ]
   }
   if (is_lsan) {
     ldflags += [ "-fsanitize=leak" ]
   }
   if (is_tsan) {
     ldflags += [ "-fsanitize=thread" ]
   }
   if (is_msan) {
-    ldflags += [ "-fsanitize=memory" ]
+    ldflags += [
+      "-fsanitize=memory",
+
+      # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589).
+      "-pie",
+    ]
   }
   if (is_ubsan) {
     ldflags += [ "-fsanitize=undefined" ]
   }
   if (is_ubsan_vptr) {
     ldflags += [ "-fsanitize=vptr" ]
   }
 }
 
 source_set("options_sources") {
@@ skipping 82 matching lines @@
         "-fsanitize-blacklist=$tsan_blacklist_path",
       ]
     }
     if (is_msan) {
       msan_blacklist_path =
           rebase_path("//tools/msan/blacklist.txt", root_build_dir)
       cflags += [
         "-fsanitize=memory",
         "-fsanitize-memory-track-origins=$msan_track_origins",
         "-fsanitize-blacklist=$msan_blacklist_path",
+
+        # TODO(eugenis): Remove when msan migrates to new ABI (crbug.com/560589).
+        "-fPIC",
       ]
     }
     if (is_ubsan) {
       ubsan_blacklist_path =
           rebase_path("//tools/ubsan/blacklist.txt", root_build_dir)
       cflags += [
         # Yasm dies with an "Illegal instruction" error when bounds checking is
         # enabled. See http://crbug.com/489901
         # "-fsanitize=bounds",
         "-fsanitize=float-divide-by-zero",
@@ skipping 90 matching lines @@
 
 config("default_sanitizer_coverage_flags") {
   cflags = []
 
   if (use_sanitizer_coverage) {
     # FIXME: make this configurable.
     cflags +=
         [ "-fsanitize-coverage=edge,indirect-calls,8bit-counters,trace-cmp" ]
   }
 }