[NaCl SDK] Remove NACL_ARCH from commom makefiles.

native_client_sdk/src/examples/tutorial/dlopen/dlopen.cc

 // 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.
 
 #include <dlfcn.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #include <ppapi/cpp/completion_callback.h>
 #include <ppapi/cpp/instance.h>
 #include <ppapi/cpp/module.h>
 #include <ppapi/cpp/var.h>
 
 #include "eightball.h"
 #include "nacl_io/nacl_io.h"
 #include "reverse.h"
 
 #if defined(NACL_SDK_DEBUG)
 #define CONFIG_NAME "Debug"
 #else
 #define CONFIG_NAME "Release"
 #endif
 
-#define XSTRINGIFY(x) STRINGIFY(x)
-#define STRINGIFY(x) #x
-#define NACL_ARCH_STRING XSTRINGIFY(NACL_ARCH)
+#if defined __arm__
+#define NACL_ARCH "arm"
+#elif defined __i686__
+#define NACL_ARCH "x86_32"
+#elif defined __x86_64__
+#define NACL_ARCH "x86_64"
+#else
+#error "Unknown arch"
+#endif
 
 class DlOpenInstance : public pp::Instance {
  public:
   explicit DlOpenInstance(PP_Instance instance)
       : pp::Instance(instance),
         eightball_so_(NULL),
         reverse_so_(NULL),
         eightball_(NULL),
         reverse_(NULL),
         tid_(NULL) {}
@@ skipping 20 matching lines @@
       return false;
     }
     return true;
   }
 
   // This function is called on a worker thread, and will call dlopen to load
   // the shared object.  In addition, note that this function does NOT call
   // dlclose, which would close the shared object and unload it from memory.
   void LoadLibrary() {
     const char reverse_so_path[] =
-        "/http/glibc/" CONFIG_NAME "/libreverse_" NACL_ARCH_STRING ".so";
+        "/http/glibc/" CONFIG_NAME "/libreverse_" NACL_ARCH ".so";
     const int32_t IMMEDIATELY = 0;
     eightball_so_ = dlopen("libeightball.so", RTLD_LAZY);
     reverse_so_ = dlopen(reverse_so_path, RTLD_LAZY);
     pp::CompletionCallback cc(LoadDoneCB, this);
     pp::Module::Get()->core()->CallOnMainThread(IMMEDIATELY, cc, 0);
   }
 
   // This function will run on the main thread and use the handle it stored by
   // the worker thread, assuming it successfully loaded, to get a pointer to the
   // message function in the shared object.
@@ skipping 98 matching lines @@
 
   // Create and return a DlOpenInstance object.
   virtual pp::Instance* CreateInstance(PP_Instance instance) {
     return new DlOpenInstance(instance);
   }
 };
 
 namespace pp {
 Module* CreateModule() { return new DlOpenModule(); }
 }  // namespace pp