GN: Define clang_newlib_arm toolchain for NaCl

build/toolchain/nacl/BUILD.gn

 # Copyright (c) 2014 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.
 
 import("//build/config/sysroot.gni")
 import("//build/toolchain/nacl_toolchain.gni")
 
 nacl_toolchain_dir = rebase_path("//native_client/toolchain", root_build_dir)
 os_toolchain_dir = "${nacl_toolchain_dir}/${current_os}_x86"
 
@@ skipping 52 matching lines @@
   toolchain_cpu = "x64"
   toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/x86_64-nacl-"
   is_clang = false
 
   cc = toolprefix + "gcc"
   cxx = toolprefix + "g++"
   ar = toolprefix + "ar"
   ld = cxx
 }
 
-nacl_toolchain("clang_newlib_x86") {
+template("nacl_clang_toolchain") {
+  toolchain_cpu = target_name
+  assert(defined(invoker.toolchain_tuple), "Must define toolchain_tuple")
+
   toolchain_package = "pnacl_newlib"
   toolchain_revision = pnacl_newlib_rev
-  toolchain_cpu = "x86"
-  toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/i686-nacl-"
-  is_clang = true
+  toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/" +
+               invoker.toolchain_tuple + "-"
 
-  cc = toolprefix + "clang"
-  cxx = toolprefix + "clang++"
-  ar = toolprefix + "ar"
-  ld = cxx
-}
-
-nacl_toolchain("clang_newlib_x64") {
-  toolchain_package = "pnacl_newlib"
-  toolchain_revision = pnacl_newlib_rev
-  toolchain_cpu = "x64"
-  toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/x86_64-nacl-"
-  is_clang = true
-
-  cc = toolprefix + "clang"
-  cxx = toolprefix + "clang++"
-  ar = toolprefix + "ar"
-  ld = cxx
+  nacl_toolchain("clang_newlib_" + toolchain_cpu) {
+    is_clang = true
+    cc = toolprefix + "clang"
+    cxx = toolprefix + "clang++"
+    ar = toolprefix + "ar"
+    ld = cxx
+  }
 }
 
 template("nacl_irt_toolchain") {
   toolchain_cpu = target_name
   assert(defined(invoker.toolchain_tuple), "Must define toolchain_tuple")
 
   toolchain_package = "pnacl_newlib"
   toolchain_revision = pnacl_newlib_rev
   toolprefix = "${os_toolchain_dir}/${toolchain_package}/bin/" +
                invoker.toolchain_tuple + "-"
@@ skipping 18 matching lines @@
     # so we need to link w/ the C++ linker.
     ld = "${python_path} ${link_irt} --tls-edit=${tls_edit} --link-cmd=${cxx} --readelf-cmd=${readelf}"
 
     # TODO(ncbray): depend on link script
     deps = [
       tls_edit_label,
     ]
   }
 }
 
-nacl_irt_toolchain("x86") {
+template("nacl_clang_toolchains") {
+  assert(defined(invoker.toolchain_tuple), "Must define toolchain_tuple")
+  nacl_clang_toolchain(target_name) {
+    toolchain_tuple = invoker.toolchain_tuple
+  }
+  nacl_irt_toolchain(target_name) {
+    toolchain_tuple = invoker.toolchain_tuple
+  }
+}
+
+nacl_clang_toolchains("x86") {
   toolchain_tuple = "i686-nacl"
 }
 
-nacl_irt_toolchain("x64") {
+nacl_clang_toolchains("x64") {
   toolchain_tuple = "x86_64-nacl"
 }
 
-nacl_irt_toolchain("arm") {
+nacl_clang_toolchains("arm") {
   toolchain_tuple = "arm-nacl"
 }