Subzero: Update for LLVM 3.9 (trunk).

src/IceClFlags.h

 //===- subzero/src/IceClFlags.h - Cl Flags for translation ------*- C++ -*-===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
@@ skipping 18 matching lines @@
 #include "llvm/IRReader/IRReader.h"
 
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif // __clang__
 
 #include <string>
 #include <utility>
 #include <vector>
 
+#ifndef PNACL_LLVM
+namespace llvm {
+// \brief Define the expected format of the file.
+enum NaClFileFormat {
+  // LLVM IR source or bitcode file (as appropriate).
+  LLVMFormat,
+  // PNaCl bitcode file.
+  PNaClFormat,
+  // Autodetect if PNaCl or LLVM format.
+  AutodetectFileFormat
+};
+} // end of namespace llvm
+#endif // !PNACL_LLVM
+
 namespace Ice {
 // detail defines the type cl_type_traits, which is used to define the
 // getters/setters for the ClFlags class. It converts the cl_detail::*_flag
 // types to appropriate types for the several getters and setters created.
 namespace detail {
 // Base cl_type_traits.
 template <typename B, typename CL> struct cl_type_traits {};
 
 // cl_type_traits specialized cl::list<std::string>, non-MINIMAL build.
 template <> struct cl_type_traits<std::string, cl_detail::dev_list_flag> {
@@ skipping 132 matching lines @@
   RangeSpec TimingFocus;
   RangeSpec TranslateOnly;
   RangeSpec VerboseFocus;
 };
 
 inline const ClFlags &getFlags() { return ClFlags::Flags; }
 
 } // end of namespace Ice
 
 #endif // SUBZERO_SRC_ICECLFLAGS_H