merge from gcc

diff --git a/include/dwarf2.h b/include/dwarf2.h
index 120e2c16b4820f823c75ab8b2aa7c00bab6291fa..e98505ac2f928756b5486704c9f25846dbe9b7b3 100644 (file)
--- 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 7935ad69f44eb972c481fdac074712586ecfb279..b4c61807b5e637c0a1651de1edc0f054a73cf1cc 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,9 @@
+2013-03-01  Andreas Schwab  <schwab@linux-m68k.org>
+
+       * obstacks.texi (Obstacks): Trim @node to only contain the
+       node name.
+       * libiberty.texi (Obstacks): Lower section.
+
 2013-02-14  Jason Merrill  <jason@redhat.com>
 
        * cp-demangle.c (d_dump): Handle DEMANGLE_COMPONENT_DEFAULT_ARG.

diff --git a/libiberty/libiberty.texi b/libiberty/libiberty.texi
index 74f70d2bd5af1df2e4177f04152d9d6ff806d65e..f1e4bddaa84cb3b913c1e6621ec27644dcc988e7 100644 (file)
--- 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 a1b1b478c389856d2e019fca34a88690bded0464..67780aa1a652b2eaf74fa95e1f159c91a6be3e5c 100644 (file)
--- a/libiberty/obstacks.texi
+++ b/libiberty/obstacks.texi
@@ -1,4 +1,4 @@
-@node Obstacks,Licenses,Functions,Top
+@node Obstacks
 @chapter Obstacks
 @cindex obstacks