Roll Clang 193323:198389

build/common.gypi

 # Copyright (c) 2012 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.
 
 # IMPORTANT:
 # Please don't directly include this file if you are building via gyp_chromium,
 # since gyp_chromium is automatically forcing its inclusion.
 {
   # Variables expected to be overriden on the GYP command line (-D) or by
   # ~/.gyp/include.gypi.
@@ skipping 3232 matching lines @@
                       }],
                       ['clang==1', {
                         'cflags!': [
                           # Clang does not support the following options.
                           '-mthumb-interwork',
                           '-finline-limit=64',
                           '-fno-tree-sra',
                           '-fuse-ld=gold',
                           '-Wno-psabi',
                         ],
+                        'cflags': [
+                          # TODO(hans) Enable integrated-as (crbug.com/124610).
+                          '-no-integrated-as',
+                        ],
+
                         'ldflags!': [
                           # Clang does not support the following options.
                           '-fuse-ld=gold',
                         ],
                       }],
                     ],
                   }],
                 ],
               }],
             ],
@@ skipping 1533 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }