From 2fd2526eddaaae19b22deae59edee05fd1965d91 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Fri, 1 Mar 2013 23:00:28 +0000 Subject: [PATCH] merge from gcc --- include/dwarf2.h | 14 -------------- libiberty/ChangeLog | 6 ++++++ libiberty/libiberty.texi | 6 ++++-- libiberty/obstacks.texi | 2 +- 4 files changed, 11 insertions(+), 17 deletions(-) diff --git a/include/dwarf2.h b/include/dwarf2.h index 120e2c16b48..e98505ac2f9 100644 --- a/include/dwarf2.h +++ b/include/dwarf2.h @@ -376,20 +376,6 @@ enum dwarf_macro_record_type #define DW_EH_PE_indirect 0x80 -/* Codes for the debug sections in a dwarf package (.dwp) file. - Extensions for Fission. See http://gcc.gnu.org/wiki/DebugFissionDWP. */ -enum dwarf_sect - { - DW_SECT_INFO = 1, - DW_SECT_TYPES = 2, - DW_SECT_ABBREV = 3, - DW_SECT_LINE = 4, - DW_SECT_LOC = 5, - DW_SECT_STR_OFFSETS = 6, - DW_SECT_MACINFO = 7, - DW_SECT_MACRO = 8, - DW_SECT_MAX = 8 - }; #ifdef __cplusplus extern "C" { diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 7935ad69f44..b4c61807b5e 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,9 @@ +2013-03-01 Andreas Schwab + + * obstacks.texi (Obstacks): Trim @node to only contain the + node name. + * libiberty.texi (Obstacks): Lower section. + 2013-02-14 Jason Merrill * cp-demangle.c (d_dump): Handle DEMANGLE_COMPONENT_DEFAULT_ARG. diff --git a/libiberty/libiberty.texi b/libiberty/libiberty.texi index 74f70d2bd5a..f1e4bddaa84 100644 --- a/libiberty/libiberty.texi +++ b/libiberty/libiberty.texi @@ -82,8 +82,6 @@ License; for more information, see @ref{Library Copying}. * Functions:: Available functions, macros, and global variables. -* Obstacks:: Object Stacks. - * Licenses:: The various licenses under which libiberty sources are distributed. @@ -245,7 +243,11 @@ central location from which to use, maintain, and distribute them. @c This is generated from the glibc manual using a make-obstacks-texi.sh @c script of Phil's. Hope it's accurate. +@lowersections +@lowersections @include obstacks.texi +@raisesections +@raisesections @node Functions @chapter Function, Variable, and Macro Listing. diff --git a/libiberty/obstacks.texi b/libiberty/obstacks.texi index a1b1b478c38..67780aa1a65 100644 --- a/libiberty/obstacks.texi +++ b/libiberty/obstacks.texi @@ -1,4 +1,4 @@ -@node Obstacks,Licenses,Functions,Top +@node Obstacks @chapter Obstacks @cindex obstacks -- 2.30.2