Subzero: Set the correct target arch in the browser hookup.

src/IceBrowserCompileServer.cpp

 //===- subzero/src/IceBrowserCompileServer.cpp - Browser compile server ---===//
 //
 //                        The Subzero Code Generator
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 ///
 /// \file
 /// \brief Defines the browser-based compile server.
 ///
 //===----------------------------------------------------------------------===//
 
 // Can only compile this with the NaCl compiler (needs irt.h, and the
 // unsandboxed LLVM build using the trusted compiler does not have irt.h).
 #if PNACL_BROWSER_TRANSLATOR
 
 #include "IceBrowserCompileServer.h"
+
+// Headers which are not properly part of the SDK are included by their path in
+// the NaCl tree.
+#ifdef __pnacl__
+#include "native_client/src/untrusted/nacl/pnacl.h"
+#endif // __pnacl__
+
 #include "llvm/Support/QueueStreamer.h"
 
 #include <cstring>
 #include <irt.h>
 #include <irt_dev.h>
 #include <pthread.h>
 #include <thread>
 
 namespace Ice {
 
@@ skipping 79 matching lines @@
   // Only kill the current thread instead of the whole process. We need the
   // server thread to remain alive in order to respond with the error message.
   // We could also try to pthread_kill all other worker threads, but
   // pthread_kill / raising signals is not supported by NaCl. We'll have to
   // assume that the worker/emitter threads will be well behaved after a fatal
   // error in other threads, and either get stuck waiting on input from a
   // previous stage, or also call report_fatal_error.
   pthread_exit(0);
 }
 
+/// Adapted from pnacl-llc's AddDefaultCPU() in srpc_main.cpp.
+TargetArch getTargetArch() {
+#if defined(__pnacl__)
+  switch (__builtin_nacl_target_arch()) {

[John, 2016/02/16 12:03:10]

apparently __builtin_nacl_target_arch is deprecated, and __nacl_get_arch()
should be used instead.

[Jim Stichnoth, 2016/02/16 13:52:12]

Yeah, I noticed that, but I have no idea why the trivial change wasn't already
made to pnacl-llc, so I kept it the same here to keep the similarity intact.

+  case PnaclTargetArchitectureX86_32:
+  case PnaclTargetArchitectureX86_32_NonSFI:
+    return Target_X8632;
+  case PnaclTargetArchitectureX86_64:
+    return Target_X8664;
+  case PnaclTargetArchitectureARM_32:
+  case PnaclTargetArchitectureARM_32_NonSFI:
+    return Target_ARM32;
+  case PnaclTargetArchitectureMips_32:
+    return Target_MIPS32;
+  default:
+    llvm::report_fatal_error("no target architecture match.");
+  }
+#elif defined(__i386__)
+  return Target_X8632;
+#elif defined(__x86_64__)
+  return Target_X8664;
+#elif defined(__arm__)
+  return Target_ARM32;
+#else
+// TODO(stichnot): Add mips.
+#error "Unknown architecture"
+#endif
+}
+
 } // end of anonymous namespace
 
 BrowserCompileServer::~BrowserCompileServer() = default;
 
 void BrowserCompileServer::run() {
   gCompileServer = this;
   getIRTInterfaces();
   gIRTFuncs.serve_translate_request(&SubzeroCallbacks);
 }
 
 void BrowserCompileServer::getParsedFlags(uint32_t NumThreads, int argc,
                                           char **argv) {
   ClFlags::parseFlags(argc, argv);
   ClFlags::getParsedClFlags(Flags);
   ClFlags::getParsedClFlagsExtra(ExtraFlags);
   // Set some defaults which aren't specified via the argv string.
   Flags.setNumTranslationThreads(NumThreads);
   Flags.setUseSandboxing(true);
   Flags.setOutFileType(FT_Elf);
-  // TODO(jvoung): allow setting different target arches.
-  Flags.setTargetArch(Target_X8632);
+  Flags.setTargetArch(getTargetArch());
   ExtraFlags.setBuildOnRead(true);
   ExtraFlags.setInputFileFormat(llvm::PNaClFormat);
 }
 
 bool BrowserCompileServer::pushInputBytes(const void *Data, size_t NumBytes) {
   // If there was an earlier error, do not attempt to push bytes to the
   // QueueStreamer. Otherwise the thread could become blocked.
   if (HadError.load())
     return true;
   return InputStream->PutBytes(
@@ skipping 39 matching lines @@
     this->getCompiler().run(ExtraFlags, *Ctx.get(),
                             // Retain original reference, but the compiler
                             // (LLVM's MemoryObject) wants to handle deletion.
                             std::unique_ptr<llvm::DataStreamer>(InputStream));
   });
 }
 
 } // end of namespace Ice
 
 #endif // PNACL_BROWSER_TRANSLATOR