1423813 - Bug 1385783 broke elfhack -r

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Mike Hommey [:glandium]]

$ wget http://ftp.mozilla.org/pub/mobile/nightly/latest-mozilla-central-android-api-16/fennec-59.0a1.multi.android-arm.apk
(...)
$ unzip fennec-59.0a1.multi.android-arm.apk assets/armeabi-v7a/libxul.so
Archive:  fennec-59.0a1.multi.android-arm.apk
 extracting: assets/armeabi-v7a/libxul.so  
$ mv assets/armeabi-v7a/libxul.so{,.xz}
$ xz -d assets/armeabi-v7a/libxul.so.xz 
$ elfhack -r assets/armeabi-v7a/libxul.so  
assets/armeabi-v7a/libxul.so: .elfhack.data.v0 section not following .elfhack.text.v0. Skipping

Comment 1

[Mike Hommey [:glandium]]

Attachment: Bug 1423813 - Properly handle elfhack -r after bug 1385783.

Bug 1385783 changed things such that the two elfhack sections are not
adjacent anymore. They can even be in different segments in some cases,
but the undo code doesn't know how to actually handle that case.

So for now, allow non adjacent sections, but still verify that they are
in the same segment.

Review commit: https://reviewboard.mozilla.org/r/206144/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/206144/

Comment 2

[Mike Hommey [:glandium]]

Nathan, please review when you're available.

Comment 3

[Nathan Froyd [:froydnj]]

Comment on attachment 8935257 [details]
Bug 1423813 - Properly handle elfhack -r after bug 1385783.

https://reviewboard.mozilla.org/r/206144/#review212978

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/63df170aaa13
Properly handle elfhack -r after bug 1385783. r=froydnj

Comment 5

[Cosmin Sabou [:CosminS]]

https://hg.mozilla.org/mozilla-central/rev/63df170aaa13