Skip to content

GitLab

T
tangled
Commit 15ce17a4 authored by sbc@chromium.org's avatar sbc@chromium.org
Browse files
Options

NaCl: Update revision in DEPS, r12098 -> r12120 

This change also contains chrome-side changes to
handle the renaming of the PNaCl toolchain folder
within the NaCl SDK.

This pulls in the following Native Client changes:

r12099: (shcherbina) Add custom tempfile prefix to old validator targeted tests.
r12100: (stichnot) Fix and harden error reporting in the report parser.
r12101: (stichnot) Exclude ms_struct_pack_layout.
r12102: (ncbray) Enable validation caching on ARM.
r12103: (petarj) [MIPS] Enable validator tests
r12104: (halyavin) Fix copy paste error in the log message.
r12105: (khim) Support precise toolchain trybots/buildbots
r12106: (kschimpf) Update pnacl llvm revisions
r12107: (stichnot) Fix breakage when running the LLVM regression tests.
r12108: (jvoung) Handle unicode as strings instead of lists in the pnacl driver env setmany.
r12109: (khim) Fix precise64 toolchain bots
r12110: (jvoung) Turn off allow_double again, for callingconv test on arm-nacl-gcc.
r12111: (kschimpf) Update pnacl llvm revisions.
r12112: (bradnelson) Temporarily remove breakpad from DEPS in order to move it.
r12114: (bradnelson) Clobbering the breakpad directory.
r12115: (petarj) [MIPS] Fix expectations for mips_test_read_only_regs
r12116: (sbc) Roll newlib toolchains in TOOL_REVISIONS.
r12117: (petarj) [MIPS] Remove unneeded checks for TLS register
r12118: (bradnelson) Pull in all of breakpad for crash dump testing.
r12119: (sbc) Rename PNaCl toolchain folder within the SDK.

BUG=none
TEST=browser_tests and nacl_integration

Review URL: https://chromiumcodereview.appspot.com/23576014

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221664 0039d316-1c4b-4281-b951-d872f2087c98
parent e6e05709
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 55 deletions
DEPS
View file @ 15ce17a4
......@@ -13,7 +13,7 @@ vars = {
"chromiumos_git": "https://chromium.googlesource.com/chromiumos",
"skia_git": "https://skia.googlesource.com",
"swig_revision": "69281",
"nacl_revision": "12098",
"nacl_revision": "12120",
# After changing nacl_revision, run 'glient sync' and check native_client/DEPS
# to update other nacl_*_revision's.
"nacl_tools_revision": "11437", # native_client/DEPS: tools_rev
......
native_client_sdk/src/build_tools/build_sdk.py
View file @ 15ce17a4
......@@ -61,21 +61,21 @@ GYPBUILD_DIR = 'gypbuild'
options = None
def GetGlibcToolchain(host_arch):
def GetGlibcToolchain():
tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars')
tcname = 'toolchain_%s_%s.tar.bz2' % (getos.GetPlatform(), host_arch)
tcname = 'toolchain_%s_x86.tar.bz2' % getos.GetPlatform()
return os.path.join(tcdir, tcname)
def GetNewlibToolchain(host_arch):
def GetNewlibToolchain():
tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars')
tcname = 'naclsdk_%s_%s.tgz' % (getos.GetPlatform(), host_arch)
tcname = 'naclsdk_%s_x86.tgz' % getos.GetPlatform()
return os.path.join(tcdir, tcname)
def GetPNaClToolchain(host_arch):
def GetPNaClToolchain():
tcdir = os.path.join(NACL_DIR, 'toolchain', '.tars')
tcname = 'naclsdk_pnacl_%s_%s.tgz' % (getos.GetPlatform(), host_arch)
tcname = 'naclsdk_pnacl_%s_x86.tgz' % getos.GetPlatform()
return os.path.join(tcdir, tcname)
......@@ -109,18 +109,21 @@ def GetGypBuiltLib(tcname, xarch=None):
def GetToolchainNaClLib(tcname, tcpath, xarch):
if tcname == 'pnacl':
return os.path.join(tcpath, 'newlib', 'sdk', 'lib')
if xarch == '32':
elif xarch == '32':
return os.path.join(tcpath, 'x86_64-nacl', 'lib32')
if xarch == '64':
elif xarch == '64':
return os.path.join(tcpath, 'x86_64-nacl', 'lib')
if xarch == 'arm':
elif xarch == 'arm':
return os.path.join(tcpath, 'arm-nacl', 'lib')
def GetToolchainDirName(tcname, xarch):
if xarch != 'arm':
xarch = 'x86'
return '%s_%s_%s' % (getos.GetPlatform(), xarch, tcname)
if tcname == 'pnacl':
return '%s_%s' % (getos.GetPlatform(), tcname)
elif xarch == 'arm':
return '%s_arm_%s' % (getos.GetPlatform(), tcname)
else:
return '%s_x86_%s' % (getos.GetPlatform(), tcname)
def GetGypToolchainLib(tcname, xarch):
......@@ -198,42 +201,43 @@ def PrunePNaClToolchain(root):
buildbot_common.RemoveDir(os.path.join(root, dirname))
def BuildStepUntarToolchains(pepperdir, arch, toolchains):
def BuildStepUntarToolchains(pepperdir, toolchains):
buildbot_common.BuildStep('Untar Toolchains')
platform = getos.GetPlatform()
tcname = platform + '_' + arch
tmpdir = os.path.join(OUT_DIR, 'tc_temp')
buildbot_common.RemoveDir(tmpdir)
buildbot_common.MakeDir(tmpdir)
if 'newlib' in toolchains:
# Untar the newlib toolchains
tarfile = GetNewlibToolchain(arch)
tarfile = GetNewlibToolchain()
buildbot_common.Run([sys.executable, CYGTAR, '-C', tmpdir, '-xf', tarfile],
cwd=NACL_DIR)
# Then rename/move it to the pepper toolchain directory
srcdir = os.path.join(tmpdir, 'sdk', 'nacl-sdk')
newlibdir = os.path.join(pepperdir, 'toolchain', tcname + '_newlib')
tcname = platform + '_x86_newlib'
newlibdir = os.path.join(pepperdir, 'toolchain', tcname)
buildbot_common.Move(srcdir, newlibdir)
if 'arm' in toolchains:
# Copy the existing arm toolchain from native_client tree
arm_toolchain = os.path.join(NACL_DIR, 'toolchain',
platform + '_arm_newlib')
tcname = platform + '_arm_newlib'
arm_toolchain = os.path.join(NACL_DIR, 'toolchain', tcname)
arm_toolchain_sdk = os.path.join(pepperdir, 'toolchain',
os.path.basename(arm_toolchain))
buildbot_common.CopyDir(arm_toolchain, arm_toolchain_sdk)
if 'glibc' in toolchains:
# Untar the glibc toolchains
tarfile = GetGlibcToolchain(arch)
tarfile = GetGlibcToolchain()
tcname = platform + '_x86_glibc'
buildbot_common.Run([sys.executable, CYGTAR, '-C', tmpdir, '-xf', tarfile],
cwd=NACL_DIR)
# Then rename/move it to the pepper toolchain directory
srcdir = os.path.join(tmpdir, 'toolchain', tcname)
glibcdir = os.path.join(pepperdir, 'toolchain', tcname + '_glibc')
srcdir = os.path.join(tmpdir, 'toolchain', platform + '_x86')
glibcdir = os.path.join(pepperdir, 'toolchain', tcname)
buildbot_common.Move(srcdir, glibcdir)
# Untar the pnacl toolchains
......@@ -241,12 +245,13 @@ def BuildStepUntarToolchains(pepperdir, arch, toolchains):
tmpdir = os.path.join(tmpdir, 'pnacl')
buildbot_common.RemoveDir(tmpdir)
buildbot_common.MakeDir(tmpdir)
tarfile = GetPNaClToolchain(arch)
tarfile = GetPNaClToolchain()
tcname = platform + '_pnacl'
buildbot_common.Run([sys.executable, CYGTAR, '-C', tmpdir, '-xf', tarfile],
cwd=NACL_DIR)
# Then rename/move it to the pepper toolchain directory
pnacldir = os.path.join(pepperdir, 'toolchain', tcname + '_pnacl')
pnacldir = os.path.join(pepperdir, 'toolchain', tcname)
buildbot_common.Move(tmpdir, pnacldir)
PrunePNaClToolchain(pnacldir)
......@@ -566,10 +571,10 @@ def BuildStepBuildToolchains(pepperdir, toolchains):
GypNinjaBuild_Breakpad(GYPBUILD_DIR)
platform = getos.GetPlatform()
tcname = platform + '_x86'
newlibdir = os.path.join(pepperdir, 'toolchain', tcname + '_newlib')
glibcdir = os.path.join(pepperdir, 'toolchain', tcname + '_glibc')
pnacldir = os.path.join(pepperdir, 'toolchain', tcname + '_pnacl')
newlibdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_newlib')
glibcdir = os.path.join(pepperdir, 'toolchain', platform + '_x86_glibc')
armdir = os.path.join(pepperdir, 'toolchain', platform + '_arm_newlib')
pnacldir = os.path.join(pepperdir, 'toolchain', platform + '_pnacl')
if set(toolchains) & set(['glibc', 'newlib']):
GypNinjaBuild_PPAPI('ia32', GYPBUILD_DIR)
......@@ -588,8 +593,6 @@ def BuildStepBuildToolchains(pepperdir, toolchains):
'glibc')
if 'arm' in toolchains:
tcname = platform + '_arm_newlib'
armdir = os.path.join(pepperdir, 'toolchain', tcname)
InstallNaClHeaders(GetToolchainNaClInclude('newlib', armdir, 'arm'),
'arm')
......@@ -879,7 +882,6 @@ def main(args):
global options
options, args = parser.parse_args(args[1:])
arch = 'x86'
generate_make.use_gyp = options.gyp
if buildbot_common.IsSDKBuilder():
......@@ -915,7 +917,7 @@ def main(args):
BuildStepCleanPepperDirs(pepperdir, pepperdir_old)
BuildStepMakePepperDirs(pepperdir, ['include', 'toolchain', 'tools'])
BuildStepDownloadToolchains()
BuildStepUntarToolchains(pepperdir, arch, toolchains)
BuildStepUntarToolchains(pepperdir, toolchains)
BuildStepCopyTextFiles(pepperdir, pepper_ver, chrome_revision, nacl_revision)
BuildStepBuildToolchains(pepperdir, toolchains)
......
native_client_sdk/src/build_tools/nacl-mono-runtime.sh
View file @ 15ce17a4
......@@ -75,7 +75,7 @@ arm)
arm-pnacl)
readonly USE_PNACL=1
readonly USE_NEWLIB=1
readonly TC_FLAVOUR=linux_x86_pnacl/newlib
readonly TC_FLAVOUR=linux_pnacl/newlib
readonly NACL_CROSS_PREFIX_DASH=pnacl-
readonly PNACL_LINK_ARGS="-arch armv7 -O2"
CONFIG_OPTS="--host=armv7l-unknown-linux-gnueabi \
......
native_client_sdk/src/build_tools/sdk_files.list
View file @ 15ce17a4
......@@ -374,27 +374,27 @@ toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libnosys.a
toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi.a
toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libppapi_stub.a
toolchain/${PLATFORM}_x86_newlib/x86_64-nacl/lib32/libpthread.a
toolchain/${PLATFORM}_x86_pnacl/*
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/irt.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/irt_ppapi.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/dynamic_annotations.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_dyncode.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_exception.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_minidump.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_startup.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/nacl/nacl_thread.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/pnacl.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/pthread.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/include/semaphore.h
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/lib/libminidump_generator.a
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/lib/libnacl.a
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/lib/libnacl_dyncode.a
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/lib/libnacl_exception.a
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/lib/libnacl_list_mappings.a
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/lib/libnosys.a
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/lib/libppapi.a
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/lib/libppapi_stub.a
toolchain/${PLATFORM}_x86_pnacl/newlib/sdk/lib/libpthread.a
toolchain/${PLATFORM}_pnacl/*
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/irt.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/irt_ppapi.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/nacl/dynamic_annotations.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/nacl/nacl_dyncode.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/nacl/nacl_exception.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/nacl/nacl_minidump.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/nacl/nacl_startup.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/nacl/nacl_thread.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/pnacl.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/pthread.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/include/semaphore.h
toolchain/${PLATFORM}_pnacl/newlib/sdk/lib/libminidump_generator.a
toolchain/${PLATFORM}_pnacl/newlib/sdk/lib/libnacl.a
toolchain/${PLATFORM}_pnacl/newlib/sdk/lib/libnacl_dyncode.a
toolchain/${PLATFORM}_pnacl/newlib/sdk/lib/libnacl_exception.a
toolchain/${PLATFORM}_pnacl/newlib/sdk/lib/libnacl_list_mappings.a
toolchain/${PLATFORM}_pnacl/newlib/sdk/lib/libnosys.a
toolchain/${PLATFORM}_pnacl/newlib/sdk/lib/libppapi.a
toolchain/${PLATFORM}_pnacl/newlib/sdk/lib/libppapi_stub.a
toolchain/${PLATFORM}_pnacl/newlib/sdk/lib/libpthread.a
tools/common.mk
tools/compiler-wrapper.py
tools/create_html.py
......
native_client_sdk/src/tools/nacl_llvm.mk
View file @ 15ce17a4
......@@ -10,7 +10,7 @@
#
# Paths to Tools
#
PNACL_BIN = $(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/newlib/bin
PNACL_BIN = $(TC_PATH)/$(OSNAME)_$(TOOLCHAIN)/newlib/bin
PNACL_CC ?= $(PNACL_BIN)/pnacl-clang -c
PNACL_CXX ?= $(PNACL_BIN)/pnacl-clang++ -c
PNACL_LINK ?= $(PNACL_BIN)/pnacl-clang++
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment