Update PNaCl to LLVM/Clang/Libcxx 223109 (nacl-change)

toolchain_build/toolchain_build_pnacl.py

 #!/usr/bin/python
 # Copyright (c) 2013 The Native Client Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Recipes for PNaCl toolchain packages.
 
    Recipes consist of specially-structured dictionaries, with keys for package
    name, type, commands to execute, etc. The structure is documented in the
    PackageBuilder docstring in toolchain_main.py.
@@ skipping 215 matching lines @@
       # LLVM's linux->mingw cross build needs this
       configure_args.append('CC_FOR_BUILD=gcc')
   else:
     if TripleIsMac(host):
       # This is required for building with recent libc++ against OSX 10.6
       extra_cflags.append('-U__STRICT_ANSI__')
     if options.gcc or host == 'le32-nacl':
       configure_args.extend(['CFLAGS=' + ' '.join(extra_cflags),
                              'CXXFLAGS=' + ' '.join(extra_cflags)])
     else:
-      # TODO(jvoung): Remove this after merging LLVM to be cleaner
-      # w.r.t. -Winconsistent-missing-override.
-      # https://code.google.com/p/nativeclient/issues/detail?id=4026
-      if not options.gcc:
-        extra_cflags.append('-Wno-inconsistent-missing-override')
       configure_args.extend(
        ['CFLAGS=' + ' '.join(extra_cflags),
         'LDFLAGS=-L%(' + FlavoredName('abs_libcxx',
                                       host,
                                       options) + ')s/lib',
         'CXXFLAGS=-stdlib=libc++ -I%(' +
             FlavoredName('abs_libcxx', host, options) +
         ')s/include/c++/v1 ' + ' '.join(extra_cflags)])
 
   return configure_args
@@ skipping 869 matching lines @@
           'x86-32-%s' % pynacl.platform.GetOS(), unsandboxed_irt_canonical))
 
     if args.build_sbtc and not args.pnacl_in_pnacl:
       packages.update(pnacl_sandboxed_translator.SandboxedTranslators(
         SANDBOXED_TRANSLATOR_ARCHES))
 
   tb = toolchain_main.PackageBuilder(packages,
                                      upload_packages,
                                      leftover_args)
   tb.Main()