Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(383)

Issue 1656463002: Revert of NaCl cleanup: Remove now-unneeded initialisation of NaCl libraries (Closed)

Created:
4 years, 10 months ago by joedow
Modified:
4 years, 10 months ago
CC:
chromium-reviews, blundell+watchlist_chromium.org, sdefresne+watchlist_chromium.org, droger+watchlist_chromium.org
Base URL:
http://git.chromium.org/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of NaCl cleanup: Remove now-unneeded initialisation of NaCl libraries (patchset #2 id:20001 of https://codereview.chromium.org/1651583002/ ) Reason for revert: Reverting due to build break on the official waterfall. Yesterday the x86 builder was broken, today it is the x64 version: https://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20Linux%20x64/builds/7719/steps/compile/logs/stdio error message: > ld-linux-x86-64.so.2(GLIBC_2.3)(64bit) ERROR: Shared library dependencies changed! If this is intentional, please update: chrome/installer/linux/rpm/expected_deps_i386 chrome/installer/linux/rpm/expected_deps_x86_64 Perhaps on the i386 deps need updating? Original issue's description: > NaCl cleanup: Remove now-unneeded initialisation of NaCl libraries (2nd try) > > The renderer now no longer uses these NaCl libraries, so we don't need > to initialise them on startup in module_ppapi.cc. This leaves > UrandomFD() unused, so we can remove it too. > > This means that, on Linux, the chrome executable no longer pulls in > any code that uses thread-local (TLS) variables (those declared with > "__thread"). This means that it no longer references the function > __tls_get_addr() (or ___tls_get_addr() on i386), which is defined by > ld-linux.so with symbol version "GLIBC_2.3". This means we must > update the symbol version dependency expectations in > chrome/installer/linux/rpm/expected_deps_*. > > For example, nacl_log.c is one source file that uses __thread > variables on Linux, and that no longer gets linked into chrome now. > > Before the change: > > $ objdump -x out/Release/chrome > ... > required from ld-linux-x86-64.so.2: > 0x09691a75 0x00 47 GLIBC_2.2.5 > 0x0d696913 0x00 48 GLIBC_2.3 > ... > $ nm -D out/Release/chrome | grep tls_get > U __tls_get_addr > > After the change: > > $ objdump -x out/Release/chrome > ... > required from ld-linux-x86-64.so.2: > 0x09691a75 0x00 47 GLIBC_2.2.5 > ... > $ nm -D out/Release/chrome | grep tls_get > > This is a retry of https://codereview.chromium.org/1646733002/, which > got reverted because the symbol version expectations changed. > > BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=2832 > TEST=e.g. NaClBrowserTestPnacl.PPAPICore (tests PNaCl translation) > > Committed: https://crrev.com/deb5941331e83f0819b0cef08a8adaf9788dc167 > Cr-Commit-Position: refs/heads/master@{#372437} TBR=bbudge@chromium.org,thestig@chromium.org,mseaborn@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG= https://bugs.chromium.org/p/nativeclient/issues/detail?id=2832 Committed: https://crrev.com/18e2aed71fa672e012c4b8f3bc31bc4de78d62a3 Cr-Commit-Position: refs/heads/master@{#372470}

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+45 lines, -0 lines) Patch
M chrome/installer/linux/rpm/expected_deps_i386 View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/installer/linux/rpm/expected_deps_x86_64 View 1 chunk +1 line, -0 lines 0 comments Download
M components/nacl/renderer/plugin/BUILD.gn View 1 chunk +2 lines, -0 lines 0 comments Download
M components/nacl/renderer/plugin/DEPS View 1 chunk +4 lines, -0 lines 0 comments Download
M components/nacl/renderer/plugin/module_ppapi.h View 1 chunk +1 line, -0 lines 0 comments Download
M components/nacl/renderer/plugin/module_ppapi.cc View 2 chunks +20 lines, -0 lines 0 comments Download
M components/nacl/renderer/plugin/plugin.gyp View 1 chunk +2 lines, -0 lines 0 comments Download
M components/nacl/renderer/ppb_nacl_private.h View 1 chunk +4 lines, -0 lines 0 comments Download
M components/nacl/renderer/ppb_nacl_private_impl.cc View 3 chunks +10 lines, -0 lines 0 comments Download

Messages

Total messages: 6 (2 generated)
joedow
Created Revert of NaCl cleanup: Remove now-unneeded initialisation of NaCl libraries
4 years, 10 months ago (2016-01-29 23:42:08 UTC) #1
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1656463002/1 View timeline at https://chromium-cq-status.appspot.com/patch-timeline/1656463002/1
4 years, 10 months ago (2016-01-29 23:42:56 UTC) #2
commit-bot: I haz the power
Committed patchset #1 (id:1)
4 years, 10 months ago (2016-01-29 23:46:42 UTC) #4
commit-bot: I haz the power
4 years, 10 months ago (2016-01-29 23:48:24 UTC) #6
Message was sent while issue was closed.
Patchset 1 (id:??) landed as
https://crrev.com/18e2aed71fa672e012c4b8f3bc31bc4de78d62a3
Cr-Commit-Position: refs/heads/master@{#372470}

Powered by Google App Engine
This is Rietveld 408576698