From 387a56a5435500ba2d2eac3fe76de1f400381cbe Mon Sep 17 00:00:00 2001 From: Cary Coutant Date: Sun, 13 Dec 2020 15:20:10 -0800 Subject: [PATCH] Fix incremental tests using gcc 9, which adds Gnu properties sections. During an incremental link, we should simply ignore the Gnu properties sections. We were not handling them properly -- failing to process the properties from the base file. While that could be fixed, the property sections are meant for deployed binaries, and incremental linking is for development, so keeping the properties sections just adds to the likelihood of forcing a full link sooner. gold/ PR gold/23539 * object.cc (Sized_relobj_file::layout_gnu_property_section): Ignore Gnu properties during incremental links. --- gold/ChangeLog | 6 ++++++ gold/object.cc | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/gold/ChangeLog b/gold/ChangeLog index bfb7a7002ac..0f052cc46a3 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2020-12-13 Cary Coutant + + PR gold/23539 + * object.cc (Sized_relobj_file::layout_gnu_property_section): Ignore + Gnu properties during incremental links. + 2020-12-13 Cary Coutant PR gold/24123 diff --git a/gold/object.cc b/gold/object.cc index c0d0f0289fc..23ce2064daf 100644 --- a/gold/object.cc +++ b/gold/object.cc @@ -1304,6 +1304,10 @@ Sized_relobj_file::layout_gnu_property_section( Layout* layout, unsigned int shndx) { + // We ignore Gnu property sections on incremental links. + if (parameters->incremental()) + return; + section_size_type contents_len; const unsigned char* pcontents = this->section_contents(shndx, &contents_len, -- 2.30.2