merge from gcc

[external/binutils.git] / elfcpp / dwarf.h

diff --git a/elfcpp/dwarf.h b/elfcpp/dwarf.h
index 0b98bcc..c6ff402 100644 (file)
--- a/elfcpp/dwarf.h
+++ b/elfcpp/dwarf.h
@@ -4,7 +4,7 @@
 // Written by Ian Lance Taylor <iant@google.com>.
 
 // This file is part of elfcpp.
-   
+
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Library General Public License
 // as published by the Free Software Foundation; either version 2, or
@@ -35,16 +35,6 @@
 namespace elfcpp
 {
 
-typedef unsigned char Dwarf_uint8;
-typedef signed char Dwarf_int8;
-typedef uint16_t Dwarf_uint16;
-typedef int16_t Dwarf_int16;
-typedef uint32_t Dwarf_uint32;
-typedef int32_t Dwarf_int32;
-typedef uint64_t Dwarf_uint64;
-typedef int64_t Dwarf_int64;
-
-
 // DWARF2 codes.
 
 enum DW_TAG
@@ -134,6 +124,32 @@ enum DW_TAG
   DW_TAG_PGI_interface_block = 0xA020
 };
 
+enum DW_FORM
+{
+  DW_FORM_null = 0x00,
+  DW_FORM_addr = 0x01,
+  DW_FORM_block2 = 0x03,
+  DW_FORM_block4 = 0x04,
+  DW_FORM_data2 = 0x05,
+  DW_FORM_data4 = 0x06,
+  DW_FORM_data8 = 0x07,
+  DW_FORM_string = 0x08,
+  DW_FORM_block = 0x09,
+  DW_FORM_block1 = 0x0a,
+  DW_FORM_data1 = 0x0b,
+  DW_FORM_flag = 0x0c,
+  DW_FORM_sdata = 0x0d,
+  DW_FORM_strp = 0x0e,
+  DW_FORM_udata = 0x0f,
+  DW_FORM_ref_addr = 0x10,
+  DW_FORM_ref1 = 0x11,
+  DW_FORM_ref2 = 0x12,
+  DW_FORM_ref4 = 0x13,
+  DW_FORM_ref8 = 0x14,
+  DW_FORM_ref_udata = 0x15,
+  DW_FORM_indirect = 0x16
+};
+
 // Frame unwind information.
 
 enum DW_EH_PE
@@ -382,7 +398,7 @@ enum DW_OP
   DW_OP_call_frame_cfa               =0x9c,
   DW_OP_bit_piece                    =0x9d,
   DW_OP_lo_user                      =0xe0,
-  DW_OP_hi_user                      =0xff,  
+  DW_OP_hi_user                      =0xff,
   // GNU extensions
   DW_OP_GNU_push_tls_address         =0xe0
 };