bring ChangeLog entries from master commit
diff --git a/binutils/ChangeLog b/binutils/ChangeLog
index 87ee8a4..0374084 100644
--- a/binutils/ChangeLog
+++ b/binutils/ChangeLog
@@ -1,3 +1,36 @@
+2017-09-22 Alexandre Oliva <aoliva@redhat.com>
+
+ * dwarf.h (debug_info): Add loc_views and num_loc_views.
+ * dwarf.c (vm1): New constant.
+ (print_dwarf_view): New function.
+ (read_and_display_attr_value): Support DW_AT_GNU_locviews.
+ (process_debug_info): Keep num_loc_offsets and num_loc_views
+ in sync.
+ (display_view_pair_list): New function.
+ (display_loc_list_dwo): Take vstart_ptr; update it. Dump
+ location view pairs before the range they apply to, when a
+ viewlist augments the loc list.
+ (display_loc_list): Likewise. Check view numbers in range
+ tests.
+ (display_loclists_list): Likewise. Handle view pair entries,
+ and warn on trailing ones.
+ (loc_views): New variable.
+ (loc_offsets_compar): Compare loc_views if loc_offsets are the
+ same.
+ (display_debug_loc): Check and sort loc_views too. Accept
+ loc_view as expected_start. Skip if lists and views are the
+ same. Dump locview list separately in order, and pass the
+ locview list base to each list dump function. Warn and skip
+ overlap and hole checking if we find loclists and locviews to
+ not be adjacent.
+ * testsuite/binutils-all/locview-1.s: New.
+ * testsuite/binutils-all/readelf.locview-1: New.
+ * testsuite/binutils-all/locview-2.s: New.
+ * testsuite/binutils-all/readelf.locview-2: New.
+ * testsuite/binutils-all/readelf.exp: Run new tests. Fix
+ option spelling in pr18374 fail message. XFAIL dw5 test on
+ nds32*-elf.
+
2017-09-22 Alan Modra <amodra@gmail.com>
* testsuite/binutils-all/readelf.exp: Don't perror and exit on
diff --git a/include/ChangeLog b/include/ChangeLog
index 1ba7de3..0ece8de 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,10 @@
+2017-09-22 Alexandre Oliva <aoliva@redhat.com>
+
+ * dwarf2.def (DW_AT_GNU_locviews): New.
+ * dwarf2.h (enum dwarf_location_list_entry_type): Add
+ DW_LLE_GNU_view_pair.
+ (DW_LLE_view_pair): Define.
+
2017-09-15 Pedro Alves <palves@redhat.com>
Sync with mainline gcc sources (r252823)
