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

Issue 8954009: Fix mangled function names. (Closed)

Created:
9 years ago by Hironori Bono
Modified:
8 years, 11 months ago
Reviewers:
agl, Brad Chen
CC:
chromium-reviews
Visibility:
Public.

Description

Fix conflicts in our function mangling. This change changes zlib.h to prevent it from mangling some functions twice on x64. It also adds a 'google.patch' file, a diff file from the original zlib. BUG=30703 TEST=build Chromium on the "Chromium Linux Builder (valgrind)" bot. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=117019

Patch Set 1 : '' #

Patch Set 2 : '' #

Patch Set 3 : '' #

Patch Set 4 : '' #

Unified diffs Side-by-side diffs Delta from patch set Stats (+231 lines, -24 lines) Patch
M third_party/zlib/README.chromium View 1 2 3 1 chunk +2 lines, -0 lines 0 comments Download
A third_party/zlib/google.patch View 1 2 1 chunk +209 lines, -0 lines 0 comments Download
M third_party/zlib/mozzconf.h View 1 2 3 5 chunks +12 lines, -18 lines 0 comments Download
M third_party/zlib/zlib.h View 1 2 3 1 chunk +8 lines, -6 lines 0 comments Download

Messages

Total messages: 6 (0 generated)
Hironori Bono
Greetings, Sorry, I did not notice this problem because it happens only on Linux, which ...
9 years ago (2011-12-19 04:29:53 UTC) #1
agl
The patch file should be made with the -u option to diff. Also, the patch ...
9 years ago (2011-12-19 15:06:54 UTC) #2
Hironori Bono
Greetings, Many thanks for your review and comment. I totally forgot removing the files not ...
9 years ago (2011-12-21 07:43:02 UTC) #3
agl
Seems consistent now. It actually builds and works then LGTM.
9 years ago (2011-12-21 14:46:28 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/hbono@chromium.org/8954009/16001
9 years ago (2011-12-22 10:46:32 UTC) #5
commit-bot: I haz the power
9 years ago (2011-12-22 11:47:25 UTC) #6
Try job failure for 8954009-16001 (retry) on linux_rel for step "ui_tests".
It's a second try, previously, step "ui_tests" failed.
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_rel&...

Powered by Google App Engine
This is Rietveld 408576698