libdw: Correct spelling of DW_LANG_PLI in dwarf.h.

The name used in the standard and other DWARF implementations for
Programming Language One, PL/I, is DW_LANG_PLI (not DW_LANG_PL1).

Fix usage in dwarf_aggregate_size.

Signed-off-by: Mark Wielaard <mjw@redhat.com>

diff --git a/NEWS b/NEWS
index 599970b969f073811dfb6f66a51941ac891bbf3c..b2d2ffa31d0a0d7a7f371c653c48f0e42d0cd901 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Version 0.168
+
+libdw: dwarf.h corrected the DW_LANG_PLI constant name (was DW_LANG_PL1).
+
 Version 0.167
 
 libasm: Add eBPF disassembler for EM_BPF files.

diff --git a/libdw/ChangeLog b/libdw/ChangeLog
index cc92f1634b58a0d5a8b3ee9eb0776b6986a3a913..978b9913a95010ee9c5558333b3c752aa81a6a06 100644 (file)
--- a/libdw/ChangeLog
+++ b/libdw/ChangeLog
@@ -1,3 +1,9 @@
+2016-10-22  Mark Wielaard  <mjw@redhat.com>
+
+       * dwarf.h: Correct spelling of DW_LANG_PLI. Add compatibility define.
+       * dwarf_aggregate_size.c (array_size): Use correct spelling of
+       DW_LANG_PLI.
+
 2016-11-02  Mark Wielaard  <mjw@redhat.com>
 
        * cfi.c (execute_cfi): Add fallthrough comments.

diff --git a/libdw/dwarf.h b/libdw/dwarf.h
index b5c58d7f071c86a7b7d47d4d0babbe3ee3baf58d..169b53e53d6d4b53680412b0b587e776d1bed836 100644 (file)
--- a/libdw/dwarf.h
+++ b/libdw/dwarf.h
@@ -1,5 +1,5 @@
 /* This file defines standard DWARF types, structures, and macros.
-   Copyright (C) 2000-2011, 2014 Red Hat, Inc.
+   Copyright (C) 2000-2011, 2014, 2016 Red Hat, Inc.
    This file is part of elfutils.
 
    This file is free software; you can redistribute it and/or modify
@@ -582,7 +582,7 @@ enum
     DW_LANG_C99 = 0x000c,           /* ISO C:1999 */
     DW_LANG_Ada95 = 0x000d,         /* ISO Ada:1995 */
     DW_LANG_Fortran95 = 0x000e,             /* ISO Fortran 95 */
-    DW_LANG_PL1 = 0x000f,           /* ISO PL/1:1976 */
+    DW_LANG_PLI = 0x000f,           /* ISO PL/1:1976 */
     DW_LANG_ObjC = 0x0010,          /* Objective-C */
     DW_LANG_ObjC_plus_plus = 0x0011, /* Objective-C++ */
     DW_LANG_UPC = 0x0012,           /* Unified Parallel C */
@@ -602,6 +602,8 @@ enum
     DW_LANG_hi_user = 0xffff
   };
 
+/* Old (typo) '1' != 'I'.  */
+#define DW_LANG_PL1 DW_LANG_PLI
 
 /* DWARF identifier case encodings.  */
 enum

diff --git a/libdw/dwarf_aggregate_size.c b/libdw/dwarf_aggregate_size.c
index aaeb7ed97279aa3a5ec7ca2f6be84da0475ca845..52ef0067fcaa3bc915392ecc8b53e759f3c0ac96 100644 (file)
--- a/libdw/dwarf_aggregate_size.c
+++ b/libdw/dwarf_aggregate_size.c
@@ -1,5 +1,5 @@
 /* Compute size of an aggregate type from DWARF.
-   Copyright (C) 2010, 2014 Red Hat, Inc.
+   Copyright (C) 2010, 2014, 2016 Red Hat, Inc.
    This file is part of elfutils.
 
    This file is free software; you can redistribute it and/or modify
@@ -127,7 +127,7 @@ array_size (Dwarf_Die *die, Dwarf_Word *size,
                    case DW_LANG_Fortran08:
                    case DW_LANG_Pascal83:
                    case DW_LANG_Modula2:
-                   case DW_LANG_PL1:
+                   case DW_LANG_PLI:
                      lower = 1;
                      break;