Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-01 00:32:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1854047 - Enable relrhack in local builds when possible. r=firefox-build-system-reviewers,andi

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D188677
This commit is contained in:
Mike Hommey 2023-10-13 01:19:40 +00:00
parent 554f9dda0a
commit 0420c204c2
2 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
python/mozbuild/mozbuild/test/configure/test_toolkit_moz_configure.py
View File

@ -170,11 +170,33 @@ class TestToolkitMozConfigure(BaseConfigureTest):
) )
PACK = ["-Wl,-z,pack-relative-relocs"] PACK = ["-Wl,-z,pack-relative-relocs"]
# The typical case with a bootstrap build: linker supports pack-relative-relocs,
# but glibc is old and doesn't.
mockcc = MockCC(True, False)
readelf = ReadElf(True)
self.assertEqual(get_values(mockcc, readelf), ("lld", None, "relr"))
self.assertEqual(
get_values(mockcc, readelf, ["--enable-release"]), ("lld", None, "relr")
)
self.assertEqual(
get_values(mockcc, readelf, ["--enable-elf-hack"]), ("lld", None, "relr")
)
self.assertEqual(
get_values(mockcc, readelf, ["--enable-elf-hack=relr"]),
("lld", None, "relr"),
)
# LLD is picked by default and enabling elfhack fails because of that.
with self.assertRaises(SystemExit):
get_values(mockcc, readelf, ["--enable-elf-hack=legacy"])
# If we force to use BFD ld, it works.
self.assertEqual(
get_values(
mockcc, readelf, ["--enable-elf-hack=legacy", "--enable-linker=bfd"]
),
("bfd", None, "legacy"),
)
for mockcc, readelf in ( for mockcc, readelf in (
# The typical case with a bootstrap build: linker supports pack-relative-relocs,
# but glibc is old and doesn't. We won't use pack-relative-relocs, and will use
# elfhack on release builds, or when explicitly enabled.
(MockCC(True, False), ReadElf(True)),
# Linker doesn't support pack-relative-relocs. Glibc is old. # Linker doesn't support pack-relative-relocs. Glibc is old.
(MockCC(False, False), ReadElf(False)), (MockCC(False, False), ReadElf(False)),
# Linker doesn't support pack-relative-relocs. Glibc is new. # Linker doesn't support pack-relative-relocs. Glibc is new.
@ -189,21 +211,13 @@ class TestToolkitMozConfigure(BaseConfigureTest):
get_values(mockcc, readelf, ["--enable-release"]), get_values(mockcc, readelf, ["--enable-release"]),
("lld", None, None), ("lld", None, None),
) )
# LLD is picked by default and enabling elfhack fails because of that.
with self.assertRaises(SystemExit): with self.assertRaises(SystemExit):
get_values(mockcc, readelf, ["--enable-elf-hack"]) get_values(mockcc, readelf, ["--enable-elf-hack"])
with self.assertRaises(SystemExit):
get_values(mockcc, readelf, ["--enable-elf-hack=relr"])
# LLD is picked by default and enabling elfhack fails because of that.
with self.assertRaises(SystemExit): with self.assertRaises(SystemExit):
get_values(mockcc, readelf, ["--enable-elf-hack=legacy"]) get_values(mockcc, readelf, ["--enable-elf-hack=legacy"])
if readelf.with_relr:
# Explicitly enabling relrhack works because pack-relative-relocs are supported.
self.assertEqual(
get_values(mockcc, readelf, ["--enable-elf-hack=relr"]),
("lld", None, "relr"),
)
else:
# relrhack doesn't work without pack-relative-relocs support.
with self.assertRaises(SystemExit):
get_values(mockcc, readelf, ["--enable-elf-hack=relr"])
# If we force to use BFD ld, it works. # If we force to use BFD ld, it works.
self.assertEqual( self.assertEqual(
get_values( get_values(
@ -226,15 +240,21 @@ class TestToolkitMozConfigure(BaseConfigureTest):
self.assertEqual( self.assertEqual(
get_values(mockcc, readelf, ["--enable-release"]), ("lld", PACK, None) get_values(mockcc, readelf, ["--enable-release"]), ("lld", PACK, None)
) )
self.assertEqual(
get_values(mockcc, readelf, ["--enable-elf-hack"]),
("lld", None, "relr"),
)
self.assertEqual(
get_values(mockcc, readelf, ["--enable-elf-hack=relr"]),
("lld", None, "relr"),
)
# LLD is picked by default and enabling elfhack fails because of that. # LLD is picked by default and enabling elfhack fails because of that.
with self.assertRaises(SystemExit):
get_values(mockcc, readelf, ["--enable-elf-hack"])
with self.assertRaises(SystemExit): with self.assertRaises(SystemExit):
get_values(mockcc, readelf, ["--enable-elf-hack=legacy"]) get_values(mockcc, readelf, ["--enable-elf-hack=legacy"])
# If we force to use BFD ld, it works. # If we force to use BFD ld, it works.
self.assertEqual( self.assertEqual(
get_values(mockcc, readelf, ["--enable-elf-hack", "--enable-linker=bfd"]), get_values(mockcc, readelf, ["--enable-elf-hack", "--enable-linker=bfd"]),
("bfd", None, "legacy"), ("bfd", None, "relr"),
) )
self.assertEqual( self.assertEqual(
get_values( get_values(
@ -242,11 +262,6 @@ class TestToolkitMozConfigure(BaseConfigureTest):
), ),
("bfd", None, "legacy"), ("bfd", None, "legacy"),
) )
# Explicitly enabling relrhack works because pack-relative-relocs are supported.
self.assertEqual(
get_values(mockcc, readelf, ["--enable-elf-hack=relr"]),
("lld", None, "relr"),
)
if __name__ == "__main__": if __name__ == "__main__":

11
toolkit/moz.configure
View File

@ -1498,14 +1498,9 @@ with only_when("--enable-compile-environment"):
if enable and enable != ("relr",): if enable and enable != ("relr",):
return enable return enable
@depends("--enable-elf-hack", "MOZ_AUTOMATION", when=has_elfhack) @depends("--enable-elf-hack", when=has_elfhack)
def may_enable_relrhack(enable, automation): def may_enable_relrhack(enable):
# For now, only enable relrhack when explicitly given with if enable and enable != ("legacy",):
# --enable-elf-hack=relr. On automation, we automatically
# enable it when possible.
if automation and enable and enable != ("legacy",):
return enable
if enable == ("relr",):
return enable return enable
@depends( @depends(