x86: Properly set IBT and SHSTK properties for -z ibt/shstk

[deliverable/binutils-gdb.git] / bfd / ChangeLog

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 3e7d68343aa918c78bd162603cce219a1e5c33f7..39b5500364236e8f3835dccb0841f9f510ab0eb7 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2019-03-13  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/24322
+       * elfxx-x86.c (_bfd_x86_elf_merge_gnu_properties): Properly
+       merge GNU_PROPERTY_X86_FEATURE_1_[IBT|SHSTK].
+
 2019-03-12  Alan Modra  <amodra@gmail.com>
 
        * coffcode.h (buy_and_read): Delete unnecessary forward decl.  Add