GN: Add nacl_arm_glibc toolchain
This adds a toolchain definition for NaCl's ARM glibc toolchain. Nothing uses this yet. Once this lands, changes in the native_client repo will be required to start using it. BUG= 512901 R=dpranke@chromium.org, phosek@chromium.org Review URL: https://codereview.chromium.org/1411743004 Cr-Original-Commit-Position: refs/heads/master@{#355398} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: ab949d7831e67970d671352cf7815b4e52c93b9b
This commit is contained in:
Родитель
134c3c8746
Коммит
688c5744d1
|
@ -16,11 +16,13 @@ import("//build/toolchain/nacl_toolchain.gni")
|
||||||
revisions = exec_script("//native_client/build/get_toolchain_revision.py",
|
revisions = exec_script("//native_client/build/get_toolchain_revision.py",
|
||||||
[
|
[
|
||||||
"nacl_x86_glibc",
|
"nacl_x86_glibc",
|
||||||
|
"nacl_arm_glibc",
|
||||||
"pnacl_newlib",
|
"pnacl_newlib",
|
||||||
],
|
],
|
||||||
"trim list lines")
|
"trim list lines")
|
||||||
nacl_x86_glibc_rev = revisions[0]
|
nacl_x86_glibc_rev = revisions[0]
|
||||||
pnacl_newlib_rev = revisions[1]
|
nacl_arm_glibc_rev = revisions[1]
|
||||||
|
pnacl_newlib_rev = revisions[2]
|
||||||
|
|
||||||
nacl_toolchain("newlib_pnacl") {
|
nacl_toolchain("newlib_pnacl") {
|
||||||
toolchain_package = "pnacl_newlib"
|
toolchain_package = "pnacl_newlib"
|
||||||
|
@ -44,36 +46,48 @@ nacl_toolchain("newlib_pnacl") {
|
||||||
link_outputs = [ finalized_file ]
|
link_outputs = [ finalized_file ]
|
||||||
}
|
}
|
||||||
|
|
||||||
nacl_toolchain("glibc_x86") {
|
template("nacl_glibc_toolchain") {
|
||||||
toolchain_package = "nacl_x86_glibc"
|
toolchain_cpu = target_name
|
||||||
toolchain_revision = nacl_x86_glibc_rev
|
assert(defined(invoker.toolchain_tuple), "Must define toolchain_tuple")
|
||||||
toolchain_cpu = "x86"
|
assert(defined(invoker.toolchain_package), "Must define toolchain_package")
|
||||||
toolprefix =
|
assert(defined(invoker.toolchain_revision), "Must define toolchain_revision")
|
||||||
rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/i686-nacl-",
|
forward_variables_from(invoker,
|
||||||
root_build_dir)
|
[
|
||||||
is_clang = false
|
"toolchain_package",
|
||||||
is_nacl_glibc = true
|
"toolchain_revision",
|
||||||
|
])
|
||||||
|
|
||||||
cc = toolprefix + "gcc"
|
toolprefix = rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/" +
|
||||||
cxx = toolprefix + "g++"
|
invoker.toolchain_tuple + "-",
|
||||||
ar = toolprefix + "ar"
|
root_build_dir)
|
||||||
ld = cxx
|
|
||||||
|
nacl_toolchain("glibc_" + toolchain_cpu) {
|
||||||
|
is_clang = false
|
||||||
|
is_nacl_glibc = true
|
||||||
|
|
||||||
|
cc = toolprefix + "gcc"
|
||||||
|
cxx = toolprefix + "g++"
|
||||||
|
ar = toolprefix + "ar"
|
||||||
|
ld = cxx
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
nacl_toolchain("glibc_x64") {
|
nacl_glibc_toolchain("x86") {
|
||||||
toolchain_package = "nacl_x86_glibc"
|
toolchain_package = "nacl_x86_glibc"
|
||||||
toolchain_revision = nacl_x86_glibc_rev
|
toolchain_revision = nacl_x86_glibc_rev
|
||||||
toolchain_cpu = "x64"
|
toolchain_tuple = "i686-nacl"
|
||||||
toolprefix =
|
}
|
||||||
rebase_path("${nacl_toolchain_dir}/${toolchain_package}/bin/x86_64-nacl-",
|
|
||||||
root_build_dir)
|
|
||||||
is_clang = false
|
|
||||||
is_nacl_glibc = true
|
|
||||||
|
|
||||||
cc = toolprefix + "gcc"
|
nacl_glibc_toolchain("x64") {
|
||||||
cxx = toolprefix + "g++"
|
toolchain_package = "nacl_x86_glibc"
|
||||||
ar = toolprefix + "ar"
|
toolchain_revision = nacl_x86_glibc_rev
|
||||||
ld = cxx
|
toolchain_tuple = "x86_64-nacl"
|
||||||
|
}
|
||||||
|
|
||||||
|
nacl_glibc_toolchain("arm") {
|
||||||
|
toolchain_package = "nacl_arm_glibc"
|
||||||
|
toolchain_revision = nacl_arm_glibc_rev
|
||||||
|
toolchain_tuple = "arm-nacl"
|
||||||
}
|
}
|
||||||
|
|
||||||
template("nacl_clang_toolchain") {
|
template("nacl_clang_toolchain") {
|
||||||
|
|
Загрузка…
Ссылка в новой задаче